r207771 - MSVCCompat: Don't produce an invalid AST when accepting void pseudo-dtors

Reid Kleckner reid at kleckner.net
Thu May 1 09:50:24 PDT 2014


Author: rnk
Date: Thu May  1 11:50:23 2014
New Revision: 207771

URL: http://llvm.org/viewvc/llvm-project?rev=207771&view=rev
Log:
MSVCCompat: Don't produce an invalid AST when accepting void pseudo-dtors

We accept 'void *p; p->~void();' for MSVC compatibility since r148682.
However, we were returning ExprError, rather than producing an AST,
despite only diagnosing it with a warning.  CodeGen noticed that the
template function specialization had an invalid AST, and therefore
didn't generate code for it.  This change makes us produce an AST with a
void pseudo-dtor call.

Part of PR18256.

Added:
    cfe/trunk/test/CodeGenCXX/microsoft-compatibility.cpp
Modified:
    cfe/trunk/lib/Sema/SemaExprCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=207771&r1=207770&r2=207771&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Thu May  1 11:50:23 2014
@@ -5378,10 +5378,11 @@ ExprResult Sema::BuildPseudoDestructorEx
       !ObjectType->isVectorType()) {
     if (getLangOpts().MSVCCompat && ObjectType->isVoidType())
       Diag(OpLoc, diag::ext_pseudo_dtor_on_void) << Base->getSourceRange();
-    else
+    else {
       Diag(OpLoc, diag::err_pseudo_dtor_base_not_scalar)
         << ObjectType << Base->getSourceRange();
-    return ExprError();
+      return ExprError();
+    }
   }
 
   // C++ [expr.pseudo]p2:

Added: cfe/trunk/test/CodeGenCXX/microsoft-compatibility.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-compatibility.cpp?rev=207771&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/microsoft-compatibility.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/microsoft-compatibility.cpp Thu May  1 11:50:23 2014
@@ -0,0 +1,21 @@
+// RUN: %clang_cc1 %s -triple i686-pc-win32 -std=c++11 -fms-compatibility -emit-llvm -o - | FileCheck %s
+
+template<class T>
+void destroy(T *p) {
+  p->~T();
+}
+
+extern "C" void f() {
+  int a;
+  destroy((void*)&a);
+}
+
+// CHECK-LABEL: define void @f()
+// CHECK: call void @"\01??$destroy at X@@YAXPAX at Z"
+// CHECK: ret void
+
+// CHECK-LABEL: define linkonce_odr void @"\01??$destroy at X@@YAXPAX at Z"(i8* %p)
+//    The pseudo-dtor expr should not generate calls to anything.
+// CHECK-NOT: call
+// CHECK-NOT: invoke
+// CHECK: ret void





More information about the cfe-commits mailing list