Author a FIXME in a test now that PR12784 is fixed

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@191758 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGenCXX/constructor-destructor-return-this.cpp b/test/CodeGenCXX/constructor-destructor-return-this.cpp
index 707a70ef2c19751373ff743d84afe6a8c46a21ec..3f52c48f635d1a1c2d0a033f677477d6c071d6fc 100644 (file)
--- a/test/CodeGenCXX/constructor-destructor-return-this.cpp
+++ b/test/CodeGenCXX/constructor-destructor-return-this.cpp
@@ -1,9 +1,6 @@
 //RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-unknown-linux | FileCheck --check-prefix=CHECKGEN %s
 //RUN: %clang_cc1 %s -emit-llvm -o - -triple=thumbv7-apple-ios3.0 -target-abi apcs-gnu | FileCheck --check-prefix=CHECKARM %s
-//RUN: not %clang_cc1 %s -emit-llvm -o - -DPR12784_WORKAROUND -triple=x86_64-pc-win32 -cxx-abi microsoft | FileCheck --check-prefix=CHECKMS %s
-
-// FIXME: Add checks to ensure that Microsoft destructors do not return 'this'
-// once PR12784 is resolved
+//RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-pc-win32 -cxx-abi microsoft -fno-rtti | FileCheck --check-prefix=CHECKMS %s
 
 // Make sure we attach the 'returned' attribute to the 'this' parameter of
 // constructors and destructors which return this (and only these cases)
@@ -27,9 +24,7 @@ private:
 };
 
 B::B(int *i) : i_(i) { }
-#ifndef PR12784_WORKAROUND
 B::~B() { }
-#endif
 
 // CHECKGEN-LABEL: define void @_ZN1BC1EPi(%class.B* %this, i32* %i)
 // CHECKGEN-LABEL: define void @_ZN1BC2EPi(%class.B* %this, i32* %i)
@@ -41,7 +36,8 @@ B::~B() { }
 // CHECKARM-LABEL: define %class.B* @_ZN1BD1Ev(%class.B* returned %this)
 // CHECKARM-LABEL: define %class.B* @_ZN1BD2Ev(%class.B* returned %this)
 
-// CHECKMS: define %class.B* @"\01??0B@@QEAA@PEAH@Z"(%class.B* returned %this, i32* %i)
+// CHECKMS-LABEL: define %class.B* @"\01??0B@@QEAA@PEAH@Z"(%class.B* returned %this, i32* %i)
+// CHECKMS-LABEL: define void @"\01??1B@@QEAA@XZ"(%class.B* %this)
 
 class C : public A, public B {
 public:
@@ -52,9 +48,7 @@ private:
 };
 
 C::C(int *i, char *c) : B(i), c_(c) { }
-#ifndef PR12784_WORKAROUND
 C::~C() { }
-#endif
 
 // CHECKGEN-LABEL: define void @_ZN1CC1EPiPc(%class.C* %this, i32* %i, i8* %c)
 // CHECKGEN-LABEL: define void @_ZN1CC2EPiPc(%class.C* %this, i32* %i, i8* %c)
@@ -68,7 +62,8 @@ C::~C() { }
 // CHECKARM-LABEL: define %class.C* @_ZN1CD1Ev(%class.C* returned %this)
 // CHECKARM-LABEL: define %class.C* @_ZN1CD2Ev(%class.C* returned %this)
 
-// CHECKMS: define %class.C* @"\01??0C@@QEAA@PEAHPEAD@Z"(%class.C* returned %this, i32* %i, i8* %c)
+// CHECKMS-LABEL: define %class.C* @"\01??0C@@QEAA@PEAHPEAD@Z"(%class.C* returned %this, i32* %i, i8* %c)
+// CHECKMS-LABEL: define void @"\01??1C@@UEAA@XZ"(%class.C* %this)
 
 class D : public virtual A {
 public:
@@ -76,10 +71,8 @@ public:
   ~D();
 };
 
-#ifndef PR12784_WORKAROUND
 D::D() { }
 D::~D() { }
-#endif
 
 // CHECKGEN-LABEL: define void @_ZN1DC1Ev(%class.D* %this)
 // CHECKGEN-LABEL: define void @_ZN1DC2Ev(%class.D* %this, i8** %vtt)
@@ -91,6 +84,9 @@ D::~D() { }
 // CHECKARM-LABEL: define %class.D* @_ZN1DD1Ev(%class.D* returned %this)
 // CHECKARM-LABEL: define %class.D* @_ZN1DD2Ev(%class.D* returned %this, i8** %vtt)
 
+// CHECKMS-LABEL: define %class.D* @"\01??0D@@QEAA@XZ"(%class.D* returned %this, i32 %is_most_derived)
+// CHECKMS-LABEL: define void @"\01??1D@@QEAA@XZ"(%class.D* %this)
+
 class E {
 public:
   E();