fixup! Fix 12681: FP: knownConditionTrueFalse

danmar · May 20, 2024 · 12e80ec · 12e80ec
1 parent 5b7342f
commit 12e80ec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -2838,15 +2838,8 @@ struct ValueFlowAnalyzer : Analyzer {
 
                     /* Handle overflow/underflow for value bounds */
                     if (value->bound != ValueFlow::Value::Bound::Point) {
-                        if (newvalue > value->intvalue) {
-                            if ((inc && value->bound == ValueFlow::Value::Bound::Lower)
-                            || (!inc && value->bound == ValueFlow::Value::Bound::Upper))
-                                value->invertBound();
-                        } else if (newvalue < value->intvalue) {
-                            if ((!inc && value->bound == ValueFlow::Value::Bound::Lower)
-                            || (inc && value->bound == ValueFlow::Value::Bound::Upper))
-                                value->invertBound();
-                        }
+                        if ((newvalue > value->intvalue && !inc) || (newvalue < value->intvalue && inc))
+                            value->invertBound();
                     }
 
                     value->intvalue = newvalue;

diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -4784,14 +4784,22 @@ class TestCondition : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-      // #12681
+        // #12681
         check("void f(unsigned u) {\n"
               "      if (u > 0) {\n"
               "             u--;\n"
               "             if (u == 0) {}\n"
               "      }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(unsigned u) {\n"
+              "      if (u < 0xFFFFFFFF) {\n"
+              "             u++;\n"
+              "             if (u == 0xFFFFFFFF) {}\n"
+              "      }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueInfer() {