Author: majnemer
Date: Fri Oct 3 03:03:23 2014
New Revision: 218966
URL: http://llvm.org/viewvc/llvm-project?rev=218966&view=rev
Log:
MS ABI: Move test from virtual-inheritance to single-inheritance
The test didn't actually use virtual inheritance.
Modified:
cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp
Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp?rev=218966&r1=218965&r2=218966&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
(original)
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp Fri
Oct 3 03:03:23 2014
@@ -289,3 +289,13 @@ struct R : Q {
R r;
void use(R *obj) { obj->foo(42l); }
+
+struct S {
+ // CHECK-LABEL: VFTable for 'S' (1 entry).
+ // CHECK-NEXT: 0 | void S::f() [deleted]
+ virtual void f() = delete;
+ S();
+ // EMITS-VFTABLE-DAG: @"\01??_7S@@6B@" = linkonce_odr unnamed_addr constant
[1 x i8*] [i8* bitcast (void ()* @_purecall to i8*)]
+};
+
+S::S() {}
Modified:
cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp?rev=218966&r1=218965&r2=218966&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp
(original)
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp Fri
Oct 3 03:03:23 2014
@@ -767,23 +767,11 @@ W::W() {}
namespace Test13 {
struct A {
- // CHECK-LABEL: VFTable for 'Test13::A' (1 entry).
- // CHECK-NEXT: 0 | void Test13::A::f() [deleted]
- virtual void f() = delete;
- A();
- // MANGLING-DAG: @"\01??_7A@Test13@@6B@" = linkonce_odr unnamed_addr
constant [1 x i8*] [i8* bitcast (void ()* @_purecall to i8*)]
-};
-
-A::A() {}
-}
-
-namespace Test14 {
-struct A {
virtual void f();
};
struct __declspec(dllexport) B : virtual A {
virtual void f() = 0;
- // MANGLING-DAG: @"\01??_7B@Test14@@6B@" = weak_odr dllexport unnamed_addr
constant [1 x i8*] [i8* bitcast (void ()* @_purecall to i8*)]
+ // MANGLING-DAG: @"\01??_7B@Test13@@6B@" = weak_odr dllexport unnamed_addr
constant [1 x i8*] [i8* bitcast (void ()* @_purecall to i8*)]
};
}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
