Skip to content
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

Fix #12595 debug: valueFlowBailoutIncompleteVar with unnamed enum member #6240

Merged
merged 3 commits into from
Apr 6, 2024
Merged

Fix #12595 debug: valueFlowBailoutIncompleteVar with unnamed enum member #6240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a62fc8
Update tokenize.cpp
chrchr-github Apr 5, 2024
929eb03
Update testsimplifytokens.cpp
chrchr-github Apr 5, 2024
839e6bd
Typed anonymous enum
chrchr-github Apr 5, 2024
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
19 changes: 15 additions & 4 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8807,6 +8807,20 @@ void Tokenizer::simplifyFunctionTryCatch()
}
}

static bool isAnonymousEnum(const Token* tok)
{
if (!Token::Match(tok, "enum {|:"))
return false;
if (tok->index() > 2 && Token::Match(tok->tokAt(-3), "using %name% ="))
return false;
const Token* end = tok->next();
if (end->str() == ":") {
end = end->next();
while (Token::Match(end, "%name%|::"))
end = end->next();
}
return end && Token::Match(end->link(), "} (| %type%| )| [,;[({=]");
}

void Tokenizer::simplifyStructDecl()
{
Expand All @@ -8833,10 +8847,7 @@ void Tokenizer::simplifyStructDecl()
}
}
// check for anonymous enum
else if ((Token::simpleMatch(tok, "enum {") &&
!Token::Match(tok->tokAt(-3), "using %name% =") &&
Token::Match(tok->next()->link(), "} (| %type%| )| ,|;|[|(|{")) ||
(Token::Match(tok, "enum : %type% {") && Token::Match(tok->linkAt(3), "} (| %type%| )| ,|;|[|(|{"))) {
chrchr-github marked this conversation as resolved.
Show resolved Hide resolved
else if (isAnonymousEnum(tok)) {
Token *start = tok->strAt(1) == ":" ? tok->linkAt(3) : tok->linkAt(1);
if (start && Token::Match(start->next(), "( %type% )")) {
start->next()->link()->deleteThis();
Expand Down
65 changes: 47 additions & 18 deletions test/testsimplifytokens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,24 +1252,53 @@ class TestSimplifyTokens : public TestFixture {
}

void simplifyStructDecl9() {
const char* code = "enum E : int;\n" // #12588
"void f() {}\n"
"namespace {\n"
" struct S {\n"
" explicit S(int i) : m(i) {}\n"
" int m;\n"
" };\n"
"}\n"
"void g() { S s(0); }\n";
const char* exp = "enum E : int ; "
"void f ( ) { } "
"namespace { "
"struct S { "
"explicit S ( int i ) : m ( i ) { } "
"int m ; "
"} ; "
"} "
"void g ( ) { S s ( 0 ) ; }";
const char *code{}, *exp{};
code = "enum E : int;\n" // #12588
"void f() {}\n"
"namespace {\n"
" struct S {\n"
" explicit S(int i) : m(i) {}\n"
" int m;\n"
" };\n"
"}\n"
"void g() { S s(0); }\n";
exp = "enum E : int ; "
"void f ( ) { } "
"namespace { "
"struct S { "
"explicit S ( int i ) : m ( i ) { } "
"int m ; "
"} ; "
"} "
"void g ( ) { S s ( 0 ) ; }";
ASSERT_EQUALS(exp, tok(code));

code = "struct S {\n" // 12595
" explicit S() {\n"
" e = E1;\n"
" }\n"
" enum { E1 } e = E1;\n"
"};\n";
exp = "struct S { "
"explicit S ( ) { e = E1 ; } "
"enum Anonymous0 { E1 } ; "
"enum Anonymous0 e ; "
"e = E1 ; "
"} ;";
ASSERT_EQUALS(exp, tok(code));

code = "struct S {\n"
" explicit S() {\n"
" e = E1;\n"
" }\n"
" enum : std::uint8_t { E1 } e = E1;\n"
"};\n";
exp = "struct S { "
"explicit S ( ) { e = E1 ; } "
"enum Anonymous0 : std :: uint8_t { E1 } ; "
"enum Anonymous0 e ; "
"e = E1 ; "
"} ;";
ASSERT_EQUALS(exp, tok(code));
}

Expand Down
Loading