dump more test details & simplify logic test expr

Author: danix800

clang/lib/StaticAnalyzer/Core/RangedConstraintManager.cpp

@@ -25,7 +25,7 @@ ProgramStateRef RangedConstraintManager::assumeSym(ProgramStateRef State,
                                                    bool Assumption) {
   SVal SimplifiedVal = simplifyToSVal(State, Sym);
   if (SimplifiedVal.isConstant()) {
-    bool Feasible = SimplifiedVal.isZeroConstant() ? !Assumption : Assumption;
+    bool Feasible = SimplifiedVal.isZeroConstant() != Assumption;
     return Feasible ? State : nullptr;
   }
 

clang/test/Analysis/solver-sym-simplification-on-assumption.c

@@ -3,29 +3,34 @@
 // RUN:   -verify
 
 void clang_analyzer_eval(int);
+void clang_analyzer_value(int);
 
 void test_derived_sym_simplification_on_assume(int s0, int s1) {
   int elem = s0 + s1 + 1;
-  if (elem-- == 0) // elem = s0 + s1
+  if (elem-- == 0)
     return;
 
-  if (elem-- == 0) // elem = s0 + s1 - 1
+  if (elem-- == 0)
     return;
 
-  if (s0 < 1) // s0: [1, 2147483647]
+  if (s0 < 1)
     return;
-  if (s1 < 1) // s0: [1, 2147483647]
+  clang_analyzer_value(s0); // expected-warning{{[1, 2147483647]}}
+
+  if (s1 < 1)
     return;
+  clang_analyzer_value(s1); // expected-warning{{[1, 2147483647]}}
 
-  if (elem-- == 0) // elem = s0 + s1 - 2
+  if (elem-- == 0)
     return;
 
-  if (s0 > 1) // s0: [-2147483648, 0] U [1, 2147483647] => s0 = 0
+  if (s0 > 1)
     return;
+  clang_analyzer_value(s0); // expected-warning{{1}}
 
-  if (s1 > 1) // s1: [-2147483648, 0] U [1, 2147483647] => s1 = 0
+  if (s1 > 1)
     return;
+  clang_analyzer_value(s1); // expected-warning{{1}}
 
-  // elem = s0 + s1 - 2 should be 0
   clang_analyzer_eval(elem); // expected-warning{{FALSE}}
 }

clang/test/Analysis/std-c-library-functions-bufsize-nocrash-with-correct-solver.c

@@ -1,14 +1,17 @@
 // RUN: %clang_analyze_cc1 %s \
+// RUN:   -analyzer-max-loop 6 \
 // RUN:   -analyzer-checker=unix.StdCLibraryFunctions \
 // RUN:   -analyzer-config unix.StdCLibraryFunctions:ModelPOSIX=true \
 // RUN:   -analyzer-checker=debug.ExprInspection \
 // RUN:   -triple x86_64-unknown-linux-gnu \
 // RUN:   -verify
 
-// expected-no-diagnostics
-
 #include "Inputs/std-c-library-functions-POSIX.h"
 
+void clang_analyzer_value(int);
+void clang_analyzer_warnIfReached();
+void clang_analyzer_printState();
+
 void _add_one_to_index_C(int *indices, int *shape) {
   int k = 1;
   for (; k >= 0; k--)
@@ -26,8 +29,15 @@ void PyObject_CopyData_sptr(char *i, char *j, int *indices, int itemsize,
 
   // no contradiction after 3 iterations when 'elements' could be
   // simplified to 0
+  int iterations = 0;
   while (elements--) {
+    iterations++;
     _add_one_to_index_C(indices, shape);
-    getnameinfo(sa, 10, i, itemsize, i, itemsize, 0);
+    getnameinfo(sa, 10, i, itemsize, i, itemsize, 0); // no crash here
+  }
+
+  if (shape[0] == 1 && shape[1] == 1 && indices[0] == 0 && indices[1] == 0) {
+    clang_analyzer_value(iterations == 3 && elements == -1);
+    // expected-warning@-1{{1}}
   }
 }