Abstract out the emission of vtables, add basic support for vtable emission when using -cxx-abi microsoft

Reviewed at http://llvm-reviews.chandlerc.com/D1532

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

1 files changed, 15 insertions, 65 deletions

diff --git a/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp b/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
index 9a065d4c02..82e8f1c516 100644
--- a/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
+++ b/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -fdump-vtable-layouts -o - > %t 2>&1
-// RUN: FileCheck --check-prefix=EMITS-VTABLE %s < %t
-// RUN: FileCheck --check-prefix=NO-VTABLE %s < %t
+// RUN: FileCheck --check-prefix=EMITS-VFTABLE %s < %t
+// RUN: FileCheck --check-prefix=NO-VFTABLE %s < %t
 // RUN: FileCheck --check-prefix=CHECK-A %s < %t
 // RUN: FileCheck --check-prefix=CHECK-B %s < %t
 // RUN: FileCheck --check-prefix=CHECK-C %s < %t
@@ -10,19 +10,12 @@
 // RUN: FileCheck --check-prefix=CHECK-G %s < %t
 // RUN: FileCheck --check-prefix=CHECK-I %s < %t
 
-// FIXME: Currently, we only test VFTableContext in the AST, but still use
-// VTableContext for CodeGen. We should remove the "Vtable" checks below when we
-// completely switch from VTableContext to VFTableContext.
-// Currently, the order of Vtable vs VFTable output depends on whether the
-// v*table info was required by a constructor or a method definition.
-
 struct A {
   // CHECK-A: VFTable for 'A' (3 entries)
   // CHECK-A-NEXT: 0 | void A::f()
   // CHECK-A-NEXT: 1 | void A::g()
   // CHECK-A-NEXT: 2 | void A::h()
-
-  // CHECK-A: Vtable for 'A' (3 entries)
+  // CHECK-A: VFTable indices for 'A' (3 entries)
   // CHECK-A-NEXT: 0 | void A::f()
   // CHECK-A-NEXT: 1 | void A::g()
   // CHECK-A-NEXT: 2 | void A::h()
@@ -33,20 +26,17 @@ struct A {
   int ia;
 };
 A a;
-// EMITS-VTABLE-DAG: @"\01??_7A@@6B@" = linkonce_odr unnamed_addr constant [3 x i8*]
+// EMITS-VFTABLE-DAG: @"\01??_7A@@6B@" = linkonce_odr unnamed_addr constant [3 x i8*]
 
 struct B : A {
-  // CHECK-B: Vtable for 'B' (5 entries)
+  // CHECK-B: VFTable for 'A' in 'B' (5 entries)
   // CHECK-B-NEXT: 0 | void B::f()
   // CHECK-B-NEXT: 1 | void A::g()
   // CHECK-B-NEXT: 2 | void A::h()
   // CHECK-B-NEXT: 3 | void B::i()
   // CHECK-B-NEXT: 4 | void B::j()
-
-  // CHECK-B: VFTable for 'A' in 'B' (5 entries)
+  // CHECK-B: VFTable indices for 'B' (3 entries)
   // CHECK-B-NEXT: 0 | void B::f()
-  // CHECK-B-NEXT: 1 | void A::g()
-  // CHECK-B-NEXT: 2 | void A::h()
   // CHECK-B-NEXT: 3 | void B::i()
   // CHECK-B-NEXT: 4 | void B::j()
 
@@ -55,7 +45,7 @@ struct B : A {
   virtual void j();
 };
 B b;
-// EMITS-VTABLE-DAG: @"\01??_7B@@6B@" = linkonce_odr unnamed_addr constant [5 x i8*]
+// EMITS-VFTABLE-DAG: @"\01??_7B@@6B@" = linkonce_odr unnamed_addr constant [5 x i8*]
 
 struct C {
   // CHECK-C: VFTable for 'C' (2 entries)
@@ -65,25 +55,17 @@ struct C {
   // CHECK-C-NEXT: 0 | C::~C() [scalar deleting]
   // CHECK-C-NEXT: 1 | void C::f()
 
-  // CHECK-C: Vtable for 'C' (2 entries)
-  // CHECK-C-NEXT: 0 | C::~C() [scalar deleting]
-  // CHECK-C-NEXT: 1 | void C::f()
-  // CHECK-C: VTable indices for 'C' (2 entries).
-  // CHECK-C-NEXT: 0 | C::~C() [scalar deleting]
-  // CHECK-C-NEXT: 1 | void C::f()
-
   virtual ~C();
   virtual void f();
 };
 void C::f() {}
-// NO-VTABLE-NOT: @"\01??_7C@@6B@"
+// NO-VFTABLE-NOT: @"\01??_7C@@6B@"
 
 struct D {
-  // CHECK-D: Vtable for 'D' (2 entries)
+  // CHECK-D: VFTable for 'D' (2 entries)
   // CHECK-D-NEXT: 0 | void D::f()
   // CHECK-D-NEXT: 1 | D::~D() [scalar deleting]
-
-  // CHECK-D: VFTable for 'D' (2 entries)
+  // CHECK-D: VFTable indices for 'D' (2 entries)
   // CHECK-D-NEXT: 0 | void D::f()
   // CHECK-D-NEXT: 1 | D::~D() [scalar deleting]
 
@@ -91,7 +73,7 @@ struct D {
   virtual ~D();
 };
 D d;
-// EMITS-VTABLE-DAG: @"\01??_7D@@6B@" = linkonce_odr unnamed_addr constant [2 x i8*]
+// EMITS-VFTABLE-DAG: @"\01??_7D@@6B@" = linkonce_odr unnamed_addr constant [2 x i8*]
 
 struct E : A {
   // CHECK-E: VFTable for 'A' in 'E' (5 entries)
@@ -104,35 +86,15 @@ struct E : A {
   // CHECK-E-NEXT: 3 | E::~E() [scalar deleting]
   // CHECK-E-NEXT: 4 | void E::i()
 
-  // CHECK-E: Vtable for 'E' (5 entries)
-  // CHECK-E-NEXT: 0 | void A::f()
-  // CHECK-E-NEXT: 1 | void A::g()
-  // CHECK-E-NEXT: 2 | void A::h()
-  // CHECK-E-NEXT: 3 | E::~E() [scalar deleting]
-  // CHECK-E-NEXT: 4 | void E::i()
-  // CHECK-E: VTable indices for 'E' (2 entries).
-  // CHECK-E-NEXT: 3 | E::~E() [scalar deleting]
-  // CHECK-E-NEXT: 4 | void E::i()
-
   // ~E would be the key method, but it isn't used, and MS ABI has no key
   // methods.
   virtual ~E();
   virtual void i();
 };
 void E::i() {}
-// NO-VTABLE-NOT: @"\01??_7E@@6B@"
+// NO-VFTABLE-NOT: @"\01??_7E@@6B@"
 
 struct F : A {
-  // CHECK-F: Vtable for 'F' (5 entries)
-  // CHECK-F-NEXT: 0 | void A::f()
-  // CHECK-F-NEXT: 1 | void A::g()
-  // CHECK-F-NEXT: 2 | void A::h()
-  // CHECK-F-NEXT: 3 | void F::i()
-  // CHECK-F-NEXT: 4 | F::~F() [scalar deleting]
-  // CHECK-F: VTable indices for 'F' (2 entries).
-  // CHECK-F-NEXT: 3 | void F::i()
-  // CHECK-F-NEXT: 4 | F::~F() [scalar deleting]
-
   // CHECK-F: VFTable for 'A' in 'F' (5 entries)
   // CHECK-F-NEXT: 0 | void A::f()
   // CHECK-F-NEXT: 1 | void A::g()
@@ -147,7 +109,7 @@ struct F : A {
   virtual ~F();
 };
 F f;
-// EMITS-VTABLE-DAG: @"\01??_7F@@6B@" = linkonce_odr unnamed_addr constant [5 x i8*]
+// EMITS-VFTABLE-DAG: @"\01??_7F@@6B@" = linkonce_odr unnamed_addr constant [5 x i8*]
 
 struct G : E {
   // CHECK-G: VFTable for 'A' in 'E' in 'G' (6 entries)
@@ -162,31 +124,19 @@ struct G : E {
   // CHECK-G-NEXT: 3 | G::~G() [scalar deleting]
   // CHECK-G-NEXT: 5 | void G::j()
 
-  // CHECK-G: Vtable for 'G' (6 entries)
-  // CHECK-G-NEXT: 0 | void G::f()
-  // CHECK-G-NEXT: 1 | void A::g()
-  // CHECK-G-NEXT: 2 | void A::h()
-  // CHECK-G-NEXT: 3 | G::~G() [scalar deleting]
-  // CHECK-G-NEXT: 4 | void E::i()
-  // CHECK-G-NEXT: 5 | void G::j()
-  // CHECK-G: VTable indices for 'G' (3 entries).
-  // CHECK-G-NEXT: 0 | void G::f()
-  // CHECK-G-NEXT: 3 | G::~G() [scalar deleting]
-  // CHECK-G-NEXT: 5 | void G::j()
-
   virtual void f();  // overrides A::f()
   virtual ~G();
   virtual void j();
 };
 void G::j() {}
-// NO-VTABLE-NOT: @"\01??_7G@@6B@"
+// NO-VFTABLE-NOT: @"\01??_7G@@6B@"
 
 // Test that the usual Itanium-style key method does not emit a vtable.
 struct H {
   virtual void f();
 };
 void H::f() {}
-// NO-VTABLE-NOT: @"\01??_7H@@6B@"
+// NO-VFTABLE-NOT: @"\01??_7H@@6B@"
 
 struct Empty { };