Fix #12244 FN: unreachableCode with unconditional scope (danmar#7130)

chrchr-github · Dec 25, 2024 · dbf1f19 · dbf1f19
1 parent 38201c9
commit dbf1f19
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -887,6 +887,8 @@ void CheckOther::checkUnreachableCode()
                         tok2 = tok2->link();
                     if (tok2->str() == ";") {
                         secondBreak = tok2->next();
+                        while (Token::simpleMatch(secondBreak, "}") && secondBreak->scope()->type == Scope::ScopeType::eUnconditional)
+                            secondBreak = secondBreak->next();
                         break;
                     }
                 }

diff --git a/test/testother.cpp b/test/testother.cpp
@@ -5606,6 +5606,15 @@ class TestOther : public TestFixture {
               "    } while (0);\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (style) Statements following 'break' will never be executed.\n", errout_str());
+
+        check("void f() {\n" // #12244
+              "    {\n"
+              "        std::cout << \"x\";\n"
+              "        return;\n"
+              "    }\n"
+              "    std::cout << \"y\";\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6]: (style) Statements following 'return' will never be executed.\n", errout_str());
     }
 
     void redundantContinue() {