diff options
| -rw-r--r-- | lib/CodeGen/CGVtable.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenCXX/vtable-linkage.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp index e79e91a446..afbfeabeb8 100644 --- a/lib/CodeGen/CGVtable.cpp +++ b/lib/CodeGen/CGVtable.cpp @@ -3617,7 +3617,7 @@ int64_t CodeGenVTables::getVirtualBaseOffsetOffset(const CXXRecordDecl *RD, return I->second; } -static bool UseNewVTableCode = false; +static bool UseNewVTableCode = true; uint64_t CodeGenVTables::getAddressPoint(BaseSubobject Base, const CXXRecordDecl *RD) { diff --git a/test/CodeGenCXX/vtable-linkage.cpp b/test/CodeGenCXX/vtable-linkage.cpp index 63e17431c4..a4ea2a19c2 100644 --- a/test/CodeGenCXX/vtable-linkage.cpp +++ b/test/CodeGenCXX/vtable-linkage.cpp @@ -84,54 +84,54 @@ void use_F(F<char> &fc) { // CHECK: @_ZTV1B = external constant // C has no key function, so its vtable should have weak_odr linkage. +// CHECK: @_ZTV1C = weak_odr constant // CHECK: @_ZTS1C = weak_odr constant // CHECK: @_ZTI1C = weak_odr constant -// CHECK: @_ZTV1C = weak_odr constant // D has a key function that is defined in this translation unit so its vtable is // defined in the translation unit. +// CHECK: @_ZTV1D = constant // CHECK: @_ZTS1D = constant // CHECK: @_ZTI1D = constant -// CHECK: @_ZTV1D = constant // E<char> is an explicit specialization with a key function defined // in this translation unit, so its vtable should have external // linkage. +// CHECK: @_ZTV1EIcE = constant // CHECK: @_ZTS1EIcE = constant // CHECK: @_ZTI1EIcE = constant -// CHECK: @_ZTV1EIcE = constant // E<short> is an explicit template instantiation with a key function // defined in this translation unit, so its vtable should have // weak_odr linkage. +// CHECK: @_ZTV1EIsE = weak_odr constant // CHECK: @_ZTS1EIsE = weak_odr constant // CHECK: @_ZTI1EIsE = weak_odr constant -// CHECK: @_ZTV1EIsE = weak_odr constant // F<short> is an explicit template instantiation without a key // function, so its vtable should have weak_odr linkage +// CHECK: @_ZTV1FIsE = weak_odr constant // CHECK: @_ZTS1FIsE = weak_odr constant // CHECK: @_ZTI1FIsE = weak_odr constant -// CHECK: @_ZTV1FIsE = weak_odr constant // E<long> is an implicit template instantiation with a key function // defined in this translation unit, so its vtable should have // weak_odr linkage. +// CHECK: @_ZTV1EIlE = weak_odr constant // CHECK: @_ZTS1EIlE = weak_odr constant // CHECK: @_ZTI1EIlE = weak_odr constant -// CHECK: @_ZTV1EIlE = weak_odr constant // F<long> is an implicit template instantiation with no key function, // so its vtable should have weak_odr linkage. +// CHECK: @_ZTV1FIlE = weak_odr constant // CHECK: @_ZTS1FIlE = weak_odr constant // CHECK: @_ZTI1FIlE = weak_odr constant -// CHECK: @_ZTV1FIlE = weak_odr constant // F<int> is an explicit template instantiation declaration without a // key function, so its vtable should have weak_odr linkage. +// CHECK: @_ZTV1FIiE = weak_odr constant // CHECK: @_ZTS1FIiE = weak_odr constant // CHECK: @_ZTI1FIiE = weak_odr constant -// CHECK: @_ZTV1FIiE = weak_odr constant // E<int> is an explicit template instantiation declaration. It has a // key function that is not instantiated, so we should only reference @@ -140,14 +140,14 @@ void use_F(F<char> &fc) { // The anonymous struct for e has no linkage, so the vtable should have // internal linkage. +// CHECK: @"_ZTV3$_0" = internal constant // CHECK: @"_ZTS3$_0" = internal constant // CHECK: @"_ZTI3$_0" = internal constant -// CHECK: @"_ZTV3$_0" = internal constant // The A vtable should have internal linkage since it is inside an anonymous // namespace. +// CHECK: @_ZTVN12_GLOBAL__N_11AE = internal constant // CHECK: @_ZTSN12_GLOBAL__N_11AE = internal constant // CHECK: @_ZTIN12_GLOBAL__N_11AE = internal constant -// CHECK: @_ZTVN12_GLOBAL__N_11AE = internal constant |