Author: kongyi Date: Thu Dec 14 14:24:45 2017 New Revision: 320753 URL: http://llvm.org/viewvc/llvm-project?rev=320753&view=rev Log: [ThreadSafetyAnalysis] Fix isCapabilityExpr
There are many more expr types that can be a capability expr, like CXXThisExpr, CallExpr, MemberExpr. Instead of enumerating all of them, just check typeHasCapability for any type given. Also add & and * operators to allowed unary operators. Differential Revision: https://reviews.llvm.org/D41224 Added: cfe/trunk/test/Sema/attr-capabilities.cpp Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=320753&r1=320752&r2=320753&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original) +++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Thu Dec 14 14:24:45 2017 @@ -540,14 +540,13 @@ static bool isCapabilityExpr(Sema &S, co // a DeclRefExpr is found, its type should be checked to determine whether it // is a capability or not. - if (const auto *E = dyn_cast<DeclRefExpr>(Ex)) - return typeHasCapability(S, E->getType()); - else if (const auto *E = dyn_cast<CastExpr>(Ex)) + if (const auto *E = dyn_cast<CastExpr>(Ex)) return isCapabilityExpr(S, E->getSubExpr()); else if (const auto *E = dyn_cast<ParenExpr>(Ex)) return isCapabilityExpr(S, E->getSubExpr()); else if (const auto *E = dyn_cast<UnaryOperator>(Ex)) { - if (E->getOpcode() == UO_LNot) + if (E->getOpcode() == UO_LNot || E->getOpcode() == UO_AddrOf || + E->getOpcode() == UO_Deref) return isCapabilityExpr(S, E->getSubExpr()); return false; } else if (const auto *E = dyn_cast<BinaryOperator>(Ex)) { @@ -557,7 +556,7 @@ static bool isCapabilityExpr(Sema &S, co return false; } - return false; + return typeHasCapability(S, Ex->getType()); } /// \brief Checks that all attribute arguments, starting from Sidx, resolve to Added: cfe/trunk/test/Sema/attr-capabilities.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-capabilities.cpp?rev=320753&view=auto ============================================================================== --- cfe/trunk/test/Sema/attr-capabilities.cpp (added) +++ cfe/trunk/test/Sema/attr-capabilities.cpp Thu Dec 14 14:24:45 2017 @@ -0,0 +1,17 @@ +// RUN: %clang_cc1 -fsyntax-only -Wthread-safety -verify %s + +class __attribute__((shared_capability("mutex"))) Mutex { + public: + void func1() __attribute__((assert_capability(this))); + void func2() __attribute__((assert_capability(!this))); + + const Mutex& operator!() const { return *this; } +}; + +class NotACapability { + public: + void func1() __attribute__((assert_capability(this))); // expected-warning {{'assert_capability' attribute requires arguments whose type is annotated with 'capability' attribute; type here is 'NotACapability *'}} + void func2() __attribute__((assert_capability(!this))); // expected-warning {{'assert_capability' attribute requires arguments whose type is annotated with 'capability' attribute; type here is 'bool'}} + + const NotACapability& operator!() const { return *this; } +}; Modified: cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp?rev=320753&r1=320752&r2=320753&view=diff ============================================================================== --- cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp (original) +++ cfe/trunk/test/SemaCXX/warn-thread-safety-parsing.cpp Thu Dec 14 14:24:45 2017 @@ -351,7 +351,8 @@ int gb_var_arg_5 GUARDED_BY(&mu1); int gb_var_arg_6 GUARDED_BY(muRef); int gb_var_arg_7 GUARDED_BY(muDoubleWrapper.getWrapper()->getMu()); int gb_var_arg_8 GUARDED_BY(muPointer); - +int gb_var_arg_9 GUARDED_BY(!&mu1); +int gb_var_arg_10 GUARDED_BY(!&*&mu1); // illegal attribute arguments int gb_var_arg_bad_1 GUARDED_BY(1); // \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
