diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp index 7e86af6b4a317..156df51a71012 100644 --- a/clang/lib/Analysis/ThreadSafety.cpp +++ b/clang/lib/Analysis/ThreadSafety.cpp @@ -1671,7 +1671,7 @@ void ThreadSafetyAnalyzer::checkAccess(const FactSet &FSet, const Expr *Exp, // Guard against self-initialization. e.g., int &i = i; if (E == Exp) break; - Exp = E; + Exp = E->IgnoreImplicit()->IgnoreParenCasts(); continue; } } diff --git a/clang/test/Analysis/thread-safety-handle-parenthesis.cpp b/clang/test/Analysis/thread-safety-handle-parenthesis.cpp new file mode 100644 index 0000000000000..ed0280beccf56 --- /dev/null +++ b/clang/test/Analysis/thread-safety-handle-parenthesis.cpp @@ -0,0 +1,19 @@ +// RUN: %clang_cc1 -verify -fsyntax-only -Wthread-safety %s + +struct __attribute__((lockable)) Lock {}; + +void sink_protected(int); + +struct Baz { +public: + Lock lock_; + int protected_num_ __attribute__((guarded_by(lock_))) = 1; +}; + +void paren_test() { + Baz baz; + int& n = baz.protected_num_; + sink_protected(n); // expected-warning{{reading variable 'protected_num_' requires holding mutex 'baz.lock_'}} + int& n2 = (baz.protected_num_); + sink_protected(n2); // expected-warning{{reading variable 'protected_num_' requires holding mutex 'baz.lock_'}} +}