From 63e5e64a49ef936383ad93ea283b2b07f115e78c Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 8 Oct 2009 00:14:38 +0000 Subject: [PATCH] Only perform an implicit instantiation of a function if its template specialization kind is TSK_ImplicitInstantiation. Previously, we would end up implicitly instantiating functions that had explicit specialization declarations or explicit instantiation declarations (with no corresponding definitions). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@83511 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 12 +++--------- test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index e7b074b43c..3bd72d07d2 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -6198,15 +6198,9 @@ void Sema::MarkDeclarationReferenced(SourceLocation Loc, Decl *D) { if (FunctionDecl *Function = dyn_cast(D)) { // Implicit instantiation of function templates and member functions of // class templates. - if (!Function->getBody()) { - // FIXME: distinguish between implicit instantiations of function - // templates and explicit specializations (the latter don't get - // instantiated, naturally). - if (Function->getInstantiatedFromMemberFunction() || - Function->getPrimaryTemplate()) - PendingImplicitInstantiations.push_back(std::make_pair(Function, Loc)); - } - + if (!Function->getBody() && + Function->getTemplateSpecializationKind() == TSK_ImplicitInstantiation) + PendingImplicitInstantiations.push_back(std::make_pair(Function, Loc)); // FIXME: keep track of references to static functions Function->setUsed(true); diff --git a/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp b/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp index 553d62c9e5..413d0b949d 100644 --- a/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp +++ b/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp @@ -98,6 +98,12 @@ void test_spec(N0::X0 xvp, void *vp) { namespace N0 { template<> void X0::f1(void *) { } // expected-error{{no function template matches}} + + template<> void X0::f1(const volatile void*); +} + +void test_x0_cvvoid(N0::X0 x0, const volatile void *cvp) { + x0.f1(cvp); // okay: we've explicitly specialized } #if 0 -- 2.40.0