diff options
| -rw-r--r-- | lib/Sema/TreeTransform.h | 5 | ||||
| -rw-r--r-- | test/SemaCXX/warn-thread-safety-analysis.cpp | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 46bd05b14b..3c118cb423 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -1482,6 +1482,11 @@ public: FoundDecl, Member); if (BaseResult.isInvalid()) return ExprError(); + if (isArrow) { + BaseResult = getSema().DefaultLvalueConversion(BaseResult.take()); + if (BaseResult.isInvalid()) + return ExprError(); + } Base = BaseResult.take(); ExprValueKind VK = isArrow ? VK_LValue : Base->getValueKind(); MemberExpr *ME = diff --git a/test/SemaCXX/warn-thread-safety-analysis.cpp b/test/SemaCXX/warn-thread-safety-analysis.cpp index b020e5712a..b4d44170fe 100644 --- a/test/SemaCXX/warn-thread-safety-analysis.cpp +++ b/test/SemaCXX/warn-thread-safety-analysis.cpp @@ -1516,10 +1516,17 @@ namespace template_member_test { Mutex m; S *s GUARDED_BY(this->m); }; + Mutex m; + struct U { + union { + int n; + }; + } *u GUARDED_BY(m); template<typename U> struct IndirectLock { int DoNaughtyThings(T *t) { + u->n = 0; // expected-warning {{reading variable 'u' requires locking 'm'}} return t->s->n; // expected-warning {{reading variable 's' requires locking 'm'}} } }; |