Skip to content

Fix #14477 internalAstError with fold expression in template #8203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 6 commits into from
Feb 15, 2026
+22 −3
Merged

Fix #14477 internalAstError with fold expression in template #8203

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d45d1a
Update templatesimplifier.cpp
chrchr-github Feb 12, 2026
b38abd4
Update testsimplifytemplate.cpp
chrchr-github Feb 12, 2026
1497cde
Update testsimplifytemplate.cpp
chrchr-github Feb 12, 2026
c147688
Update templatesimplifier.cpp
chrchr-github Feb 12, 2026
b7abb1c
Merge branch 'danmar:main' into chr_14477
chrchr-github Feb 13, 2026
871657f
Update test/testsimplifytemplate.cpp
chrchr-github Feb 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/templatesimplifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,8 +2104,6 @@ void TemplateSimplifier::expandTemplate(
Token * const beforeTypeToken = mTokenList.back();
bool pointerType = false;
const bool isVariadicTemplateArg = templateDeclaration.isVariadic() && itype + 1 == typeParametersInDeclaration.size();
if (isVariadicTemplateArg && mTypesUsedInTemplateInstantiation.size() > 1 && !Token::Match(tok3->next(), "...|<"))
continue;
if (isVariadicTemplateArg && Token::Match(tok3, "%name% ... %name%"))
tok3 = tok3->tokAt(2);
if (!isVariadicTemplateArg && copy && Token::Match(mTypesUsedInTemplateInstantiation[itype].token(), "%num% ,|>|>>") &&
Expand All @@ -2130,6 +2128,7 @@ void TemplateSimplifier::expandTemplate(
}
}
const std::string endStr(isVariadicTemplateArg ? ">" : ",>");
Token* begPar = nullptr;
for (Token *typetok = mTypesUsedInTemplateInstantiation[itype].token();
typetok && (typeindentlevel > 0 || endStr.find(typetok->str()[0]) == std::string::npos);
typetok = typetok->next()) {
Expand All @@ -2153,6 +2152,10 @@ void TemplateSimplifier::expandTemplate(
--typeindentlevel;
Token *back;
if (copy) {
if (isVariadicTemplateArg && typetok == mTypesUsedInTemplateInstantiation[itype].token() && typetok->isLiteral()) {
mTokenList.addtoken("(", mTokenList.back());
begPar = mTokenList.back();
}
mTokenList.addtoken(typetok, tok3);
back = mTokenList.back();
} else
Expand Down Expand Up @@ -2181,6 +2184,10 @@ void TemplateSimplifier::expandTemplate(
if (copy)
back->templateArgFrom(typetok);
}
if (begPar) {
mTokenList.addtoken(")", mTokenList.back());
Token::createMutualLinks(begPar, mTokenList.back());
}
if (pointerType && Token::simpleMatch(beforeTypeToken, "const")) {
mTokenList.addtoken(beforeTypeToken);
beforeTypeToken->deleteThis();
Expand Down
14 changes: 13 additions & 1 deletion test/testsimplifytemplate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6372,7 +6372,7 @@ class TestSimplifyTemplate : public TestFixture {
"class E<1,3> { "
"template < int ... I > "
"int f ( int n , std :: integer_sequence < int , I ... > ) { "
"return ( ( ( I == n ) ? : 0 ) + ... ) ; "
"return ( ( ( I == n ) ? ( 1 , 3 ) : 0 ) + ... ) ; "
Comment thread
chrchr-github marked this conversation as resolved.
Outdated
"} "
"} ;";
ASSERT_EQUALS(expected, tok(code));
Expand All @@ -6390,6 +6390,18 @@ class TestSimplifyTemplate : public TestFixture {
"A<int,S> a ; "
"struct A<int,S> { } ;";
ASSERT_EQUALS(expected2, tok(code2));

const char code3[] = "template <int... N>\n" // #14477
" int f() {\n"
" return (0 | ... | (1, 2, 4));\n"
"}\n"
"int main() {\n"
" return f<1, 2, 4>();\n"
"}\n";
const char expected3[] = "int f<1,2,4> ( ) ; "
"int main ( ) { return f<1,2,4> ( ) ; } "
"int f<1,2,4> ( ) { return ( 0 | ... | ( 1 , 2 , 4 ) ) ; }";
ASSERT_EQUALS(expected3, tok(code3));
}

void template_variable_1() {
Expand Down
Loading