forked from OSchip/llvm-project
Revert r127206 "Detect attempts to provide a specialization of a function within
a...", it appears to cause us to reject various valid codes. llvm-svn: 127373
This commit is contained in:
parent
a319876559
commit
334b2136f6
clang
include/clang/Basic
lib/Sema
test/CXX/temp/temp.spec/temp.expl.spec
|
@ -1723,8 +1723,6 @@ 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<
|
||||
|
|
|
@ -4083,14 +4083,9 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
|
|||
Previous))
|
||||
NewFD->setInvalidDecl();
|
||||
} else if (isFunctionTemplateSpecialization) {
|
||||
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))
|
||||
if (CheckFunctionTemplateSpecialization(NewFD,
|
||||
(HasExplicitTemplateArgs ? &TemplateArgs : 0),
|
||||
Previous))
|
||||
NewFD->setInvalidDecl();
|
||||
} else if (isExplicitSpecialization && isa<CXXMethodDecl>(NewFD)) {
|
||||
if (CheckMemberSpecialization(NewFD, Previous))
|
||||
|
|
|
@ -237,15 +237,3 @@ 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}}
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue