diff options
| -rw-r--r-- | clang/lib/Sema/SemaExprMember.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/TreeTransform.h | 1 | ||||
| -rw-r--r-- | clang/test/SemaCXX/PR35832.cpp | 21 |
3 files changed, 22 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExprMember.cpp b/clang/lib/Sema/SemaExprMember.cpp index c737d7bfd44..680ca99d660 100644 --- a/clang/lib/Sema/SemaExprMember.cpp +++ b/clang/lib/Sema/SemaExprMember.cpp @@ -848,7 +848,7 @@ Sema::BuildAnonymousStructUnionMemberReference(const CXXScopeSpec &SS, // Build the first member access in the chain with full information. result = BuildFieldReferenceExpr(result, baseObjectIsPointer, SourceLocation(), - EmptySS, field, foundDecl, memberNameInfo) + SS, field, foundDecl, memberNameInfo) .get(); if (!result) return ExprError(); diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h index 1a35c9dbf7c..4de55506223 100644 --- a/clang/lib/Sema/TreeTransform.h +++ b/clang/lib/Sema/TreeTransform.h @@ -2239,7 +2239,6 @@ public: // We have a reference to an unnamed field. This is always the // base of an anonymous struct/union member access, i.e. the // field is always of record type. - assert(!QualifierLoc && "Can't have an unnamed field with a qualifier!"); assert(Member->getType()->isRecordType() && "unnamed member not of record type?"); diff --git a/clang/test/SemaCXX/PR35832.cpp b/clang/test/SemaCXX/PR35832.cpp new file mode 100644 index 00000000000..fd47cd6a5ee --- /dev/null +++ b/clang/test/SemaCXX/PR35832.cpp @@ -0,0 +1,21 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s + +// expected-no-diagnostics + +class B { +public: + int i; + struct { struct { union { int j; }; }; }; + union { int k; }; +}; + +class X : public B { }; +class Y : public B { }; + +class Z : public X, public Y { +public: + int a() { return X::i; } + int b() { return X::j; } + int c() { return X::k; } + int d() { return this->X::j; } +}; |
