Skip to content

Fix #14429 FP uninitMemberVar for function declaration #8156

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

Open
chrchr-github wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −2
Open

Fix #14429 FP uninitMemberVar for function declaration #8156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f87db23
Update tokenize.cpp
chrchr-github Jan 26, 2026
6151fcb
Update testsimplifyusing.cpp
chrchr-github Jan 26, 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
4 changes: 3 additions & 1 deletion lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3341,12 +3341,14 @@ bool Tokenizer::simplifyUsing()
}
} else if (fpArgList && fpQual && Token::Match(tok1->next(), "%name%")) {
// function pointer
const bool isFuncDecl = Token::simpleMatch(tok1->tokAt(2), "(");
TokenList::copyTokens(tok1->next(), fpArgList, usingEnd->previous());
Token* const copyEnd = TokenList::copyTokens(tok1, start, fpQual->link()->previous());
Token* leftPar = copyEnd->previous();
while (leftPar->str() != "(")
leftPar = leftPar->previous();
Token* const rightPar = copyEnd->next()->insertToken(")");
Token* const insertTok = isFuncDecl ? copyEnd->linkAt(2) : copyEnd->next();
Token* const rightPar = insertTok->insertToken(")");
Token::createMutualLinks(leftPar, rightPar);
tok1->deleteThis();
substitute = true;
Expand Down
8 changes: 7 additions & 1 deletion test/testsimplifyusing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,13 +899,19 @@ class TestSimplifyUsing : public TestFixture {
ASSERT_EQUALS(expected2, tok(code2));
ASSERT_EQUALS("", errout_str());

const char code3[] = "using FP = std::string (*)();\n"
const char code3[] = "using FP = std::string (*)();\n" // #14421
"using FPC = std::string (*const)();\n"
"FP fp;\n"
"FPC fpc{};\n";
const char expected3[] = "std :: string ( * fp ) ( ) ; std :: string ( * const fpc ) ( ) { } ;";
ASSERT_EQUALS(expected3, tok(code3));
ASSERT_EQUALS("", errout_str());

const char code4[] = "using F = void(*)(char);\n" // #14429
"F f(int);\n";
const char expected4[] = "void * f ( char ) ;";
ASSERT_EQUALS(expected4, tok(code4));
ASSERT_EQUALS("", errout_str());
}

void simplifyUsing8970() {
Expand Down
Loading