[cfe-commits] r66628 - in /cfe/trunk: lib/Analysis/SimpleConstraintManager.cpp test/Analysis/misc-ps.m

[Ted Kremenek]

Author: kremenek
Date: Tue Mar 10 21:29:48 2009
New Revision: 66628

URL: http://llvm.org/viewvc/llvm-project?rev=66628&view=rev
Log:
SimpleConstraintManager doesn't reason about bitwise-constraints on symbolic
values. Indicating this in 'canReasonAbout' allows GRExprEngine to recover
path-sensitivity in some cases.

Modified:
    cfe/trunk/lib/Analysis/SimpleConstraintManager.cpp
    cfe/trunk/test/Analysis/misc-ps.m

Modified: cfe/trunk/lib/Analysis/SimpleConstraintManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/SimpleConstraintManager.cpp?rev=66628&r1=66627&r2=66628&view=diff

==============================================================================
--- cfe/trunk/lib/Analysis/SimpleConstraintManager.cpp (original)
+++ cfe/trunk/lib/Analysis/SimpleConstraintManager.cpp Tue Mar 10 21:29:48 2009
@@ -21,6 +21,19 @@
 SimpleConstraintManager::~SimpleConstraintManager() {}
 
 bool SimpleConstraintManager::canReasonAbout(SVal X) const {
+  if (nonloc::SymIntConstraintVal *Y = dyn_cast<nonloc::SymIntConstraintVal>(&X)) {
+    const SymIntConstraint& C = Y->getConstraint();
+    switch (C.getOpcode()) {
+        // We don't reason yet about bitwise-constraints on symbolic values.
+      case BinaryOperator::And:
+      case BinaryOperator::Or:
+      case BinaryOperator::Xor:
+        return false;
+      default:
+        return true;
+    }
+  }
+
   return true;
 }
   

Modified: cfe/trunk/test/Analysis/misc-ps.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/misc-ps.m?rev=66628&r1=66627&r2=66628&view=diff

==============================================================================
--- cfe/trunk/test/Analysis/misc-ps.m (original)
+++ cfe/trunk/test/Analysis/misc-ps.m Tue Mar 10 21:29:48 2009
@@ -165,3 +165,16 @@
 }
 @end
 
+// PR 3770
+char pr3770(int x) {
+  int y = x & 0x2;
+  char *p = 0;
+  if (y == 1)
+    p = "hello";
+
+  if (y == 1)
+    return p[0]; // no-warning
+    
+  return 'a';
+}
+