Fixed danmar#6227 (False positive (oppositeInnerCondition) - if (!dynamic_cast<>))

danmar · danmar · commit 64b72bd6e526 · 2015-07-27T10:43:52.000+02:00
diff --git a/lib/checkcondition.h b/lib/checkcondition.h
@@ -48,6 +48,7 @@ class CPPCHECKLIB CheckCondition : public Check {
         CheckCondition checkCondition(tokenizer, settings, errorLogger);
         checkCondition.multiCondition();
         checkCondition.clarifyCondition();   // not simplified because ifAssign
+        checkCondition.oppositeInnerCondition();
     }
 
     /** @brief Run checks against the simplified token list */
@@ -56,7 +57,6 @@ class CPPCHECKLIB CheckCondition : public Check {
         checkCondition.assignIf();
         checkCondition.checkBadBitmaskCheck();
         checkCondition.comparison();
-        checkCondition.oppositeInnerCondition();
         checkCondition.checkIncorrectLogicOperator();
         checkCondition.checkModuloAlwaysTrueFalse();
         checkCondition.alwaysTrueFalse();
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -1309,6 +1309,23 @@ class TestCondition : public TestFixture {
               "  }\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        // #6227 - FP caused by simplifications of casts and known variables
+        check("void foo(A *a) {\n"
+              "   if(a) {\n"
+              "       B *b = dynamic_cast<B*>(a);\n"
+              "       if(!b) {}\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
+        check("void foo(int a) {\n"
+              "   if(a) {\n"
+              "       int b = a;\n"
+              "       if(!b) {}\n"
+              "    }\n"
+              "}");
+        TODO_ASSERT_EQUALS("error", "", errout.str());
     }
 
     // clarify conditions with = and comparison
