Diagnose ambiguities in getTypeName. Fixes http://llvm.org/bugs/show_bug.cgi?id=3475

llvm-svn: 63737

1 files changed, 7 insertions, 2 deletions

diff --git a/clang/test/SemaCXX/member-name-lookup.cpp b/clang/test/SemaCXX/member-name-lookup.cpp
index f48a99add4d..9e4b51fd748 100644
--- a/clang/test/SemaCXX/member-name-lookup.cpp
+++ b/clang/test/SemaCXX/member-name-lookup.cpp
@@ -133,13 +133,18 @@ void G::test_virtual_lookup() {
 
 
 struct HasMemberType1 {
-  struct type { };
+  struct type { }; // expected-note{{member found by ambiguous name lookup}}
 };
 
 struct HasMemberType2 {
-  struct type { };
+  struct type { }; // expected-note{{member found by ambiguous name lookup}}
 };
 
 struct HasAnotherMemberType : HasMemberType1, HasMemberType2 { 
   struct type { };
 };
+
+struct UsesAmbigMemberType : HasMemberType1, HasMemberType2 {
+  type t; // expected-error{{member 'type' found in multiple base classes of different types}} \
+          // expected-error{{expected ';' at end of declaration list}}
+};