summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclAttr.cpp
diff options
context:
space:
mode:
authorDeLesley Hutchins <delesley@google.com>2012-05-02 17:38:37 +0000
committerDeLesley Hutchins <delesley@google.com>2012-05-02 17:38:37 +0000
commitd96b46ace2aeca93002365ab572ded3742cf78fb (patch)
tree834bb15d00061bdbb12d1311e8ef5f37f95964c2 /clang/lib/Sema/SemaDeclAttr.cpp
parentd7c6777d504013bee96bfe9a50f9e34b309218c8 (diff)
downloadbcm5719-llvm-d96b46ace2aeca93002365ab572ded3742cf78fb.tar.gz
bcm5719-llvm-d96b46ace2aeca93002365ab572ded3742cf78fb.zip
Thread Safety Analysis: fixed attribute handling for lock_returned attribute.
llvm-svn: 156005
Diffstat (limited to 'clang/lib/Sema/SemaDeclAttr.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclAttr.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index c8af3a430a2..13bf0aa4875 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -681,9 +681,14 @@ static void handleLockReturnedAttr(Sema &S, Decl *D,
return;
// check that the argument is lockable object
- checkForLockableRecord(S, D, Attr, Arg->getType());
+ SmallVector<Expr*, 1> Args;
+ checkAttrArgsAreLockableObjs(S, D, Attr, Args);
+ unsigned Size = Args.size();
+ if (Size == 0)
+ return;
- D->addAttr(::new (S.Context) LockReturnedAttr(Attr.getRange(), S.Context, Arg));
+ D->addAttr(::new (S.Context) LockReturnedAttr(Attr.getRange(), S.Context,
+ Args[0]));
}
static void handleLocksExcludedAttr(Sema &S, Decl *D,
OpenPOWER on IntegriCloud