replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A fixed version of r99174 which also includes a test that we emit vtables when 

we see an specialization definition ever if we then see a extern template declaration.

llvm-svn: 99226
This commit is contained in:
Rafael Espindola 2010-03-22 23:12:48 +00:00
parent d22ed622b3
commit 8d04f0604e
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -5889,7 +5889,7 @@ static bool needsVtable(CXXMethodDecl *MD, ASTContext &Context) {
break;
case TSK_ExplicitInstantiationDeclaration:
return true; //FIXME: This looks wrong.
return false;
case TSK_ExplicitInstantiationDefinition:
// This is method of a explicit instantiation; mark all of the virtual

11
clang/lib/Sema/SemaTemplate.cpp
View File

@ -4388,8 +4388,17 @@ Sema::ActOnExplicitInstantiation(Scope *S,
// Instantiate the members of this class template specialization.
Def = cast_or_null<ClassTemplateSpecializationDecl>(
Specialization->getDefinition());
if (Def)
if (Def) {
TemplateSpecializationKind Old_TSK = Def->getTemplateSpecializationKind();
// Fix a TSK_ExplicitInstantiationDeclaration followed by a
// TSK_ExplicitInstantiationDefinition
if (Old_TSK == TSK_ExplicitInstantiationDeclaration &&
TSK == TSK_ExplicitInstantiationDefinition)
Def->setTemplateSpecializationKind(TSK);
InstantiateClassTemplateSpecializationMembers(TemplateNameLoc, Def, TSK);
}
return DeclPtrTy::make(Specialization);
}

33
clang/test/CodeGenCXX/PR6677.cpp Normal file
View File

@ -0,0 +1,33 @@
// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// CHECK-NOT: @_ZTVN5test118stdio_sync_filebufIwEE = constant
// CHECK: @_ZTVN5test018stdio_sync_filebufIwEE = constant
namespace test0 {
struct basic_streambuf {
virtual ~basic_streambuf();
};
template<typename _CharT >
struct stdio_sync_filebuf : public basic_streambuf {
virtual void xsgetn();
};
// This specialization should cause the vtable to be emitted, even with
// the following extern template declaration.
template<> void stdio_sync_filebuf<wchar_t>::xsgetn() {
}
extern template class stdio_sync_filebuf<wchar_t>;
}
namespace test1 {
struct basic_streambuf {
virtual ~basic_streambuf();
};
template<typename _CharT >
struct stdio_sync_filebuf : public basic_streambuf {
virtual void xsgetn();
};
// Just a declaration should not force the vtable to be emitted.
template<> void stdio_sync_filebuf<wchar_t>::xsgetn();
}