revert r99174. It caused PR6677. Will try to debug why tonight.

llvm-svn: 99188
This commit is contained in:
Rafael Espindola 2010-03-22 18:10:25 +00:00
parent 98bf5189d7
commit 6f0a14f9ab
2 changed files with 2 additions and 6 deletions

View File

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

View File

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