Fix #12588 FP unusedFunction with forward-declared enum (#6232)

danmar · Apr 4, 2024 · 4503fbf · 4503fbf
1 parent 228f9cd
commit 4503fbf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8873,9 +8873,9 @@ void Tokenizer::simplifyStructDecl()
             const Token * const type = tok->next();
             Token *next = tok->tokAt(2);
 
-            while (next && next->str() != "{")
+            while (next && !Token::Match(next, "[{;]"))
                 next = next->next();
-            if (!next)
+            if (!next || next->str() == ";")
                 continue;
             Token* after = next->link();
             if (!after)

diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -89,6 +89,7 @@ class TestSimplifyTokens : public TestFixture {
         TEST_CASE(simplifyStructDecl6); // ticket #3732
         TEST_CASE(simplifyStructDecl7); // ticket #476 (static anonymous struct array)
         TEST_CASE(simplifyStructDecl8); // ticket #7698
+        TEST_CASE(simplifyStructDecl9);
 
         // register int var; => int var;
         // inline int foo() {} => int foo() {}
@@ -1249,6 +1250,28 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("enum class J : short { x , y , z } ; enum J j ; j = x ;", tok("enum class J : short { x, y, z } j{x};"));
     }
 
+    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 ) ; }";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
     void removeUnwantedKeywords() {
         ASSERT_EQUALS("int var ;", tok("register int var ;"));
         ASSERT_EQUALS("short var ;", tok("register short int var ;"));