Fix #12941 Dynamic cast wrong logic (#6666)

danmar · Aug 7, 2024 · bc4579b · bc4579b
1 parent 7ece4f6
commit bc4579b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -1572,8 +1572,11 @@ namespace {
 
                 return unknown();
             } else if (expr->str() == "(" && expr->isCast()) {
-                if (Token::simpleMatch(expr->previous(), ">") && expr->linkAt(-1))
-                    return execute(expr->astOperand2());
+                if (expr->astOperand2()) {
+                    if (expr->astOperand1()->str() != "dynamic_cast")
+                        return execute(expr->astOperand2());
+                    return unknown();
+                }
                 return execute(expr->astOperand1());
             }
             if (expr->exprId() > 0 && pm->hasValue(expr->exprId())) {

diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -6084,11 +6084,25 @@ class TestCondition : public TestFixture {
                       errout_str());
     }
 
-    void knownConditionCast() { // #9976
-        check("void f(int i) {\n"
+    void knownConditionCast() {
+        check("void f(int i) {\n" // #9976
               "    if (i < 0 || (unsigned)i > 5) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct B {\n" // #12941
+              "    virtual void f();\n"
+              "};\n"
+              "struct One : public B {};\n"
+              "struct Two : public B {};\n"
+              "void g(const B& b) {\n"
+              "    const Two* two = nullptr;\n"
+              "    const One* one = dynamic_cast<const One*>(&b);\n"
+              "    if (one == nullptr)\n"
+              "        two = dynamic_cast<const Two*>(&b);\n"
+              "    if (two) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void knownConditionIncrementLoop() { // #9808