PR12937: Explicitly deleting an explicit template specialization.

This works around a quirk in the way that explicit template specializations are
handled in Clang. We generate an implicit declaration from the original
template which the explicit specialization is considered to redeclare. This
trips up the explicit delete logic.

This change only works around that strange representation. At some point it'd
be nice to remove those extra declarations to make the AST more accurately
reflect the C++ semantics.

Review by Doug Gregor.

llvm-svn: 159167
This commit is contained in:
David Blaikie 2012-06-25 21:55:30 +00:00
parent 606953fbe7
commit 368055211a
3 changed files with 23 additions and 2 deletions

View File

@ -10316,8 +10316,13 @@ void Sema::SetDeclDeleted(Decl *Dcl, SourceLocation DelLoc) {
return;
}
if (const FunctionDecl *Prev = Fn->getPreviousDecl()) {
Diag(DelLoc, diag::err_deleted_decl_not_first);
Diag(Prev->getLocation(), diag::note_previous_declaration);
// Don't consider the implicit declaration we generate for explicit
// specializations. FIXME: Do not generate these implicit declarations.
if (Prev->getTemplateSpecializationKind() != TSK_ExplicitSpecialization
|| Prev->getPreviousDecl()) {
Diag(DelLoc, diag::err_deleted_decl_not_first);
Diag(Prev->getLocation(), diag::note_previous_declaration);
}
// If the declaration wasn't the first, we delete the function anyway for
// recovery.
}

View File

@ -0,0 +1,8 @@
// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s
template<typename> void func();
template<> void func<int>() = delete;
template<typename> void func2();
template<> void func2<int>(); // expected-note {{previous declaration is here}}
template<> void func2<int>() = delete; // expected-error {{deleted definition must be first declaration}}

View File

@ -55,3 +55,11 @@ struct Z : virtual DelDtor {
~Z() {} // expected-error {{attempt to use a deleted function}}
};
DelDtor dd; // expected-error {{attempt to use a deleted function}}
template<typename> void test2() = delete;
template void test2<int>();
// test3 really shouldn't have behavior that differs from test2 above
template<typename> void test3() = delete; // expected-note {{explicit instantiation refers here}}
template<typename> void test3();
template void test3<int>(); // expected-error {{explicit instantiation of undefined function template 'test3'}}