forked from OSchip/llvm-project
Fix: <rdar://problem/6777209> false Dereference of null pointer in loop: pointer increment/decrement preserves non-nullness
When the StoreManager doesn't reason well about pointer-arithmetic, propagate the non-nullness constraint on a pointer value when performing pointer arithmetic uisng ++/--. llvm-svn: 69741
This commit is contained in:
parent
1a1b62c168
commit
35f875c136
|
@ -2674,9 +2674,33 @@ void GRExprEngine::VisitUnaryOperator(UnaryOperator* U, NodeTy* Pred,
|
|||
SVal Result = EvalBinOp(Op, V2, MakeConstantVal(1U, U), U->getType());
|
||||
|
||||
// Conjure a new symbol if necessary to recover precision.
|
||||
if (Result.isUnknown() || !getConstraintManager().canReasonAbout(Result))
|
||||
if (Result.isUnknown() || !getConstraintManager().canReasonAbout(Result)){
|
||||
Result = ValMgr.getConjuredSymbolVal(Ex,
|
||||
Builder->getCurrentBlockCount());
|
||||
|
||||
// If the value is a location, ++/-- should always preserve
|
||||
// non-nullness. Check if the original value was non-null, and if so propagate
|
||||
// that constraint.
|
||||
if (Loc::IsLocType(U->getType())) {
|
||||
SVal Constraint = EvalBinOp(BinaryOperator::EQ, V2,
|
||||
ValMgr.makeZeroVal(U->getType()),
|
||||
getContext().IntTy);
|
||||
|
||||
bool isFeasible = false;
|
||||
Assume(state, Constraint, true, isFeasible);
|
||||
if (!isFeasible) {
|
||||
// It isn't feasible for the original value to be null.
|
||||
// Propagate this constraint.
|
||||
Constraint = EvalBinOp(BinaryOperator::EQ, Result,
|
||||
ValMgr.makeZeroVal(U->getType()),
|
||||
getContext().IntTy);
|
||||
|
||||
bool isFeasible = false;
|
||||
state = Assume(state, Constraint, false, isFeasible);
|
||||
assert(isFeasible && state);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
state = BindExpr(state, U, U->isPostfix() ? V2 : Result);
|
||||
|
||||
|
|
|
@ -245,3 +245,18 @@ void rdar_6777003(int x) {
|
|||
*p = 1; // expected-warning{{Dereference of null pointer}}
|
||||
}
|
||||
|
||||
// For pointer arithmetic, --/++ should be treated as preserving non-nullness,
|
||||
// regardless of how well the underlying StoreManager reasons about pointer
|
||||
// arithmetic.
|
||||
// <rdar://problem/6777209>
|
||||
|
||||
void rdar_6777209(char *p) {
|
||||
if (p == 0)
|
||||
return;
|
||||
|
||||
++p;
|
||||
|
||||
// This branch should always be infeasible.
|
||||
if (p == 0)
|
||||
*p = 'c'; // no-warning
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue