Author: ericwf Date: Sat Apr 7 23:21:33 2018 New Revision: 329521 URL: http://llvm.org/viewvc/llvm-project?rev=329521&view=rev Log: [Sema] Fix PR35832 - Ambiguity accessing anonymous struct/union with multiple bases.
Summary: Currently clang doesn't do qualified lookup when building indirect field decl references. This causes ambiguity when the field is in a base class to which there are multiple valid paths even though a qualified name is used. For example: ``` class B { protected: int i; union { int j; }; }; class X : public B { }; class Y : public B { }; class Z : public X, public Y { int a() { return X::i; } // works int b() { return X::j; } // fails }; ``` Reviewers: rsmith, aaron.ballman, rjmccall Reviewed By: rjmccall Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D45411 Added: cfe/trunk/test/SemaCXX/PR35832.cpp Modified: cfe/trunk/lib/Sema/SemaExprMember.cpp cfe/trunk/lib/Sema/TreeTransform.h Modified: cfe/trunk/lib/Sema/SemaExprMember.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprMember.cpp?rev=329521&r1=329520&r2=329521&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaExprMember.cpp (original) +++ cfe/trunk/lib/Sema/SemaExprMember.cpp Sat Apr 7 23:21:33 2018 @@ -848,7 +848,7 @@ Sema::BuildAnonymousStructUnionMemberRef // 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(); Modified: cfe/trunk/lib/Sema/TreeTransform.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=329521&r1=329520&r2=329521&view=diff ============================================================================== --- cfe/trunk/lib/Sema/TreeTransform.h (original) +++ cfe/trunk/lib/Sema/TreeTransform.h Sat Apr 7 23:21:33 2018 @@ -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?"); Added: cfe/trunk/test/SemaCXX/PR35832.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/PR35832.cpp?rev=329521&view=auto ============================================================================== --- cfe/trunk/test/SemaCXX/PR35832.cpp (added) +++ cfe/trunk/test/SemaCXX/PR35832.cpp Sat Apr 7 23:21:33 2018 @@ -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; } +}; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits