Skip to content

Commit a40fabb

Browse files
chrchr-githubchrchr-github
authored
Fix #12595 debug: valueFlowBailoutIncompleteVar with unnamed enum member (cppcheck-opensource#6240)
1 parent a16f360 commit a40fabb

2 files changed

Lines changed: 62 additions & 22 deletions

File tree

‎lib/tokenize.cpp‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8817,6 +8817,20 @@ void Tokenizer::simplifyFunctionTryCatch()
88178817
}
88188818
}
88198819

8820+
static bool isAnonymousEnum(const Token* tok)
8821+
{
8822+
if (!Token::Match(tok, "enum {|:"))
8823+
return false;
8824+
if (tok->index() > 2 && Token::Match(tok->tokAt(-3), "using %name% ="))
8825+
return false;
8826+
const Token* end = tok->next();
8827+
if (end->str() == ":") {
8828+
end = end->next();
8829+
while (Token::Match(end, "%name%|::"))
8830+
end = end->next();
8831+
}
8832+
return end && Token::Match(end->link(), "} (| %type%| )| [,;[({=]");
8833+
}
88208834

88218835
void Tokenizer::simplifyStructDecl()
88228836
{
@@ -8843,10 +8857,7 @@ void Tokenizer::simplifyStructDecl()
88438857
}
88448858
}
88458859
// check for anonymous enum
8846-
else if ((Token::simpleMatch(tok, "enum {") &&
8847-
!Token::Match(tok->tokAt(-3), "using %name% =") &&
8848-
Token::Match(tok->next()->link(), "} (| %type%| )| ,|;|[|(|{")) ||
8849-
(Token::Match(tok, "enum : %type% {") && Token::Match(tok->linkAt(3), "} (| %type%| )| ,|;|[|(|{"))) {
8860+
else if (isAnonymousEnum(tok)) {
88508861
Token *start = tok->strAt(1) == ":" ? tok->linkAt(3) : tok->linkAt(1);
88518862
if (start && Token::Match(start->next(), "( %type% )")) {
88528863
start->next()->link()->deleteThis();

‎test/testsimplifytokens.cpp‎

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,24 +1252,53 @@ class TestSimplifyTokens : public TestFixture {
12521252
}
12531253

12541254
void simplifyStructDecl9() {
1255-
const char* code = "enum E : int;\n" // #12588
1256-
"void f() {}\n"
1257-
"namespace {\n"
1258-
" struct S {\n"
1259-
" explicit S(int i) : m(i) {}\n"
1260-
" int m;\n"
1261-
" };\n"
1262-
"}\n"
1263-
"void g() { S s(0); }\n";
1264-
const char* exp = "enum E : int ; "
1265-
"void f ( ) { } "
1266-
"namespace { "
1267-
"struct S { "
1268-
"explicit S ( int i ) : m ( i ) { } "
1269-
"int m ; "
1270-
"} ; "
1271-
"} "
1272-
"void g ( ) { S s ( 0 ) ; }";
1255+
const char *code{}, *exp{};
1256+
code = "enum E : int;\n" // #12588
1257+
"void f() {}\n"
1258+
"namespace {\n"
1259+
" struct S {\n"
1260+
" explicit S(int i) : m(i) {}\n"
1261+
" int m;\n"
1262+
" };\n"
1263+
"}\n"
1264+
"void g() { S s(0); }\n";
1265+
exp = "enum E : int ; "
1266+
"void f ( ) { } "
1267+
"namespace { "
1268+
"struct S { "
1269+
"explicit S ( int i ) : m ( i ) { } "
1270+
"int m ; "
1271+
"} ; "
1272+
"} "
1273+
"void g ( ) { S s ( 0 ) ; }";
1274+
ASSERT_EQUALS(exp, tok(code));
1275+
1276+
code = "struct S {\n" // 12595
1277+
" explicit S() {\n"
1278+
" e = E1;\n"
1279+
" }\n"
1280+
" enum { E1 } e = E1;\n"
1281+
"};\n";
1282+
exp = "struct S { "
1283+
"explicit S ( ) { e = E1 ; } "
1284+
"enum Anonymous0 { E1 } ; "
1285+
"enum Anonymous0 e ; "
1286+
"e = E1 ; "
1287+
"} ;";
1288+
ASSERT_EQUALS(exp, tok(code));
1289+
1290+
code = "struct S {\n"
1291+
" explicit S() {\n"
1292+
" e = E1;\n"
1293+
" }\n"
1294+
" enum : std::uint8_t { E1 } e = E1;\n"
1295+
"};\n";
1296+
exp = "struct S { "
1297+
"explicit S ( ) { e = E1 ; } "
1298+
"enum Anonymous0 : std :: uint8_t { E1 } ; "
1299+
"enum Anonymous0 e ; "
1300+
"e = E1 ; "
1301+
"} ;";
12731302
ASSERT_EQUALS(exp, tok(code));
12741303
}
12751304

0 commit comments

Comments
 (0)