Fix #13222 FP comparisonError with nested defines (#6919)

danmar · Oct 16, 2024 · 4da801e · 4da801e
1 parent 2844f8e
commit 4da801e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -372,6 +372,8 @@ void CheckCondition::comparison()
             std::swap(expr1,expr2);
         if (!expr2->isNumber())
             continue;
+        if (!compareTokenFlags(expr1, expr2, /*macro*/ true))
+            continue;
         const MathLib::bigint num2 = MathLib::toBigNumber(expr2->str());
         if (num2 < 0)
             continue;

diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -495,6 +495,14 @@ class TestCondition : public TestFixture {
                       "[test.cpp:2]: (style) Expression '(X & 0x100) == 0x200' is always false.\n"
                       "[test.cpp:3]: (style) Expression '(X & 0x100) == 0x200' is always false.\n",
                       errout_str());
+
+        checkP("#define MACRO1 (0x0010)\n" // #13222
+               "#define MACRO2 (0x0020)\n"
+               "#define MACRO_ALL (MACRO1 | MACRO2)\n"
+               "void f() {\n"
+               "    if (MACRO_ALL == 0) {}\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 #define checkPureFunction(code) checkPureFunction_(code, __FILE__, __LINE__)