diff options
| -rw-r--r-- | clang/include/clang/Analysis/PathSensitive/GRExprEngine.h | 8 | ||||
| -rw-r--r-- | clang/include/clang/Analysis/PathSensitive/GRTransferFuncs.h | 10 | ||||
| -rw-r--r-- | clang/lib/Analysis/GRExprEngine.cpp | 27 |
3 files changed, 37 insertions, 8 deletions
diff --git a/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h b/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h index 0d26d98ad0f..46ff6619596 100644 --- a/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h +++ b/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h @@ -447,10 +447,16 @@ protected: ValueState* Assume(ValueState* St, LVal Cond, bool Assumption, bool& isFeasible); - + + ValueState* AssumeAux(ValueState* St, LVal Cond, bool Assumption, + bool& isFeasible); + ValueState* Assume(ValueState* St, NonLVal Cond, bool Assumption, bool& isFeasible); + ValueState* AssumeAux(ValueState* St, NonLVal Cond, bool Assumption, + bool& isFeasible); + ValueState* AssumeSymNE(ValueState* St, SymbolID sym, const llvm::APSInt& V, bool& isFeasible); diff --git a/clang/include/clang/Analysis/PathSensitive/GRTransferFuncs.h b/clang/include/clang/Analysis/PathSensitive/GRTransferFuncs.h index d49144f355d..60492b5eeab 100644 --- a/clang/include/clang/Analysis/PathSensitive/GRTransferFuncs.h +++ b/clang/include/clang/Analysis/PathSensitive/GRTransferFuncs.h @@ -96,6 +96,16 @@ public: GRStmtNodeBuilder<ValueState>& Builder, ReturnStmt* S, ExplodedNode<ValueState>* Pred) {} + + // Assumptions. + + virtual ValueState* EvalAssume(ValueState* St, NonLVal Cond, bool Assumption){ + return St; + } + + virtual ValueState* EvalAssume(ValueState* St, LVal Cond, bool Assumption) { + return St; + } }; } // end clang namespace diff --git a/clang/lib/Analysis/GRExprEngine.cpp b/clang/lib/Analysis/GRExprEngine.cpp index 418129caa92..e3fe2395535 100644 --- a/clang/lib/Analysis/GRExprEngine.cpp +++ b/clang/lib/Analysis/GRExprEngine.cpp @@ -1840,13 +1840,20 @@ void GRExprEngine::HandleUndefinedStore(Stmt* S, NodeTy* Pred) { //===----------------------------------------------------------------------===// ValueState* GRExprEngine::Assume(ValueState* St, LVal Cond, - bool Assumption, - bool& isFeasible) { + bool Assumption, bool& isFeasible) { + + St = AssumeAux(St, Cond, Assumption, isFeasible); + return isFeasible ? St : TF->EvalAssume(St, Cond, Assumption); +} + +ValueState* GRExprEngine::AssumeAux(ValueState* St, LVal Cond, + bool Assumption, bool& isFeasible) { + switch (Cond.getSubKind()) { default: assert (false && "'Assume' not implemented for this LVal."); return St; - + case lval::SymbolValKind: if (Assumption) return AssumeSymNE(St, cast<lval::SymbolVal>(Cond).getSymbol(), @@ -1854,8 +1861,8 @@ ValueState* GRExprEngine::Assume(ValueState* St, LVal Cond, else return AssumeSymEQ(St, cast<lval::SymbolVal>(Cond).getSymbol(), BasicVals.getZeroWithPtrWidth(), isFeasible); - - + + case lval::DeclValKind: case lval::FuncValKind: case lval::GotoLabelKind: @@ -1871,8 +1878,14 @@ ValueState* GRExprEngine::Assume(ValueState* St, LVal Cond, } ValueState* GRExprEngine::Assume(ValueState* St, NonLVal Cond, - bool Assumption, - bool& isFeasible) { + bool Assumption, bool& isFeasible) { + + St = AssumeAux(St, Cond, Assumption, isFeasible); + return isFeasible ? St : TF->EvalAssume(St, Cond, Assumption); +} + +ValueState* GRExprEngine::AssumeAux(ValueState* St, NonLVal Cond, + bool Assumption, bool& isFeasible) { switch (Cond.getSubKind()) { default: assert (false && "'Assume' not implemented for this NonLVal."); |
