diff options
| -rw-r--r-- | lib/CodeGen/CGVtable.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGenCXX/vtable-linkage.cpp | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp index 2d1c73440b..fc6d1a8e37 100644 --- a/lib/CodeGen/CGVtable.cpp +++ b/lib/CodeGen/CGVtable.cpp @@ -3146,11 +3146,16 @@ void CodeGenVTables::EmitVTableRelatedData(GlobalDecl GD) { if (KeyFunction->getCanonicalDecl() != MD->getCanonicalDecl()) return; } else { + // If we have no key funcion and this is a explicit instantiation declaration, + // we will produce a vtable at the explicit instantiation. We don't need one + // here. + if (RDKind == clang::TSK_ExplicitInstantiationDeclaration) + return; + // If this is an explicit instantiation of a method, we don't need a vtable. // Since we have no key function, we will emit the vtable when we see // a use, and just defining a function is not an use. - if ((RDKind == TSK_ImplicitInstantiation || - RDKind == TSK_ExplicitInstantiationDeclaration) && + if (RDKind == TSK_ImplicitInstantiation && MDKind == TSK_ExplicitInstantiationDefinition) return; } diff --git a/test/CodeGenCXX/vtable-linkage.cpp b/test/CodeGenCXX/vtable-linkage.cpp index a4ea2a19c2..c75efe228d 100644 --- a/test/CodeGenCXX/vtable-linkage.cpp +++ b/test/CodeGenCXX/vtable-linkage.cpp @@ -128,10 +128,8 @@ void use_F(F<char> &fc) { // CHECK: @_ZTI1FIlE = 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 +// key function, so its vtable should have external linkage. +// CHECK: @_ZTV1FIiE = external constant // E<int> is an explicit template instantiation declaration. It has a // key function that is not instantiated, so we should only reference |