diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index f0dea0c9bc89b..9473867c1f231 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -119,6 +119,8 @@ Improvements to Clang's time-trace Bug Fixes in This Version ------------------------- +- Clang now accepts elaborated-type-specifiers that explicitly specialize + a member class template for an implicit instantiation of a class template. Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 24d32cb87c89e..1c0ebbe4e6834 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -7148,8 +7148,7 @@ def warn_standalone_specifier : Warning<"'%0' ignored on this declaration">, def ext_standalone_specifier : ExtWarn<"'%0' is not permitted on a declaration " "of a type">, InGroup; def err_standalone_class_nested_name_specifier : Error< - "forward declaration of %select{class|struct|interface|union|enum|enum class|enum struct}0 cannot " - "have a nested name specifier">; + "forward declaration of %0 cannot have a nested name specifier">; def err_typecheck_sclass_func : Error<"illegal storage class on function">; def err_static_block_func : Error< "function declared in block scope cannot have 'static' storage class">; diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 9bf1e9dd08433..c89c3c487272d 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -5207,25 +5207,6 @@ Decl *Sema::ParsedFreeStandingDeclSpec(Scope *S, AccessSpecifier AS, return ActOnFriendTypeDecl(S, DS, TemplateParams); } - const CXXScopeSpec &SS = DS.getTypeSpecScope(); - bool IsExplicitSpecialization = - !TemplateParams.empty() && TemplateParams.back()->size() == 0; - if (Tag && SS.isNotEmpty() && !Tag->isCompleteDefinition() && - !IsExplicitInstantiation && !IsExplicitSpecialization && - !isa(Tag)) { - // Per C++ [dcl.type.elab]p1, a class declaration cannot have a - // nested-name-specifier unless it is an explicit instantiation - // or an explicit specialization. - // - // FIXME: We allow class template partial specializations here too, per the - // obvious intent of DR1819. - // - // Per C++ [dcl.enum]p1, an opaque-enum-declaration can't either. - Diag(SS.getBeginLoc(), diag::err_standalone_class_nested_name_specifier) - << GetDiagnosticTypeSpecifierID(DS) << SS.getRange(); - return nullptr; - } - // Track whether this decl-specifier declares anything. bool DeclaresAnything = true; @@ -17222,10 +17203,29 @@ Sema::ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK, SourceLocation KWLoc, // for non-C++ cases. if (TemplateParameterLists.size() > 0 || (SS.isNotEmpty() && TUK != TUK_Reference)) { - if (TemplateParameterList *TemplateParams = - MatchTemplateParametersToScopeSpecifier( - KWLoc, NameLoc, SS, nullptr, TemplateParameterLists, - TUK == TUK_Friend, isMemberSpecialization, Invalid)) { + TemplateParameterList *TemplateParams = + MatchTemplateParametersToScopeSpecifier( + KWLoc, NameLoc, SS, nullptr, TemplateParameterLists, + TUK == TUK_Friend, isMemberSpecialization, Invalid); + + // C++23 [dcl.type.elab] p2: + // If an elaborated-type-specifier is the sole constituent of a + // declaration, the declaration is ill-formed unless it is an explicit + // specialization, an explicit instantiation or it has one of the + // following forms: [...] + // C++23 [dcl.enum] p1: + // If the enum-head-name of an opaque-enum-declaration contains a + // nested-name-specifier, the declaration shall be an explicit + // specialization. + // + // FIXME: Class template partial specializations can be forward declared + // per CWG2213, but the resolution failed to allow qualified forward + // declarations. This is almost certainly unintentional, so we allow them. + if (TUK == TUK_Declaration && SS.isNotEmpty() && !isMemberSpecialization) + Diag(SS.getBeginLoc(), diag::err_standalone_class_nested_name_specifier) + << TypeWithKeyword::getTagTypeKindName(Kind) << SS.getRange(); + + if (TemplateParams) { if (Kind == TagTypeKind::Enum) { Diag(KWLoc, diag::err_enum_template); return true; diff --git a/clang/test/CXX/class.access/p4.cpp b/clang/test/CXX/class.access/p4.cpp index fef5b7aa88726..ca98c9f90bd89 100644 --- a/clang/test/CXX/class.access/p4.cpp +++ b/clang/test/CXX/class.access/p4.cpp @@ -611,6 +611,7 @@ namespace test21 { template class A::Inner {}; class B { template class A::Inner; // expected-error{{non-friend class member 'Inner' cannot have a qualified name}} + // expected-error@-1{{forward declaration of class cannot have a nested name specifier}} }; void test() { diff --git a/clang/test/CXX/dcl.dcl/dcl.enum/p1.cpp b/clang/test/CXX/dcl.dcl/dcl.enum/p1.cpp new file mode 100644 index 0000000000000..d97859f96ff91 --- /dev/null +++ b/clang/test/CXX/dcl.dcl/dcl.enum/p1.cpp @@ -0,0 +1,30 @@ +// RUN: %clang_cc1 -verify %s -std=c++11 + +template +struct S0 { + enum E0 : int; + + enum class E1; +}; + +struct S3 { + enum E2 : int; + + enum class E3; +}; + +template +enum S0::E0 : int; // expected-error{{cannot have a nested name specifier}} + +template<> +enum S0::E0 : int; + +template +enum class S0::E1; // expected-error{{cannot have a nested name specifier}} + +template<> +enum class S0::E1; + +enum S3::E2 : int; // expected-error{{cannot have a nested name specifier}} + +enum class S3::E3; // expected-error{{cannot have a nested name specifier}} diff --git a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p1.cpp b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p1.cpp index e3982fd6a8386..e2408cdc5a7a7 100644 --- a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p1.cpp +++ b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p1.cpp @@ -16,7 +16,7 @@ template<> struct N::B; template struct N::B; template struct C; -template struct C; // FIXME: This is technically ill-formed, but that's not the intent. +template struct C; template<> struct C; template struct C; @@ -24,3 +24,67 @@ template struct D::A; // expected-error {{cannot have a nested name template struct D::A; // FIXME: This is technically ill-formed, but that's not the intent. template<> struct D::A; template struct D::A; + +namespace qualified_decl { + template + struct S0 { + struct S1; + + template + struct S2; + + enum E0 : int; + + enum class E1; + }; + + struct S3 { + struct S4; + + template + struct S5; + + enum E2 : int; + + enum class E3; + }; + + template + struct S0::S1; // expected-error{{cannot have a nested name specifier}} + + template<> + struct S0::S1; + + template + template + struct S0::S2; // expected-error{{cannot have a nested name specifier}} + + template + template + struct S0::S2; + + template<> + template<> + struct S0::S2; + + template<> + template + struct S0::S2; + + struct S3::S4; // expected-error{{cannot have a nested name specifier}} + + template + struct S3::S5; // expected-error{{cannot have a nested name specifier}} + + struct S3::S4 f0(); + enum S0::E0 f1(); + enum S0::E1 f2(); + enum S3::E2 f3(); + enum S3::E3 f4(); + + using A0 = struct S3::S4; + using A1 = enum S0::E0; + using A2 = enum S0::E1; + using A3 = enum S3::E2; + using A4 = enum S3::E3; +} diff --git a/clang/test/CXX/drs/dr16xx.cpp b/clang/test/CXX/drs/dr16xx.cpp index 1be4d2ab3ebe8..6ce77fbba7cee 100644 --- a/clang/test/CXX/drs/dr16xx.cpp +++ b/clang/test/CXX/drs/dr16xx.cpp @@ -99,7 +99,6 @@ namespace dr1638 { // dr1638: 3.1 enum class A::E; // since-cxx11-error@-1 {{template specialization requires 'template<>'}} - // since-cxx11-error@-2 {{forward declaration of enum class cannot have a nested name specifier}} template enum class A::E; // since-cxx11-error@-1 {{enumerations cannot be explicitly instantiated}} enum class A::E *e; diff --git a/clang/test/CXX/module/module.interface/p2-2.cpp b/clang/test/CXX/module/module.interface/p2-2.cpp index 04904a8d86f27..8607ea47ac1ce 100644 --- a/clang/test/CXX/module/module.interface/p2-2.cpp +++ b/clang/test/CXX/module/module.interface/p2-2.cpp @@ -15,6 +15,7 @@ struct X { }; export template struct X::iterator; // expected-error {{cannot export 'iterator' as it is not at namespace scope}} + // expected-error@-1 {{forward declaration of struct cannot have a nested name specifier}} export template void X::foo(); // expected-error {{cannot export 'foo' as it is not at namespace scope}} export template template U X::bar(); // expected-error {{cannot export 'bar' as it is not at namespace scope}} @@ -28,10 +29,13 @@ export struct Y { }; export struct Y::iterator; // expected-error {{cannot export 'iterator' as it is not at namespace scope}} + // expected-error@-1 {{forward declaration of struct cannot have a nested name specifier}} export void Y::foo(); // expected-error {{cannot export 'foo' as it is not at namespace scope}} export template U Y::bar(); // expected-error {{cannot export 'bar' as it is not at namespace scope}} export { template struct X::iterator; // expected-error {{cannot export 'iterator' as it is not at namespace scope}} + // expected-error@-1 {{forward declaration of struct cannot have a nested name specifier}} struct Y::iterator; // expected-error {{cannot export 'iterator' as it is not at namespace scope}} + // expected-error@-1 {{forward declaration of struct cannot have a nested name specifier}} } diff --git a/clang/test/SemaCXX/enum-scoped.cpp b/clang/test/SemaCXX/enum-scoped.cpp index 2bfe720336750..a4da0607d74ae 100644 --- a/clang/test/SemaCXX/enum-scoped.cpp +++ b/clang/test/SemaCXX/enum-scoped.cpp @@ -146,7 +146,9 @@ namespace test5 { namespace test6 { enum A : unsigned; struct A::a; // expected-error {{incomplete type 'test6::A' named in nested name specifier}} + // expected-error@-1{{forward declaration of struct cannot have a nested name specifier}} enum A::b; // expected-error {{incomplete type 'test6::A' named in nested name specifier}} + // expected-error@-1{{forward declaration of enum cannot have a nested name specifier}} int A::c; // expected-error {{incomplete type 'test6::A' named in nested name specifier}} void A::d(); // expected-error {{incomplete type 'test6::A' named in nested name specifier}} void test() { diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp index 161c5e7fdf67a..920ef42bc1564 100644 --- a/clang/test/SemaCXX/nested-name-spec.cpp +++ b/clang/test/SemaCXX/nested-name-spec.cpp @@ -65,7 +65,7 @@ A::C c1; struct A::C c2; struct S : public A::C {}; struct A::undef; // expected-error {{no struct named 'undef' in namespace 'A'}} - + // expected-error@-1 {{forward declaration of struct cannot have a nested name specifier}} namespace A2 { typedef int INT; struct RC; @@ -280,9 +280,11 @@ template struct A { protected: struct B; - struct B::C; // expected-error {{requires a template parameter list}} \ - // expected-error {{no struct named 'C'}} \ - // expected-error{{non-friend class member 'C' cannot have a qualified name}} + struct B::C; + // expected-error@-1 {{requires a template parameter list}} + // expected-error@-2 {{no struct named 'C'}} + // expected-error@-3 {{non-friend class member 'C' cannot have a qualified name}} + // expected-error@-4 {{forward declaration of struct cannot have a nested name specifier}} }; template @@ -292,6 +294,7 @@ struct A2 { }; template struct A2::B::C; // expected-error {{no struct named 'C'}} + // expected-error@-1 {{forward declaration of struct cannot have a nested name specifier}} } namespace PR13033 { diff --git a/clang/test/SemaTemplate/elaborated-type-specifier.cpp b/clang/test/SemaTemplate/elaborated-type-specifier.cpp index 514c5f2d57f4a..27b3f36ee14dd 100644 --- a/clang/test/SemaTemplate/elaborated-type-specifier.cpp +++ b/clang/test/SemaTemplate/elaborated-type-specifier.cpp @@ -23,6 +23,7 @@ namespace PR6915 { template struct DeclOrDef { enum T::foo; // expected-error{{nested name specifier for a declaration cannot depend on a template parameter}} + // expected-error@-1{{forward declaration of enum cannot have a nested name specifier}} enum T::bar { // expected-error{{nested name specifier for a declaration cannot depend on a template parameter}} value }; @@ -31,6 +32,7 @@ struct DeclOrDef { namespace PR6649 { template struct foo { class T::bar; // expected-error{{nested name specifier for a declaration cannot depend on a template parameter}} + // expected-error@-1{{forward declaration of class cannot have a nested name specifier}} class T::bar { int x; }; // expected-error{{nested name specifier for a declaration cannot depend on a template parameter}} }; } diff --git a/clang/test/SemaTemplate/qualified-id.cpp b/clang/test/SemaTemplate/qualified-id.cpp index 64dff1ce23535..883d3d330d148 100644 --- a/clang/test/SemaTemplate/qualified-id.cpp +++ b/clang/test/SemaTemplate/qualified-id.cpp @@ -52,5 +52,6 @@ namespace PR12291 { template template class Outer2::Inner; // expected-error{{nested name specifier 'Outer2::' for declaration does not refer into a class, class template or class template partial specialization}} + // expected-error@-1{{forward declaration of class cannot have a nested name specifier}} }; }