diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2013-10-14 23:22:37 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2013-10-14 23:22:37 +0000 |
| commit | 91c98e1e0bc835be09ec698382306becf4bb6cd7 (patch) | |
| tree | 4e228d518737e746eddd8974c0e6c2c1ba0b83c4 | |
| parent | 37868073aee3e9475e8cdaae8b38c5486586102b (diff) | |
| download | bcm5719-llvm-91c98e1e0bc835be09ec698382306becf4bb6cd7.tar.gz bcm5719-llvm-91c98e1e0bc835be09ec698382306becf4bb6cd7.zip | |
Switching some custom logic to using table-generated helper methods. This also removes an unnecessary diagnostic.
llvm-svn: 192639
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 34 |
2 files changed, 11 insertions, 25 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index d393edd9410..8f68278eeb3 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -2216,8 +2216,6 @@ def warn_attr_on_unconsumable_class : Warning< def warn_return_typestate_for_unconsumable_type : Warning< "return state set for an unconsumable type '%0'">, InGroup<Consumed>, DefaultIgnore; -def warn_unknown_consumed_state : Warning< - "unknown consumed analysis state '%0'">, InGroup<Consumed>, DefaultIgnore; def warn_return_typestate_mismatch : Warning< "return value not in expected state; expected '%0', observed '%1'">, InGroup<Consumed>, DefaultIgnore; diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 70ae9fd9bc1..b9ff4775425 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -1130,21 +1130,14 @@ static void handleSetTypestateAttr(Sema &S, Decl *D, const AttributeList &Attr) return; SetTypestateAttr::ConsumedState NewState; - if (Attr.isArgIdent(0)) { - StringRef Param = Attr.getArgAsIdent(0)->Ident->getName(); - - if (Param == "unknown") { - NewState = SetTypestateAttr::Unknown; - } else if (Param == "consumed") { - NewState = SetTypestateAttr::Consumed; - } else if (Param == "unconsumed") { - NewState = SetTypestateAttr::Unconsumed; - } else { - S.Diag(Attr.getLoc(), diag::warn_unknown_consumed_state) << Param; + IdentifierLoc *Ident = Attr.getArgAsIdent(0); + StringRef Param = Ident->Ident->getName(); + if (!SetTypestateAttr::ConvertStrToConsumedState(Param, NewState)) { + S.Diag(Ident->Loc, diag::warn_attribute_type_not_supported) + << Attr.getName() << Param; return; } - } else { S.Diag(Attr.getLoc(), diag::err_attribute_argument_type) << Attr.getName() << AANT_ArgumentIdentifier; @@ -1169,20 +1162,15 @@ static void handleTestsTypestateAttr(Sema &S, Decl *D, if (!checkForConsumableClass(S, cast<CXXMethodDecl>(D), Attr)) return; - TestsTypestateAttr::ConsumedState TestState; - + TestsTypestateAttr::ConsumedState TestState; if (Attr.isArgIdent(0)) { - StringRef Param = Attr.getArgAsIdent(0)->Ident->getName(); - - if (Param == "consumed") { - TestState = TestsTypestateAttr::Consumed; - } else if (Param == "unconsumed") { - TestState = TestsTypestateAttr::Unconsumed; - } else { - S.Diag(Attr.getLoc(), diag::warn_unknown_consumed_state) << Param; + IdentifierLoc *Ident = Attr.getArgAsIdent(0); + StringRef Param = Ident->Ident->getName(); + if (!TestsTypestateAttr::ConvertStrToConsumedState(Param, TestState)) { + S.Diag(Ident->Loc, diag::warn_attribute_type_not_supported) + << Attr.getName() << Param; return; } - } else { S.Diag(Attr.getLoc(), diag::err_attribute_argument_type) << Attr.getName() << AANT_ArgumentIdentifier; |
