diff options
| -rw-r--r-- | Analysis/ValueState.cpp | 11 | ||||
| -rw-r--r-- | include/clang/Analysis/PathSensitive/GRExprEngine.h | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Analysis/ValueState.cpp b/Analysis/ValueState.cpp index db2ef6badc..e175a1cd8f 100644 --- a/Analysis/ValueState.cpp +++ b/Analysis/ValueState.cpp @@ -94,8 +94,15 @@ ValueStateManager::RemoveDeadBindings(ValueState St, Stmt* Loc, Marked.insert(V); if (V->getType()->isPointerType()) { - const LVal& LV = - cast<LVal>(GetRVal(St, lval::DeclVal(cast<VarDecl>(V)))); + + RVal X = GetRVal(St, lval::DeclVal(cast<VarDecl>(V))); + + assert (!X.isUnknown()); + + if (X.isUninit()) + continue; + + LVal LV = cast<LVal>(X); for (RVal::symbol_iterator SI = LV.symbol_begin(), SE = LV.symbol_end(); SI != SE; ++SI) { diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h index f83f3d3e5c..8e66b9c327 100644 --- a/include/clang/Analysis/PathSensitive/GRExprEngine.h +++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h @@ -367,6 +367,10 @@ public: return R.isValid() ? TF->EvalBinOp(ValMgr, Op, L, cast<NonLVal>(R)) : R; } + RVal EvalBinOp(BinaryOperator::Opcode Op, NonLVal L, NonLVal R) { + return R.isValid() ? TF->EvalBinOp(ValMgr, Op, L, R) : R; + } + RVal EvalBinOp(BinaryOperator::Opcode Op, RVal L, RVal R) { if (L.isUninit() || R.isUninit()) |