Make thunk this/return adjustment ABI-specific. Also, fix the return adjustment when using -cxx-abi microsoft
Reviewed at http://llvm-reviews.chandlerc.com/D2026
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193679 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp b/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp
index 11f5654..c3f1ab0 100644
--- a/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp
+++ b/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp
@@ -275,7 +275,7 @@
// THIS-THUNKS-Test1-NEXT: [this adjustment: -4 non-virtual]
// THIS-THUNKS-Test1: Thunks for 'void this_adjustment::Test1::g()' (1 entry).
- // THIS-THUNKS-Test1-NEXT: 0 | this adjustment: -4 non-virtual
+ // THIS-THUNKS-Test1-NEXT: 0 | [this adjustment: -4 non-virtual]
// THIS-THUNKS-Test1: VFTable indices for 'this_adjustment::Test1' (1 entries).
// THIS-THUNKS-Test1-NEXT: 0 | void this_adjustment::Test1::g()
@@ -301,7 +301,7 @@
// THIS-THUNKS-Test2-NEXT: [this adjustment: -4 non-virtual]
// THIS-THUNKS-Test2: Thunks for 'void this_adjustment::Test2::g()' (1 entry).
- // THIS-THUNKS-Test2-NEXT: 0 | this adjustment: -4 non-virtual
+ // THIS-THUNKS-Test2-NEXT: 0 | [this adjustment: -4 non-virtual]
// THIS-THUNKS-Test2: VFTable indices for 'this_adjustment::Test2' (1 entries).
// THIS-THUNKS-Test2-NEXT: via vfptr at offset 4
@@ -327,18 +327,18 @@
// THIS-THUNKS-Test3: VFTable for 'A' in 'no_thunks::Test2' in 'this_adjustment::Test3' (1 entries).
// THIS-THUNKS-Test3-NEXT: 0 | void this_adjustment::Test3::f()
- // THIS-THUNKS-Test3-NEXT: [this adjustment: -8 non-virtual]
+ // THIS-THUNKS-Test3-NEXT: [this adjustment: -8 non-virtual]
// THIS-THUNKS-Test3: Thunks for 'void this_adjustment::Test3::f()' (1 entry).
- // THIS-THUNKS-Test3-NEXT: 0 | this adjustment: -8 non-virtual
+ // THIS-THUNKS-Test3-NEXT: 0 | [this adjustment: -8 non-virtual]
// THIS-THUNKS-Test3: VFTable for 'B' in 'no_thunks::Test2' in 'this_adjustment::Test3' (2 entries).
// THIS-THUNKS-Test3-NEXT: 0 | void this_adjustment::Test3::g()
- // THIS-THUNKS-Test3-NEXT: [this adjustment: -8 non-virtual]
+ // THIS-THUNKS-Test3-NEXT: [this adjustment: -8 non-virtual]
// THIS-THUNKS-Test3-NEXT: 1 | void B::h()
// THIS-THUNKS-Test3: Thunks for 'void this_adjustment::Test3::g()' (1 entry).
- // THIS-THUNKS-Test3-NEXT: 0 | this adjustment: -8 non-virtual
+ // THIS-THUNKS-Test3-NEXT: 0 | [this adjustment: -8 non-virtual]
// THIS-THUNKS-Test3: VFTable indices for 'this_adjustment::Test3' (2 entries).
// THIS-THUNKS-Test3-NEXT: via vfptr at offset 0
@@ -373,7 +373,7 @@
// VDTOR-THUNKS-Test3-NEXT: [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test3: Thunks for 'vdtor::Test3::~Test3()' (1 entry).
- // VDTOR-THUNKS-Test3-NEXT: 0 | this adjustment: -4 non-virtual
+ // VDTOR-THUNKS-Test3-NEXT: 0 | [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test3: VFTable indices for 'vdtor::Test3' (1 entries).
// VDTOR-THUNKS-Test3-NEXT: 0 | vdtor::Test3::~Test3() [scalar deleting]
@@ -398,7 +398,7 @@
// VDTOR-THUNKS-Test5-NEXT: [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test5: Thunks for 'vdtor::Test5::~Test5()' (1 entry).
- // VDTOR-THUNKS-Test5-NEXT: 0 | this adjustment: -4 non-virtual
+ // VDTOR-THUNKS-Test5-NEXT: 0 | [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test5: VFTable indices for 'vdtor::Test5' (1 entries).
// VDTOR-THUNKS-Test5-NEXT: -- accessible via vfptr at offset 4 --
@@ -418,7 +418,7 @@
// VDTOR-THUNKS-Test6-NEXT: [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test6: Thunks for 'vdtor::Test6::~Test6()' (1 entry).
- // VDTOR-THUNKS-Test6-NEXT: 0 | this adjustment: -4 non-virtual
+ // VDTOR-THUNKS-Test6-NEXT: 0 | [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test6: VFTable indices for 'vdtor::Test6' (1 entries).
// VDTOR-THUNKS-Test6-NEXT: -- accessible via vfptr at offset 4 --
@@ -436,7 +436,7 @@
// VDTOR-THUNKS-Test7-NEXT: [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test7: Thunks for 'vdtor::Test7::~Test7()' (1 entry).
- // VDTOR-THUNKS-Test7-NEXT: 0 | this adjustment: -4 non-virtual
+ // VDTOR-THUNKS-Test7-NEXT: 0 | [this adjustment: -4 non-virtual]
// VDTOR-THUNKS-Test7: VFTable indices for 'vdtor::Test7' (1 entries).
// VDTOR-THUNKS-Test7-NEXT: -- accessible via vfptr at offset 4 --