diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/TreeTransform.h | 1 | ||||
| -rw-r--r-- | test/SemaTemplate/anonymous-union.cpp | 19 |
3 files changed, 21 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index a9acf72644..5902e371c5 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -564,7 +564,7 @@ Sema::BuildAnonymousStructUnionMemberReference(SourceLocation Loc, == Context.getCanonicalType(ThisType)) || IsDerivedFrom(ThisType, AnonFieldType)) { // Our base object expression is "this". - BaseObjectExpr = new (Context) CXXThisExpr(SourceLocation(), + BaseObjectExpr = new (Context) CXXThisExpr(Loc, MD->getThisType(Context)); BaseObjectIsPointer = true; } diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 61b57e7e56..7db723bdb9 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -959,6 +959,7 @@ public: Expr *BaseExpr = Base.takeAs<Expr>(); if (getSema().PerformObjectMemberConversion(BaseExpr, Member)) return getSema().ExprError(); + MemberExpr *ME = new (getSema().Context) MemberExpr(BaseExpr, isArrow, Member, MemberLoc, diff --git a/test/SemaTemplate/anonymous-union.cpp b/test/SemaTemplate/anonymous-union.cpp new file mode 100644 index 0000000000..59d1f25a4f --- /dev/null +++ b/test/SemaTemplate/anonymous-union.cpp @@ -0,0 +1,19 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s + +// PR5868 +struct T0 { + int x; + union { + void *m0; + }; +}; +template <typename T> +struct T1 : public T0, public T { + void f0() { + m0 = 0; // expected-error{{ambiguous conversion}} + } +}; + +struct A : public T0 { }; + +void f1(T1<A> *S) { S->f0(); } // expected-note{{instantiation of member function}} |