Skip to content

Commit b76924f

Browse files
sdkrystiansdkrystian
committed
[Clang][Sema] Diagnose use of template keyword after declarative nested-name-specifiers
1 parent a0d266d commit b76924f

File tree

14 files changed

+201
-40
lines changed

14 files changed

+201
-40
lines changed

‎clang/include/clang/AST/TypeLoc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ class TemplateSpecializationTypeLoc :
16881688
}
16891689

16901690
void initializeLocal(ASTContext &Context, SourceLocation Loc) {
1691-
setTemplateKeywordLoc(Loc);
1691+
setTemplateKeywordLoc(SourceLocation());
16921692
setTemplateNameLoc(Loc);
16931693
setLAngleLoc(Loc);
16941694
setRAngleLoc(Loc);

‎clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8241,6 +8241,8 @@ def err_invalid_declarator_in_block : Error<
82418241
"definition or redeclaration of %0 not allowed inside a block">;
82428242
def err_not_tag_in_scope : Error<
82438243
"no %select{struct|interface|union|class|enum}0 named %1 in %2">;
8244+
def ext_template_after_declarative_nns : ExtWarn<
8245+
"'template' cannot be used after a declarative nested name specifier">;
82448246

82458247
def err_no_typeid_with_fno_rtti : Error<
82468248
"use of typeid requires -frtti">;

‎clang/include/clang/Sema/Sema.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2962,7 +2962,8 @@ class Sema final {
29622962
bool DiagnoseClassNameShadow(DeclContext *DC, DeclarationNameInfo Info);
29632963
bool diagnoseQualifiedDeclaration(CXXScopeSpec &SS, DeclContext *DC,
29642964
DeclarationName Name, SourceLocation Loc,
2965-
bool IsTemplateId);
2965+
TemplateIdAnnotation *TemplateId,
2966+
bool IsMemberSpecialization);
29662967
void
29672968
diagnoseIgnoredQualifiers(unsigned DiagID, unsigned Quals,
29682969
SourceLocation FallbackLoc,

‎clang/lib/Sema/SemaDecl.cpp

Lines changed: 49 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6246,13 +6246,17 @@ bool Sema::DiagnoseClassNameShadow(DeclContext *DC,
62466246
///
62476247
/// \param Loc The location of the name of the entity being declared.
62486248
///
6249-
/// \param IsTemplateId Whether the name is a (simple-)template-id, and thus
6250-
/// we're declaring an explicit / partial specialization / instantiation.
6249+
/// \param IsMemberSpecialization Whether we are declaring a member
6250+
/// specialization.
6251+
///
6252+
/// \param TemplateId The template-id, if any.
62516253
///
62526254
/// \returns true if we cannot safely recover from this error, false otherwise.
62536255
bool Sema::diagnoseQualifiedDeclaration(CXXScopeSpec &SS, DeclContext *DC,
62546256
DeclarationName Name,
6255-
SourceLocation Loc, bool IsTemplateId) {
6257+
SourceLocation Loc,
6258+
TemplateIdAnnotation *TemplateId,
6259+
bool IsMemberSpecialization) {
62566260
DeclContext *Cur = CurContext;
62576261
while (isa<LinkageSpecDecl>(Cur) || isa<CapturedDecl>(Cur))
62586262
Cur = Cur->getParent();
@@ -6281,7 +6285,7 @@ bool Sema::diagnoseQualifiedDeclaration(CXXScopeSpec &SS, DeclContext *DC,
62816285
// Check whether the qualifying scope encloses the scope of the original
62826286
// declaration. For a template-id, we perform the checks in
62836287
// CheckTemplateSpecializationScope.
6284-
if (!Cur->Encloses(DC) && !IsTemplateId) {
6288+
if (!Cur->Encloses(DC) && !(TemplateId || IsMemberSpecialization)) {
62856289
if (Cur->isRecord())
62866290
Diag(Loc, diag::err_member_qualification)
62876291
<< Name << SS.getRange();
@@ -6327,12 +6331,42 @@ bool Sema::diagnoseQualifiedDeclaration(CXXScopeSpec &SS, DeclContext *DC,
63276331
return false;
63286332
}
63296333

6334+
// C++23 [temp.names]p5:
6335+
// The keyword template shall not appear immediately after a declarative
6336+
// nested-name-specifier.
6337+
if (TemplateId && TemplateId->TemplateKWLoc.isValid()) {
6338+
Diag(Loc, diag::ext_template_after_declarative_nns)
6339+
<< FixItHint::CreateRemoval(TemplateId->TemplateKWLoc);
6340+
}
6341+
6342+
NestedNameSpecifierLoc SpecLoc(SS.getScopeRep(), SS.location_data());
6343+
while (SpecLoc.getPrefix()) {
6344+
// C++23 [temp.names]p5:
6345+
// The keyword template shall not appear immediately after a declarative
6346+
// nested-name-specifier.
6347+
// FIXME: nested-name-specifiers in friend declarations are declarative,
6348+
// but we don't call diagnoseQualifiedDeclaration for them. We should.
6349+
if (SpecLoc.getNestedNameSpecifier()->getKind() ==
6350+
NestedNameSpecifier::TypeSpecWithTemplate) {
6351+
SourceLocation TemplateKWLoc;
6352+
auto TL = SpecLoc.getTypeLoc();
6353+
if (const auto DTSTL =
6354+
TL.getAsAdjusted<DependentTemplateSpecializationTypeLoc>())
6355+
TemplateKWLoc = DTSTL.getTemplateKeywordLoc();
6356+
else if (const auto TSTL =
6357+
TL.getAsAdjusted<TemplateSpecializationTypeLoc>())
6358+
TemplateKWLoc = TSTL.getTemplateKeywordLoc();
6359+
else
6360+
TemplateKWLoc = TL.getBeginLoc();
6361+
6362+
Diag(Loc, diag::ext_template_after_declarative_nns)
6363+
<< FixItHint::CreateRemoval(TemplateKWLoc);
6364+
}
6365+
SpecLoc = SpecLoc.getPrefix();
6366+
}
63306367
// C++11 [dcl.meaning]p1:
63316368
// [...] "The nested-name-specifier of the qualified declarator-id shall
63326369
// not begin with a decltype-specifer"
6333-
NestedNameSpecifierLoc SpecLoc(SS.getScopeRep(), SS.location_data());
6334-
while (SpecLoc.getPrefix())
6335-
SpecLoc = SpecLoc.getPrefix();
63366370
if (isa_and_nonnull<DecltypeType>(
63376371
SpecLoc.getNestedNameSpecifier()->getAsType()))
63386372
Diag(Loc, diag::err_decltype_in_declarator)
@@ -6400,9 +6434,13 @@ NamedDecl *Sema::HandleDeclarator(Scope *S, Declarator &D,
64006434
return nullptr;
64016435
}
64026436
if (!D.getDeclSpec().isFriendSpecified()) {
6403-
if (diagnoseQualifiedDeclaration(
6404-
D.getCXXScopeSpec(), DC, Name, D.getIdentifierLoc(),
6405-
D.getName().getKind() == UnqualifiedIdKind::IK_TemplateId)) {
6437+
TemplateIdAnnotation *TemplateId =
6438+
D.getName().getKind() == UnqualifiedIdKind::IK_TemplateId
6439+
? D.getName().TemplateId
6440+
: nullptr;
6441+
if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC, Name,
6442+
D.getIdentifierLoc(), TemplateId,
6443+
/*IsMemberSpecialization=*/false)) {
64066444
if (DC->isRecord())
64076445
return nullptr;
64086446

@@ -18006,6 +18044,7 @@ Sema::ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK, SourceLocation KWLoc,
1800618044
// nested-name-specifier against the current context.
1800718045
if ((TUK == TUK_Definition || TUK == TUK_Declaration) &&
1800818046
diagnoseQualifiedDeclaration(SS, DC, OrigName, Loc,
18047+
/*TemplateId=*/nullptr,
1800918048
isMemberSpecialization))
1801018049
Invalid = true;
1801118050

‎clang/lib/Sema/SemaDeclCXX.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3621,14 +3621,18 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
36213621
// class X {
36223622
// int X::member;
36233623
// };
3624-
if (DeclContext *DC = computeDeclContext(SS, false))
3624+
if (DeclContext *DC = computeDeclContext(SS, false)) {
3625+
TemplateIdAnnotation *TemplateId =
3626+
D.getName().getKind() == UnqualifiedIdKind::IK_TemplateId
3627+
? D.getName().TemplateId
3628+
: nullptr;
36253629
diagnoseQualifiedDeclaration(SS, DC, Name, D.getIdentifierLoc(),
3626-
D.getName().getKind() ==
3627-
UnqualifiedIdKind::IK_TemplateId);
3628-
else
3630+
TemplateId,
3631+
/*IsMemberSpecialization=*/false);
3632+
} else {
36293633
Diag(D.getIdentifierLoc(), diag::err_member_qualification)
36303634
<< Name << SS.getRange();
3631-
3635+
}
36323636
SS.clear();
36333637
}
36343638

‎clang/lib/Sema/SemaTemplate.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,8 +1890,12 @@ DeclResult Sema::CheckClassTemplate(
18901890
ContextRAII SavedContext(*this, SemanticContext);
18911891
if (RebuildTemplateParamsInCurrentInstantiation(TemplateParams))
18921892
Invalid = true;
1893-
} else if (TUK != TUK_Friend && TUK != TUK_Reference)
1894-
diagnoseQualifiedDeclaration(SS, SemanticContext, Name, NameLoc, false);
1893+
}
1894+
1895+
if (TUK != TUK_Friend && TUK != TUK_Reference)
1896+
diagnoseQualifiedDeclaration(SS, SemanticContext, Name, NameLoc,
1897+
/*TemplateId-*/ nullptr,
1898+
/*IsMemberSpecialization*/ false);
18951899

18961900
LookupQualifiedName(Previous, SemanticContext);
18971901
} else {
@@ -8831,6 +8835,15 @@ DeclResult Sema::ActOnClassTemplateSpecialization(
88318835
bool isMemberSpecialization = false;
88328836
bool isPartialSpecialization = false;
88338837

8838+
if (SS.isSet()) {
8839+
if (TUK != TUK_Reference && TUK != TUK_Friend &&
8840+
diagnoseQualifiedDeclaration(SS, ClassTemplate->getDeclContext(),
8841+
ClassTemplate->getDeclName(),
8842+
TemplateNameLoc, &TemplateId,
8843+
/*IsMemberSpecialization=*/false))
8844+
return true;
8845+
}
8846+
88348847
// Check the validity of the template headers that introduce this
88358848
// template.
88368849
// FIXME: We probably shouldn't complain about these headers for

‎clang/lib/Sema/TreeTransform.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4394,8 +4394,14 @@ NestedNameSpecifierLoc TreeTransform<Derived>::TransformNestedNameSpecifierLoc(
43944394
SS.Adopt(ETL.getQualifierLoc());
43954395
TL = ETL.getNamedTypeLoc();
43964396
}
4397-
SS.Extend(SemaRef.Context, /*FIXME:*/ SourceLocation(), TL,
4398-
Q.getLocalEndLoc());
4397+
SourceLocation TemplateKWLoc;
4398+
if (const auto TSTL = TL.getAs<TemplateSpecializationTypeLoc>())
4399+
TemplateKWLoc = TSTL.getTemplateKeywordLoc();
4400+
else if (const auto DTSTL =
4401+
TL.getAs<DependentTemplateSpecializationTypeLoc>())
4402+
TemplateKWLoc = DTSTL.getTemplateKeywordLoc();
4403+
4404+
SS.Extend(SemaRef.Context, TemplateKWLoc, TL, Q.getLocalEndLoc());
43994405
break;
44004406
}
44014407
// If the nested-name-specifier is an invalid type def, don't emit an

‎clang/test/CXX/drs/dr23xx.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ struct Bad2 { int a, b; };
182182
} // namespace dr2386
183183
namespace std {
184184
template <typename T> struct tuple_size;
185-
template <> struct std::tuple_size<dr2386::Bad1> {};
186-
template <> struct std::tuple_size<dr2386::Bad2> {
185+
template <> struct tuple_size<dr2386::Bad1> {};
186+
template <> struct tuple_size<dr2386::Bad2> {
187187
static const int value = 42;
188188
};
189189
} // namespace std

‎clang/test/CXX/drs/dr7xx.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ namespace dr727 { // dr727: partial
105105
// expected-note@#dr727-N {{explicitly specialized declaration is here}}
106106

107107
template<> struct A::C<double>;
108-
// expected-error@-1 {{class template specialization of 'C' not in class 'A' or an enclosing namespace}}
108+
// expected-error@-1 {{non-friend class member 'C' cannot have a qualified name}}
109+
// expected-error@-2 {{class template specialization of 'C' not in class 'A' or an enclosing namespace}}
109110
// expected-note@#dr727-C {{explicitly specialized declaration is here}}
110111
template<> void A::f<double>();
111112
// expected-error@-1 {{o function template matches function template specialization 'f'}}
@@ -116,7 +117,8 @@ namespace dr727 { // dr727: partial
116117
// expected-note@#dr727-N {{explicitly specialized declaration is here}}
117118

118119
template<typename T> struct A::C<T***>;
119-
// expected-error@-1 {{class template partial specialization of 'C' not in class 'A' or an enclosing namespace}}
120+
// expected-error@-1 {{non-friend class member 'C' cannot have a qualified name}}
121+
// expected-error@-2 {{class template partial specialization of 'C' not in class 'A' or an enclosing namespace}}
120122
// expected-note@#dr727-C {{explicitly specialized declaration is here}}
121123
template<typename T> static int A::N<T***>;
122124
// expected-error@-1 {{non-friend class member 'N' cannot have a qualified name}}

‎clang/test/CXX/temp/temp.decls/temp.class/temp.mem.func/p1.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ template<typename T, typename U> // expected-note{{previous template}}
33
class X0 {
44
public:
55
typedef int size_type;
6-
6+
77
X0(int);
88
~X0();
9-
9+
1010
void f0(const T&, const U&);
11-
11+
1212
T& operator[](int i) const;
13-
13+
1414
void f1(size_type) const;
1515
void f2(size_type) const;
1616
void f3(size_type) const;
1717
void f4() ;
18-
18+
1919
operator T*() const;
20-
20+
2121
T value;
2222
};
2323

@@ -41,7 +41,7 @@ template<class X, class Y, class Z> // expected-error{{too many template paramet
4141
void X0<X, Y>::f3(size_type) const {
4242
}
4343

44-
template<class X, class Y>
44+
template<class X, class Y>
4545
void X0<Y, X>::f4() { } // expected-error{{does not refer}}
4646

4747
// FIXME: error message should probably say, "redefinition of 'X0<T, U>::f0'"
@@ -68,14 +68,14 @@ namespace N { template <class X> void A<X>::a() {} }
6868

6969
// PR5566
7070
template<typename T>
71-
struct X1 {
71+
struct X1 {
7272
template<typename U>
7373
struct B { void f(); };
7474
};
7575

7676
template<typename T>
7777
template<typename U>
78-
void X1<T>::template B<U>::f() { }
78+
void X1<T>::template B<U>::f() { } // expected-warning{{'template' cannot be used after a declarative nested name specifier}}
7979

8080
// PR5527
8181
template <template <class> class T>

‎clang/test/CXX/temp/temp.names/p5.cpp

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
// RUN: %clang_cc1 -fsyntax-only -pedantic-errors -verify %s
2+
3+
template<typename T> struct A {
4+
template<typename U> struct B {
5+
struct C;
6+
template<typename V> struct D;
7+
template<typename V> struct D<V*>;
8+
9+
void f();
10+
template<typename V> void g();
11+
12+
static int x;
13+
template<typename V> static int y;
14+
template<typename V> static int y<V*>;
15+
16+
enum class E;
17+
};
18+
};
19+
20+
template<typename T>
21+
template<typename U>
22+
struct A<T>::template B<U>::C { }; // expected-error{{'template' cannot be used after a declarative}}
23+
24+
template<>
25+
template<>
26+
struct A<int>::template B<bool>::C; // expected-error{{'template' cannot be used after a declarative}}
27+
28+
template<>
29+
template<>
30+
struct A<int>::template B<bool>::C { }; // expected-error{{'template' cannot be used after a declarative}}
31+
32+
template<typename T>
33+
template<typename U>
34+
template<typename V>
35+
struct A<T>::template B<U>::D { }; // expected-error{{'template' cannot be used after a declarative}}
36+
37+
template<typename T>
38+
template<typename U>
39+
template<typename V>
40+
struct A<T>::template B<U>::D<V*> { }; // expected-error{{'template' cannot be used after a declarative}}
41+
42+
template<>
43+
template<>
44+
template<typename V>
45+
struct A<int>::template B<bool>::D { }; // expected-error{{'template' cannot be used after a declarative}}
46+
47+
template<>
48+
template<>
49+
template<typename V>
50+
struct A<int>::template B<bool>::D<V*> { }; // expected-error{{'template' cannot be used after a declarative}}
51+
52+
template<typename T>
53+
template<typename U>
54+
void A<T>::template B<U>::f() { } // expected-error{{'template' cannot be used after a declarative}}
55+
56+
template<>
57+
template<>
58+
void A<int>::template B<bool>::f() { } // expected-error{{'template' cannot be used after a declarative}}
59+
60+
template<typename T>
61+
template<typename U>
62+
template<typename V>
63+
void A<T>::template B<U>::g() { } // expected-error{{'template' cannot be used after a declarative}}
64+
65+
template<>
66+
template<>
67+
template<typename V>
68+
void A<int>::template B<bool>::g() { } // expected-error{{'template' cannot be used after a declarative}}
69+
70+
template<typename T>
71+
template<typename U>
72+
int A<T>::template B<U>::x = 0; // expected-error{{'template' cannot be used after a declarative}}
73+
74+
template<typename T>
75+
template<typename U>
76+
template<typename V>
77+
int A<T>::template B<U>::y = 0; // expected-error{{'template' cannot be used after a declarative}}
78+
79+
template<typename T>
80+
template<typename U>
81+
template<typename V>
82+
int A<T>::template B<U>::y<V*> = 0; // expected-error{{'template' cannot be used after a declarative}}
83+
84+
template<typename T>
85+
template<typename U>
86+
enum class A<T>::template B<U>::E { a }; // expected-error{{'template' cannot be used after a declarative}}
87+
88+
template<>
89+
template<>
90+
enum class A<int>::template B<bool>::E; // expected-error{{'template' cannot be used after a declarative}}
91+
92+
template<>
93+
template<>
94+
enum class A<int>::template B<bool>::E { a }; // expected-error{{'template' cannot be used after a declarative}}

‎clang/test/CXX/temp/temp.spec/part.spec.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,4 +478,4 @@ template <typename T> class PCTT6<TestClass::PrivateClass, T> {
478478
};
479479
template <typename T1> template <typename, typename> class PCTT6<TestClass::PrivateClass, T1>::NCT4 final {};
480480
// expected-error@+1 2{{is a private member of}}
481-
template <typename T1> template <typename T2> struct PCTT6<TestClass::PrivateClass, T1>::template NCT3<T2, TestClass::TemplatePrivateClass<TestClass::TemplateProtectedClass<TestClass::PublicClass>>> : PCTT6<TestClass::PrivateClass, T1>::NCT4<T2, TestClass::TemplatePrivateClass<int>> {};
481+
template <typename T1> template <typename T2> struct PCTT6<TestClass::PrivateClass, T1>::NCT3<T2, TestClass::TemplatePrivateClass<TestClass::TemplateProtectedClass<TestClass::PublicClass>>> : PCTT6<TestClass::PrivateClass, T1>::NCT4<T2, TestClass::TemplatePrivateClass<int>> {};

‎clang/test/SemaCXX/static-assert.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ struct NestedTemplates1 {
197197
template <typename T, typename U, int a>
198198
void foo2() {
199199
static_assert(::ns::NestedTemplates1<T, a>::NestedTemplates2::template NestedTemplates3<U>::value, "message");
200-
// expected-error@-1{{static assertion failed due to requirement '::ns::NestedTemplates1<int, 3>::NestedTemplates2::NestedTemplates3<float>::value': message}}
200+
// expected-error@-1{{static assertion failed due to requirement '::ns::NestedTemplates1<int, 3>::NestedTemplates2::template NestedTemplates3<float>::value': message}}
201201
}
202202
template void foo2<int, float, 3>();
203203
// expected-note@-1{{in instantiation of function template specialization 'foo2<int, float, 3>' requested here}}

0 commit comments

Comments
 (0)