Fix regression in pointer comparison with NULL (e.g., 0 != ptr). This fixes
<rdar://problem/6732151>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67954 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/GRSimpleVals.cpp b/lib/Analysis/GRSimpleVals.cpp
index a38d76d..8e605ca 100644
--- a/lib/Analysis/GRSimpleVals.cpp
+++ b/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);
}
diff --git a/test/Analysis/CheckNSError.m b/test/Analysis/CheckNSError.m
index 2843572..779b865 100644
--- a/test/Analysis/CheckNSError.m
+++ b/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;
+}
+
+