Skip to content

Fix #14733 FP functionStatic for brace initialization + typedef #8537

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
+6 −1
Open

Fix #14733 FP functionStatic for brace initialization + typedef #8537

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
caacea2
Update tokenize.cpp
chrchr-github May 7, 2026
0142994
Update testvarid.cpp
chrchr-github May 7, 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
2 changes: 1 addition & 1 deletion lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4970,7 +4970,7 @@ void Tokenizer::setVarIdPass1()
decl = false;
} else if (cpp && Token::Match(prev2, "%type% {") && Token::simpleMatch(tok2->link(), "} ;")) { // C++11 initialization style
if (tok2->link() != tok2->next() && // add value-initialized variable T x{};
(Token::Match(prev2, "do|try|else") || Token::Match(prev2->tokAt(-2), "struct|class|:")))
(Token::Match(prev2, "do|try|else") || Token::simpleMatch(prev2->tokAt(-2), ":")))
continue;
} else
decl = false;
Expand Down
5 changes: 5 additions & 0 deletions test/testvarid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3066,6 +3066,11 @@ class TestVarID : public TestFixture {
" int j{i};\n"
" }\n"
"};"));

ASSERT_EQUALS("1: struct Sx { int i@1 ; } ;\n" // #14733
"2: struct Sx sx@2 { 0 } ;\n",
tokenize("struct Sx { int i; };\n"
"struct Sx sx{ 0 }; \n"));
}

void varid_inheritedMembers() {
Expand Down
Loading