commit 035cf930d51b890ecd67805d27baf70d8d2c0038
author Ted Kremenek <kremenek@apple.com> Sat Mar 28 19:59:33 2009 +0000
committer Ted Kremenek <kremenek@apple.com> Sat Mar 28 19:59:33 2009 +0000
tree 73ac75970a5605c1e8cdd724a1e35012d0653236
parent 356d974a93c5a6d5e6d1bbcde1818809c3f9ae87

Fix regression in pointer comparison with NULL (e.g., 0 != ptr). This fixes
<rdar://problem/6732151>.

llvm-svn: 67954

clang/lib/Analysis/GRSimpleVals.cpp

diff --git a/clang/lib/Analysis/GRSimpleVals.cpp b/clang/lib/Analysis/GRSimpleVals.cpp
index a38d76d..8e605ca 100644
--- a/clang/lib/Analysis/GRSimpleVals.cpp
+++ b/clang/lib/Analysis/GRSimpleVals.cpp
@@ -375,13 +375,11 @@
         
         return NonLoc::MakeIntTruthVal(BasicVals, b);
       }
-      else if (isa<loc::SymbolVal>(R)) {
+      else if (SymbolRef Sym = R.getAsSymbol()) {
         const SymIntExpr * SE =
-        Eng.getSymbolManager().getSymIntExpr(
-                                    cast<loc::SymbolVal>(R).getSymbol(),
-                                    BinaryOperator::NE,
-                                    cast<loc::ConcreteInt>(L).getValue(),
-                                    Eng.getContext().IntTy);
+          Eng.getSymbolManager().getSymIntExpr(Sym, BinaryOperator::NE,
+                                           cast<loc::ConcreteInt>(L).getValue(),
+                                             Eng.getContext().IntTy);
         return nonloc::SymExprVal(SE);
       }
       

clang/test/Analysis/CheckNSError.m

diff --git a/clang/test/Analysis/CheckNSError.m b/clang/test/Analysis/CheckNSError.m
index 2843572..779b865 100644
--- a/clang/test/Analysis/CheckNSError.m
+++ b/clang/test/Analysis/CheckNSError.m
@@ -41,7 +41,19 @@
   *error = 0;  // expected-warning {{Potential null dereference.}}
 }
 
-int bar(CFErrorRef* error) {
-  if (error) *error = 0;
+int f1(CFErrorRef* error) {
+  if (error) *error = 0; // no-warning
   return 0;
 }
+
+int f2(CFErrorRef* error) {
+  if (0 != error) *error = 0; // no-warning
+  return 0;
+}
+
+int f3(CFErrorRef* error) {
+  if (error != 0) *error = 0; // no-warning
+  return 0;
+}
+
+