diff options
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 6 | ||||
| -rw-r--r-- | test/SemaTemplate/explicit-specialization-member.cpp | 19 |
2 files changed, 22 insertions, 3 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index b134f6ea51..e4fa380c3d 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -6521,9 +6521,9 @@ bool Sema::CheckFunctionTemplateSpecialization( // FIXME: It is somewhat wasteful to build TemplateDeductionInfo Info(FailedCandidates.getLocation()); FunctionDecl *Specialization = 0; - if (TemplateDeductionResult TDK - = DeduceTemplateArguments(FunTmpl, ExplicitTemplateArgs, FT, - Specialization, Info)) { + if (TemplateDeductionResult TDK = DeduceTemplateArguments( + cast<FunctionTemplateDecl>(FunTmpl->getFirstDecl()), + ExplicitTemplateArgs, FT, Specialization, Info)) { // Template argument deduction failed; record why it failed, so // that we can provide nifty diagnostics. FailedCandidates.addCandidate() diff --git a/test/SemaTemplate/explicit-specialization-member.cpp b/test/SemaTemplate/explicit-specialization-member.cpp index 9ddbc04953..07d7389446 100644 --- a/test/SemaTemplate/explicit-specialization-member.cpp +++ b/test/SemaTemplate/explicit-specialization-member.cpp @@ -28,3 +28,22 @@ namespace PR12331 { }; template<> struct S<int>::U { static const int n = sizeof(int); }; // expected-error {{explicit specialization of 'U' after instantiation}} } + +namespace PR18246 { + template<typename T> + class Baz { + public: + template<int N> void bar(); + }; + + template<typename T> + template<int N> + void Baz<T>::bar() { + } + + // FIXME: Don't suggest the 'template<>' correction here, because this cannot + // be an explicit specialization. + template<typename T> + void Baz<T>::bar<0>() { // expected-error {{requires 'template<>'}} + } +} |