Fix #12732 FP knownConditionTrueFalse with switch (regression) (#6495)

danmar · Jun 8, 2024 · 1638831 · 1638831
1 parent 35863cb
commit 1638831
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
@@ -614,7 +614,7 @@ namespace {
                     const Scope* scope = tok->scope();
                     if (!scope)
                         return Break();
-                    if (contains({Scope::eDo, Scope::eFor, Scope::eWhile, Scope::eIf, Scope::eElse}, scope->type)) {
+                    if (contains({Scope::eDo, Scope::eFor, Scope::eWhile, Scope::eIf, Scope::eElse, Scope::eSwitch}, scope->type)) {
                         const bool inElse = scope->type == Scope::eElse;
                         const bool inDoWhile = scope->type == Scope::eDo;
                         const bool inLoop = contains({Scope::eDo, Scope::eFor, Scope::eWhile}, scope->type);

diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -4607,6 +4607,19 @@ class TestCondition : public TestFixture {
               "    if (q) {}\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'q' is always true\n", errout_str());
+
+        check("void f(int i) {\n"
+              "    int j = 0;\n"
+              "    switch (i) {\n"
+              "    case 1:\n"
+              "        j = 0;\n"
+              "        break;\n"
+              "    default:\n"
+              "        j = 1;\n"
+              "    }\n"
+              "    if (j != 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueSymbolic()