[cfe-commits] r111118 - in /cfe/trunk: lib/Sema/SemaType.cpp test/SemaCXX/member-pointer-ms.cpp

[Charles Davis]

Author: cdavis
Date: Sun Aug 15 23:01:50 2010
New Revision: 111118

URL: http://llvm.org/viewvc/llvm-project?rev=111118&view=rev
Log:
Err on incomplete class types in member pointers when compiling for the
Microsoft C++ ABI, for now.

Added:
    cfe/trunk/test/SemaCXX/member-pointer-ms.cpp
Modified:
    cfe/trunk/lib/Sema/SemaType.cpp

Modified: cfe/trunk/lib/Sema/SemaType.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaType.cpp?rev=111118&r1=111117&r2=111118&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaType.cpp (original)
+++ cfe/trunk/lib/Sema/SemaType.cpp Sun Aug 15 23:01:50 2010
@@ -20,6 +20,7 @@
 #include "clang/AST/TypeLocVisitor.h"
 #include "clang/AST/Expr.h"
 #include "clang/Basic/PartialDiagnostic.h"
+#include "clang/Basic/TargetInfo.h"
 #include "clang/Parse/DeclSpec.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -882,6 +883,14 @@
     return QualType();
   }
 
+  // In the Microsoft ABI, the class is allowed to be an incomplete
+  // type. In such cases, the compiler makes a worst-case assumption.
+  // We make no such assumption right now, so emit an error if the
+  // class isn't a complete type.
+  if (Context.Target.getCXXABI() == "microsoft" &&
+      RequireCompleteType(Loc, Class, diag::err_incomplete_type))
+    return QualType();
+
   return Context.getMemberPointerType(T, Class.getTypePtr());
 }
 

Added: cfe/trunk/test/SemaCXX/member-pointer-ms.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/member-pointer-ms.cpp?rev=111118&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/member-pointer-ms.cpp (added)
+++ cfe/trunk/test/SemaCXX/member-pointer-ms.cpp Sun Aug 15 23:01:50 2010
@@ -0,0 +1,6 @@
+// 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'}}
+