maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Switching the CallableWhen attribute over to using the string literal helper function instead of custom logic. 

llvm-svn: 192050
This commit is contained in:
Aaron Ballman 2013-10-05 22:45:34 +00:00
parent dbd2ebb07e
commit 4c9b7dc92e
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clang/lib/Sema/SemaDeclAttr.cpp
View File

@ -1059,25 +1059,19 @@ static void handleCallableWhenAttr(Sema &S, Decl *D,
for (unsigned ArgIndex = 0; ArgIndex < Attr.getNumArgs(); ++ArgIndex) {
CallableWhenAttr::ConsumedState CallableState;
if (Attr.isArgExpr(ArgIndex) &&
isa<StringLiteral>(Attr.getArgAsExpr(ArgIndex))) {
Expr *Arg = Attr.getArgAsExpr(ArgIndex);
StringRef StateString = cast<StringLiteral>(Arg)->getString();
if (!CallableWhenAttr::ConvertStrToConsumedState(StateString,
CallableState)) {
S.Diag(Arg->getExprLoc(), diag::warn_attribute_type_not_supported)
<< Attr.getName() << StateString;
return;
}
States.push_back(CallableState);
} else {
S.Diag(Attr.getLoc(), diag::err_attribute_argument_type) << Attr.getName()
<< AANT_ArgumentString;
StringRef StateString;
SourceLocation Loc;
if (!S.checkStringLiteralArgumentAttr(Attr, ArgIndex, StateString, &Loc))
return;
if (!CallableWhenAttr::ConvertStrToConsumedState(StateString,
CallableState)) {
S.Diag(Loc, diag::warn_attribute_type_not_supported)
<< Attr.getName() << StateString;
return;
}
States.push_back(CallableState);
}
D->addAttr(::new (S.Context)