Commit 6203d49b authored by Douglas Gregor's avatar Douglas Gregor
Browse files

Detect attempts to provide a specialization of a function within a 

dependent scope and produce an error (rather than crashing). Fixes PR8979.

llvm-svn: 127206
parent bd3f2606

clang/include/clang/Basic/DiagnosticSemaKinds.td

+2 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,8 @@ def err_template_spec_default_arg : Error< 
def err_not_class_template_specialization : Error<

  "cannot specialize a %select{dependent template|template template "

  "parameter}0">;

def err_function_specialization_in_class : Error<

  "cannot specialize a function %0 within class scope">;



// C++ class template specializations and out-of-line definitions

def err_template_spec_needs_header : Error<

clang/lib/Sema/SemaDecl.cpp

+8 −3
Original line number Diff line number Diff line
@@ -4067,7 +4067,12 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, 
                                                       Previous))

        NewFD->setInvalidDecl();

    } else if (isFunctionTemplateSpecialization) {

      if (CheckFunctionTemplateSpecialization(NewFD,

      if (CurContext->isDependentContext() && CurContext->isRecord()) {

        Diag(NewFD->getLocation(), diag::err_function_specialization_in_class)

          << NewFD->getDeclName();

        NewFD->setInvalidDecl();

        return 0;

      } else if (CheckFunctionTemplateSpecialization(NewFD,

                                  (HasExplicitTemplateArgs ? &TemplateArgs : 0),

                                                     Previous))

        NewFD->setInvalidDecl();

clang/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp

+12 −0
Original line number Diff line number Diff line
@@ -237,3 +237,15 @@ void test_func_template(N0::X0<void *> xvp, void *vp, const void *cvp, 
  xvp.ft1(vp, i);

  xvp.ft1(vp, u);

}



namespace PR8979 {

  template<typename Z>

  struct X0 {

    template <class T, class U> class Inner;

    struct OtherInner;

    template<typename T, typename U> void f(Inner<T, U>&);



    typedef Inner<OtherInner, OtherInner> MyInner;

    template<> void f(MyInner&); // expected-error{{cannot specialize a function 'f' within class scope}}

  };

}