UnresolvedMemberExprs need lvalue-to-rvalue conversions during template
instantiations too.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143016 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h
index 59c132c..7fb2d35 100644
--- a/lib/Sema/TreeTransform.h
+++ b/lib/Sema/TreeTransform.h
@@ -2145,6 +2145,13 @@
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 b4d4417..ff29019 100644
--- a/test/SemaCXX/warn-thread-safety-analysis.cpp
+++ b/test/SemaCXX/warn-thread-safety-analysis.cpp
@@ -1533,4 +1533,19 @@
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}}
+
}