Added a diagnostic for mismatched MS inheritance attributes. Also fixed the incomplete type member pointer size calculation under the MS ABI.

llvm-svn: 163078

1 files changed, 7 insertions, 5 deletions

diff --git a/clang/test/SemaCXX/member-pointer-ms.cpp b/clang/test/SemaCXX/member-pointer-ms.cpp
index 3b2d0fceb97..90618bc7dce 100644
--- a/clang/test/SemaCXX/member-pointer-ms.cpp
+++ b/clang/test/SemaCXX/member-pointer-ms.cpp
@@ -1,8 +1,4 @@
-// RUN: %clang_cc1 -cxx-abi microsoft -fsyntax-only -verify %s
-
-// Test that we reject pointers to members of incomplete classes (for now)
-struct A; //expected-note{{forward declaration of 'A'}}
-int A::*pai1; //expected-error{{incomplete type 'A'}}
+// RUN: %clang_cc1 -cxx-abi microsoft -fms-compatibility -fsyntax-only -verify %s
 
 // Test that we don't allow reinterpret_casts from pointers of one size to
 // pointers of a different size.
@@ -12,3 +8,9 @@ struct C: A, B {};
 
 void (A::*paf)();
 void (C::*pcf)() = reinterpret_cast<void (C::*)()>(paf); //expected-error{{cannot reinterpret_cast from member pointer type}}
+
+class __single_inheritance D; 
+class __multiple_inheritance D; // expected-warning {{ignored since inheritance model was already declared as 'single'}}
+  
+class __virtual_inheritance E;
+class __virtual_inheritance E;  // no warning expected since same attribute