Move to valueflow

Author: Your Name

test/testcondition.cpp

@@ -4935,37 +4935,6 @@ class TestCondition : public TestFixture {
               "    if (v > 0) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
-
-        check("bool f();\n" // a modification after a conditional escape must still be seen
-              "int main() {\n"
-              "    bool datumAdded = false;\n"
-              "    if (f()) {\n"
-              "        if (f()) return 1;\n"
-              "        if (f()) datumAdded = true;\n"
-              "    }\n"
-              "    if (datumAdded) {}\n"
-              "}\n");
-        ASSERT_EQUALS("", errout_str());
-
-        check("bool f();\n"
-              "int main() {\n"
-              "    bool b = false;\n"
-              "    if (f()) {\n"
-              "        if (f()) return 1;\n"
-              "        b = true;\n"
-              "    }\n"
-              "    if (b) {}\n"
-              "}\n");
-        ASSERT_EQUALS("", errout_str());
-
-        check("bool f();\n" // the branch always escapes - keep the known value
-              "int main() {\n"
-              "    bool b = false;\n"
-              "    if (f()) { b = true; return 1; }\n"
-              "    if (b) {}\n"
-              "}\n");
-        ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'b' is always false [knownConditionTrueFalse]\n",
-                      errout_str());
     }
 
     void alwaysTrueSymbolic()

test/testvalueflow.cpp

@@ -3214,6 +3214,38 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, 0));
+
+        code = "bool f();\n" // a modification after a conditional escape must still be seen
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) {\n"
+               "        if (f()) return;\n"
+               "        if (f()) x = true;\n"
+               "    }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 8U, 0));
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 8U, 0));
+
+        code = "bool f();\n"
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) {\n"
+               "        if (f()) return;\n"
+               "        x = true;\n"
+               "    }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 8U, 0));
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 8U, 0));
+
+        code = "bool f();\n" // the branch always escapes - keep the known value
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) { x = true; return; }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 0));
     }
 
     void valueFlowAfterSwap()