diff options
| -rw-r--r-- | lib/Analysis/GRSimpleVals.cpp | 10 | ||||
| -rw-r--r-- | test/Analysis/CheckNSError.m | 16 |
2 files changed, 18 insertions, 8 deletions
diff --git a/lib/Analysis/GRSimpleVals.cpp b/lib/Analysis/GRSimpleVals.cpp index a38d76d260..8e605ca4c7 100644 --- a/lib/Analysis/GRSimpleVals.cpp +++ b/lib/Analysis/GRSimpleVals.cpp @@ -375,13 +375,11 @@ TryAgain: 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 28435727eb..779b865aff 100644 --- a/test/Analysis/CheckNSError.m +++ b/test/Analysis/CheckNSError.m @@ -41,7 +41,19 @@ void foo(CFErrorRef* error) { // expected-warning {{Function accepting CFErrorRe *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; +} + + |