summaryrefslogtreecommitdiffstats
path: root/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp
diff options
context:
space:
mode:
authorTimur Iskhodzhanov <timurrrr@google.com>2014-03-07 09:34:59 +0000
committerTimur Iskhodzhanov <timurrrr@google.com>2014-03-07 09:34:59 +0000
commitbf8b80b623db9a735e7cde0587506e2a321a7729 (patch)
treeed71adb1a85f89a789831c214f40c8dd4b7e06f2 /test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp
parent5af20f14ca5c3170b523f7b88b28560ce48766aa (diff)
Fix PR18967 -- Bad this adjustment for virtual methods in a diamond virtual inheritance hierarchy
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203222 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp')
-rw-r--r--test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp b/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp
index 0f53f73919..80efdd0490 100644
--- a/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp
+++ b/test/CodeGenCXX/microsoft-abi-virtual-inheritance.cpp
@@ -217,12 +217,7 @@ void call_complete_dtor() {
// CHECK: ret
}
-struct X : virtual VBase {
- int x;
-};
-
-
-struct C : X {
+struct C : B {
C();
// has an implicit vdtor.
};