diff options
| -rw-r--r-- | lib/Sema/TreeTransform.h | 7 | ||||
| -rw-r--r-- | test/SemaCXX/warn-thread-safety-analysis.cpp | 15 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 59c132cacc..7fb2d35c70 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -2145,6 +2145,13 @@ public: CXXScopeSpec SS; SS.Adopt(QualifierLoc); + if (BaseE && IsArrow) { + ExprResult BaseResult = getSema().DefaultLvalueConversion(BaseE); + if (BaseResult.isInvalid()) + return ExprError(); + BaseE = BaseResult.take(); + } + return SemaRef.BuildMemberReferenceExpr(BaseE, BaseType, OperatorLoc, IsArrow, SS, FirstQualifierInScope, diff --git a/test/SemaCXX/warn-thread-safety-analysis.cpp b/test/SemaCXX/warn-thread-safety-analysis.cpp index b4d44170fe..ff290198c0 100644 --- a/test/SemaCXX/warn-thread-safety-analysis.cpp +++ b/test/SemaCXX/warn-thread-safety-analysis.cpp @@ -1533,4 +1533,19 @@ namespace template_member_test { template struct IndirectLock<int>; // expected-note {{here}} + struct V { + void f(int); + void f(double); + + Mutex m; + V *p GUARDED_BY(this->m); + }; + template<typename U> struct W { + V v; + void f(U u) { + v.p->f(u); // expected-warning {{reading variable 'p' requires locking 'm'}} + } + }; + template struct W<int>; // expected-note {{here}} + } |