maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

revert 99311. Looks like it broke darwin bootstrap. 

llvm-svn: 99317
This commit is contained in:
Rafael Espindola 2010-03-23 19:55:22 +00:00
parent 5921b83f54
commit fa1708fdea
4 changed files with 12 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/CodeGen/CGVtable.cpp
View File

@ -3805,17 +3805,7 @@ void CodeGenVTables::EmitVTableRelatedData(GlobalDecl GD) {
return; return;
TemplateSpecializationKind kind = RD->getTemplateSpecializationKind(); TemplateSpecializationKind kind = RD->getTemplateSpecializationKind();
if (kind == TSK_ImplicitInstantiation)
// The reason we have TSK_ExplicitInstantiationDeclaration in here (but not
// in Sema::MaybeMarkVirtualMembersReferenced) is for the case
// template<> void stdio_sync_filebuf<wchar_t>::xsgetn() {
// }
// extern template class stdio_sync_filebuf<wchar_t>;
// Since we are called after the extern declaration is seen.
if (kind == TSK_ImplicitInstantiation ||
kind == TSK_ExplicitInstantiationDeclaration)
CGM.DeferredVtables.push_back(RD); CGM.DeferredVtables.push_back(RD);
else else
GenerateClassData(CGM.getVtableLinkage(RD), RD); GenerateClassData(CGM.getVtableLinkage(RD), RD);

13
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -310,17 +310,8 @@ GetLinkageForFunction(ASTContext &Context, const FunctionDecl *FD,
// instantiated when used so that the body can be considered for // instantiated when used so that the body can be considered for
// inlining, but that no out-of-line copy of the inline function would be // inlining, but that no out-of-line copy of the inline function would be
// generated in the translation unit. -- end note ] // generated in the translation unit. -- end note ]
if (FD->getTemplateSpecializationKind()
// We check the specialization kind of the class for implicit methods. == TSK_ExplicitInstantiationDeclaration)
// They have a TSK_Undeclared specialization kind.
TemplateSpecializationKind TSK;
const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(FD);
if (MD && MD->isImplicit())
TSK = MD->getParent()->getTemplateSpecializationKind();
else
TSK = FD->getTemplateSpecializationKind();
if (TSK == TSK_ExplicitInstantiationDeclaration)
return CodeGenModule::GVA_C99Inline; return CodeGenModule::GVA_C99Inline;
return CodeGenModule::GVA_CXXInline; return CodeGenModule::GVA_CXXInline;

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

@ -4389,7 +4389,13 @@ Sema::ActOnExplicitInstantiation(Scope *S,
Def = cast_or_null<ClassTemplateSpecializationDecl>( Def = cast_or_null<ClassTemplateSpecializationDecl>(
Specialization->getDefinition()); Specialization->getDefinition());
if (Def) { if (Def) {
Def->setTemplateSpecializationKind(TSK); 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); InstantiateClassTemplateSpecializationMembers(TemplateNameLoc, Def, TSK);
} }

36
clang/test/CodeGenCXX/PR6677.cpp
View File

@ -3,9 +3,6 @@
// CHECK-NOT: @_ZTVN5test118stdio_sync_filebufIwEE = constant // CHECK-NOT: @_ZTVN5test118stdio_sync_filebufIwEE = constant
// CHECK: @_ZTVN5test018stdio_sync_filebufIwEE = constant // CHECK: @_ZTVN5test018stdio_sync_filebufIwEE = constant
// CHECK: define linkonce_odr void @_ZN5test21CIiE5fobarIdEEvT_
// CHECK: define available_externally void @_ZN5test21CIiE6zedbarEd
namespace test0 { namespace test0 {
struct basic_streambuf { struct basic_streambuf {
virtual ~basic_streambuf(); virtual ~basic_streambuf();
@ -16,12 +13,7 @@ namespace test0 {
}; };
// This specialization should cause the vtable to be emitted, even with // This specialization should cause the vtable to be emitted, even with
// the following extern template declaration (test at the top). // the following extern template declaration.
// The existance of the extern template declaration should prevent us from emitting
// destructors.
// CHECK: define available_externally void @_ZN5test018stdio_sync_filebufIwED0Ev
// CHECK: define available_externally void @_ZN5test018stdio_sync_filebufIwED2Ev
template<> void stdio_sync_filebuf<wchar_t>::xsgetn() { template<> void stdio_sync_filebuf<wchar_t>::xsgetn() {
} }
extern template class stdio_sync_filebuf<wchar_t>; extern template class stdio_sync_filebuf<wchar_t>;
@ -36,30 +28,6 @@ namespace test1 {
virtual void xsgetn(); virtual void xsgetn();
}; };
// Just a declaration should not force the vtable to be emitted // Just a declaration should not force the vtable to be emitted.
// (test at the top).
template<> void stdio_sync_filebuf<wchar_t>::xsgetn(); template<> void stdio_sync_filebuf<wchar_t>::xsgetn();
} }
namespace test2 {
template<typename T1>
class C {
void zedbar(double) {
}
template<typename T2>
void fobar(T2 foo) {
}
};
extern template class C<int>;
void g() {
C<int> a;
// The extern template declaration should not prevent us from producing
/// foobar.
// (test at the top).
a.fobar(0.0);
// But it should prevent zebbar
// (test at the top).
a.zedbar(0.0);
}
}