From 071f8b088c907969d9235c1c5d92924c6bcea346 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 3 Oct 2014 08:03:23 +0000 Subject: [PATCH] MS ABI: Move test from virtual-inheritance to single-inheritance The test didn't actually use virtual inheritance. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@218966 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../microsoft-abi-vtables-single-inheritance.cpp | 10 ++++++++++ .../microsoft-abi-vtables-virtual-inheritance.cpp | 14 +------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp b/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp index d453f5c55a..baed35145f 100644 --- a/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp +++ b/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp @@ -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() {} diff --git a/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp b/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp index 4be681deab..65d6a9d90e 100644 --- a/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp +++ b/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp @@ -766,24 +766,12 @@ 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*)] }; } -- 2.40.0