[clang] fix matching of nested template template parameters (#130447)
When checking the template template parameters of template template
parameters, the PartialOrdering context was not correctly propagated.
This also has a few drive-by fixes, such as checking the template
parameter lists of template template parameters, which was previously
missing and would have been it's own bug, but we need to fix it in order
to prevent crashes in error recovery in a simple way.
Fixes #130362
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 7b254b3..5a2704c 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -292,6 +292,9 @@
direct-list-initialized from an array is corrected to direct-initialization.
- Clang no longer crashes when a coroutine is declared ``[[noreturn]]``. (#GH127327)
- Clang now uses the parameter location for abbreviated function templates in ``extern "C"``. (#GH46386)
+- Fixes matching of nested template template parameters. (#GH130362)
+- Correctly diagnoses template template paramters which have a pack parameter
+ not in the last position.
- Clang now correctly parses ``if constexpr`` expressions in immediate function context. (#GH123524)
Bug Fixes to AST Handling
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 159c908..9a312e1 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -11356,14 +11356,16 @@
/// The context in which we are checking a template parameter list.
enum TemplateParamListContext {
- TPC_ClassTemplate,
- TPC_VarTemplate,
+ // For this context, Class, Variable, TypeAlias, and non-pack Template
+ // Template Parameters are treated uniformly.
+ TPC_Other,
+
TPC_FunctionTemplate,
TPC_ClassTemplateMember,
TPC_FriendClassTemplate,
TPC_FriendFunctionTemplate,
TPC_FriendFunctionTemplateDefinition,
- TPC_TypeAliasTemplate
+ TPC_TemplateTemplateParameterPack,
};
/// Checks the validity of a template parameter list, possibly
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 9d102ab..dcb419fd 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -8154,7 +8154,7 @@
(D.getCXXScopeSpec().isSet() && DC && DC->isRecord() &&
DC->isDependentContext())
? TPC_ClassTemplateMember
- : TPC_VarTemplate))
+ : TPC_Other))
NewVD->setInvalidDecl();
// If we are providing an explicit specialization of a static variable
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index fd5f044..1edbe62 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -13586,7 +13586,7 @@
// Merge any previous default template arguments into our parameters,
// and check the parameter list.
if (CheckTemplateParameterList(TemplateParams, OldTemplateParams,
- TPC_TypeAliasTemplate))
+ TPC_Other))
return nullptr;
TypeAliasTemplateDecl *NewDecl =
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index dfd7a55..290862d 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -1591,8 +1591,16 @@
assert(S->isTemplateParamScope() &&
"Template template parameter not in template parameter scope!");
- // Construct the parameter object.
bool IsParameterPack = EllipsisLoc.isValid();
+
+ bool Invalid = false;
+ if (CheckTemplateParameterList(
+ Params,
+ /*OldParams=*/nullptr,
+ IsParameterPack ? TPC_TemplateTemplateParameterPack : TPC_Other))
+ Invalid = true;
+
+ // Construct the parameter object.
TemplateTemplateParmDecl *Param = TemplateTemplateParmDecl::Create(
Context, Context.getTranslationUnitDecl(),
NameLoc.isInvalid() ? TmpLoc : NameLoc, Depth, Position, IsParameterPack,
@@ -1615,9 +1623,12 @@
if (Params->size() == 0) {
Diag(Param->getLocation(), diag::err_template_template_parm_no_parms)
<< SourceRange(Params->getLAngleLoc(), Params->getRAngleLoc());
- Param->setInvalidDecl();
+ Invalid = true;
}
+ if (Invalid)
+ Param->setInvalidDecl();
+
// C++0x [temp.param]p9:
// A default template-argument may be specified for any kind of
// template-parameter that is not a template parameter pack.
@@ -2066,7 +2077,7 @@
SemanticContext->isDependentContext())
? TPC_ClassTemplateMember
: TUK == TagUseKind::Friend ? TPC_FriendClassTemplate
- : TPC_ClassTemplate,
+ : TPC_Other,
SkipBody))
Invalid = true;
@@ -2208,9 +2219,8 @@
SourceLocation ParamLoc,
SourceRange DefArgRange) {
switch (TPC) {
- case Sema::TPC_ClassTemplate:
- case Sema::TPC_VarTemplate:
- case Sema::TPC_TypeAliasTemplate:
+ case Sema::TPC_Other:
+ case Sema::TPC_TemplateTemplateParameterPack:
return false;
case Sema::TPC_FunctionTemplate:
@@ -2383,8 +2393,11 @@
MissingDefaultArg = true;
} else if (NonTypeTemplateParmDecl *NewNonTypeParm
= dyn_cast<NonTypeTemplateParmDecl>(*NewParam)) {
- // Check for unexpanded parameter packs.
- if (!NewNonTypeParm->isParameterPack() &&
+ // Check for unexpanded parameter packs, except in a template template
+ // parameter pack, as in those any unexpanded packs should be expanded
+ // along with the parameter itself.
+ if (TPC != TPC_TemplateTemplateParameterPack &&
+ !NewNonTypeParm->isParameterPack() &&
DiagnoseUnexpandedParameterPack(NewNonTypeParm->getLocation(),
NewNonTypeParm->getTypeSourceInfo(),
UPPC_NonTypeTemplateParameterType)) {
@@ -2492,8 +2505,7 @@
// If a template parameter of a primary class template or alias template
// is a template parameter pack, it shall be the last template parameter.
if (SawParameterPack && (NewParam + 1) != NewParamEnd &&
- (TPC == TPC_ClassTemplate || TPC == TPC_VarTemplate ||
- TPC == TPC_TypeAliasTemplate)) {
+ (TPC == TPC_Other || TPC == TPC_TemplateTemplateParameterPack)) {
Diag((*NewParam)->getLocation(),
diag::err_template_param_pack_must_be_last_template_parameter);
Invalid = true;
@@ -2526,8 +2538,8 @@
<< PrevModuleName;
Invalid = true;
} else if (MissingDefaultArg &&
- (TPC == TPC_ClassTemplate || TPC == TPC_FriendClassTemplate ||
- TPC == TPC_VarTemplate || TPC == TPC_TypeAliasTemplate)) {
+ (TPC == TPC_Other || TPC == TPC_TemplateTemplateParameterPack ||
+ TPC == TPC_FriendClassTemplate)) {
// C++ 23[temp.param]p14:
// If a template-parameter of a class template, variable template, or
// alias template has a default template argument, each subsequent
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp
index 9769848..e6ec4a7 100644
--- a/clang/lib/Sema/SemaTemplateDeduction.cpp
+++ b/clang/lib/Sema/SemaTemplateDeduction.cpp
@@ -3427,9 +3427,9 @@
if (!P.isPackExpansion() && !A.isPackExpansion()) {
Info.Param =
makeTemplateParameter(Template->getTemplateParameters()->getParam(
- (PsStack.empty() ? TemplateArgs.end()
- : PsStack.front().begin()) -
- TemplateArgs.begin()));
+ (AsStack.empty() ? CTAI.CanonicalConverted.end()
+ : AsStack.front().begin()) -
+ 1 - CTAI.CanonicalConverted.begin()));
Info.FirstArg = P;
Info.SecondArg = A;
return TemplateDeductionResult::NonDeducedMismatch;
@@ -6642,17 +6642,19 @@
TemplateDeductionResult TDK;
runWithSufficientStackSpace(Info.getLocation(), [&] {
- TDK = ::FinishTemplateArgumentDeduction(
- *this, AArg, /*IsPartialOrdering=*/true, PArgs, Deduced, Info);
+ TDK = ::FinishTemplateArgumentDeduction(*this, AArg, PartialOrdering, PArgs,
+ Deduced, Info);
});
switch (TDK) {
case TemplateDeductionResult::Success:
return true;
// It doesn't seem possible to get a non-deduced mismatch when partial
- // ordering TTPs.
+ // ordering TTPs, except with an invalid template parameter list which has
+ // a parameter after a pack.
case TemplateDeductionResult::NonDeducedMismatch:
- llvm_unreachable("Unexpected NonDeducedMismatch");
+ assert(PArg->isInvalidDecl() && "Unexpected NonDeducedMismatch");
+ return false;
// Substitution failures should have already been diagnosed.
case TemplateDeductionResult::AlreadyDiagnosed:
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index cb434dc..a231ad7 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -2176,7 +2176,7 @@
// Do some additional validation, then merge default arguments
// from the existing declarations.
if (SemaRef.CheckTemplateParameterList(InstParams, PrevParams,
- Sema::TPC_ClassTemplate))
+ Sema::TPC_Other))
return nullptr;
Inst->setAccess(PrevClassTemplate->getAccess());
diff --git a/clang/test/SemaTemplate/cwg2398.cpp b/clang/test/SemaTemplate/cwg2398.cpp
index 51d98d4..06333c8 100644
--- a/clang/test/SemaTemplate/cwg2398.cpp
+++ b/clang/test/SemaTemplate/cwg2398.cpp
@@ -602,6 +602,11 @@
template <class...> class B {};
template struct A<B, Node<None>>;
} // namespace regression3
+namespace GH130362 {
+ template <template <template <class... T1> class TT1> class TT2> struct A {};
+ template <template <class U1> class UU1> struct B {};
+ template struct A<B>;
+} // namespace GH130362
namespace nttp_auto {
namespace t1 {
@@ -610,24 +615,16 @@
template struct A<B>;
} // namespace t1
namespace t2 {
- // FIXME: Shouldn't accept parameters after a parameter pack.
template<template<auto... Va1, auto Va2> class> struct A {};
- // expected-error@-1 {{deduced non-type template argument does not have the same type as the corresponding template parameter ('auto' vs 'int')}}
- // expected-note@-2 {{previous template template parameter is here}}
+ // expected-error@-1 {{template parameter pack must be the last template parameter}}
template<int... Vi> struct B;
- // expected-note@-1 {{template parameter is declared here}}
template struct A<B>;
- // expected-note@-1 {{different template parameters}}
} // namespace t2
namespace t3 {
- // FIXME: Shouldn't accept parameters after a parameter pack.
template<template<auto... Va1, auto... Va2> class> struct A {};
- // expected-error@-1 {{deduced non-type template argument does not have the same type as the corresponding template parameter ('auto' vs 'int')}}
- // expected-note@-2 {{previous template template parameter is here}}
+ // expected-error@-1 {{template parameter pack must be the last template parameter}}
template<int... Vi> struct B;
- // expected-note@-1 {{template parameter is declared here}}
template struct A<B>;
- // expected-note@-1 {{different template parameters}}
} // namespace t3
} // namespace nttp_auto
diff --git a/clang/test/SemaTemplate/temp_arg_template_p0522.cpp b/clang/test/SemaTemplate/temp_arg_template_p0522.cpp
index 2e5a36a..d8a81bb 100644
--- a/clang/test/SemaTemplate/temp_arg_template_p0522.cpp
+++ b/clang/test/SemaTemplate/temp_arg_template_p0522.cpp
@@ -7,7 +7,8 @@
template<template<int> typename> struct Ti; // #Ti
template<template<int...> typename> struct TPi; // #TPi
template<template<int, int...> typename> struct TiPi;
-template<template<int..., int...> typename> struct TPiPi; // FIXME: Why is this not ill-formed?
+template<template<int..., int...> typename> struct TPiPi;
+// expected-error@-1 {{template parameter pack must be the last template parameter}}
template<typename T, template<T> typename> struct tT0; // #tT0
template<template<typename T, T> typename> struct Tt0; // #Tt0
diff --git a/clang/unittests/AST/DeclPrinterTest.cpp b/clang/unittests/AST/DeclPrinterTest.cpp
index 6945dff..124b1a1 100644
--- a/clang/unittests/AST/DeclPrinterTest.cpp
+++ b/clang/unittests/AST/DeclPrinterTest.cpp
@@ -1196,21 +1196,21 @@
}
TEST(DeclPrinter, TestUnnamedTemplateParametersPacks) {
- ASSERT_TRUE(PrintedDeclCXX17Matches(
- "template <typename ..., int ...,"
- " template <typename ..., bool ...> class ...> void A();",
- functionTemplateDecl(hasName("A")).bind("id"),
- "template <typename ..., int ...,"
- " template <typename ..., bool ...> class ...> void A()"));
+ ASSERT_TRUE(
+ PrintedDeclCXX17Matches("template <typename ..., int ...,"
+ " template <typename ...> class ...> void A();",
+ functionTemplateDecl(hasName("A")).bind("id"),
+ "template <typename ..., int ...,"
+ " template <typename ...> class ...> void A()"));
}
TEST(DeclPrinter, TestNamedTemplateParametersPacks) {
ASSERT_TRUE(PrintedDeclCXX17Matches(
"template <typename ...T, int ...I,"
- " template <typename ...X, bool ...B> class ...Z> void A();",
+ " template <typename ...X> class ...Z> void A();",
functionTemplateDecl(hasName("A")).bind("id"),
"template <typename ...T, int ...I,"
- " template <typename ...X, bool ...B> class ...Z> void A()"));
+ " template <typename ...X> class ...Z> void A()"));
}
TEST(DeclPrinter, TestTemplateTemplateParameterWrittenWithTypename) {
