Fix issue 9859: false positive: knownConditionTrueFalse (danmar#2759)

pfultz2 · web-flow · commit 82bdbcd73bd7 · 2020-08-28T19:26:09.000+02:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -2574,7 +2574,7 @@ struct SingleValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
     virtual bool isGlobal() const OVERRIDE {
         for (const auto&p:getVars()) {
             const Variable* var = p.second;
-            if (var->isGlobal() && !var->isConst())
+            if (!var->isLocal() && !var->isArgument() && !var->isConst())
                 return true;
         }
         return false;
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -3588,6 +3588,17 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "}\n");
         ASSERT_EQUALS("", errout.str());
+
+        check("struct A {\n"
+              "    std::vector<int> v;\n"
+              "    void g();\n"
+              "    void f(bool b) {\n"
+              "        v.clear();\n"
+              "        g();\n"
+              "        return !v.empty();\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void multiConditionAlwaysTrue() {

Original file line number	Diff line number	Diff line change
`@@ -2574,7 +2574,7 @@ struct SingleValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {`
`2574`	`2574`	`virtual bool isGlobal() const OVERRIDE {`
`2575`	`2575`	`for (const auto&p:getVars()) {`
`2576`	`2576`	`const Variable* var = p.second;`
`2577`		`- if (var->isGlobal() && !var->isConst())`
	`2577`	`+ if (!var->isLocal() && !var->isArgument() && !var->isConst())`
`2578`	`2578`	`return true;`
`2579`	`2579`	`}`
`2580`	`2580`	`return false;`