diff options
| -rw-r--r-- | clang/lib/Analysis/ThreadSafety.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaCXX/warn-thread-safety-analysis.cpp | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp index c60954374ce..48f4106b6ba 100644 --- a/clang/lib/Analysis/ThreadSafety.cpp +++ b/clang/lib/Analysis/ThreadSafety.cpp @@ -2142,6 +2142,9 @@ void BuildLockset::VisitDeclStmt(const DeclStmt *S) { // handle constructors that involve temporaries if (auto *EWC = dyn_cast<ExprWithCleanups>(E)) E = EWC->getSubExpr(); + if (auto *ICE = dyn_cast<ImplicitCastExpr>(E)) + if (ICE->getCastKind() == CK_NoOp) + E = ICE->getSubExpr(); if (auto *BTE = dyn_cast<CXXBindTemporaryExpr>(E)) E = BTE->getSubExpr(); diff --git a/clang/test/SemaCXX/warn-thread-safety-analysis.cpp b/clang/test/SemaCXX/warn-thread-safety-analysis.cpp index ac89ea86f08..23255a53eae 100644 --- a/clang/test/SemaCXX/warn-thread-safety-analysis.cpp +++ b/clang/test/SemaCXX/warn-thread-safety-analysis.cpp @@ -3051,6 +3051,20 @@ void Foo::test() { int b = a; // expected-warning {{reading variable 'a' requires holding mutex 'getMutexPtr()'}} } +#ifdef __cpp_guaranteed_copy_elision + +void guaranteed_copy_elision() { + MutexLock lock = MutexLock{&sls_mu}; + sls_guard_var = 0; +} + +void guaranteed_copy_elision_const() { + const MutexLock lock = MutexLock{&sls_mu}; + sls_guard_var = 0; +} + +#endif + } // end namespace TemporaryCleanupExpr |
