diff options
| -rw-r--r-- | include/clang/Analysis/PathSensitive/GRCoreEngine.h | 5 | ||||
| -rw-r--r-- | include/clang/Analysis/PathSensitive/GRExprEngine.h | 5 | ||||
| -rw-r--r-- | lib/Analysis/GRExprEngine.cpp | 9 |
3 files changed, 11 insertions, 8 deletions
diff --git a/include/clang/Analysis/PathSensitive/GRCoreEngine.h b/include/clang/Analysis/PathSensitive/GRCoreEngine.h index 4f09c9089b..2211f3a4d9 100644 --- a/include/clang/Analysis/PathSensitive/GRCoreEngine.h +++ b/include/clang/Analysis/PathSensitive/GRCoreEngine.h @@ -230,7 +230,8 @@ public: } NodeTy* MakeNode(ExplodedNodeSet<StateTy>& Dst, Stmt* S, - NodeTy* Pred, const StateTy* St) { + NodeTy* Pred, const StateTy* St, + ProgramPoint::Kind K = ProgramPoint::PostStmtKind) { const StateTy* PredState = GetState(Pred); @@ -240,7 +241,7 @@ public: return NULL; } - NodeTy* N = generateNode(S, St, Pred); + NodeTy* N = generateNode(S, St, Pred, K); if (N) { if (BuildSinks) diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h index 7cd345d233..b1f4e70d39 100644 --- a/include/clang/Analysis/PathSensitive/GRExprEngine.h +++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h @@ -442,9 +442,10 @@ protected: return StateMgr.Assume(St, Cond, Assumption, isFeasible); } - NodeTy* MakeNode(NodeSet& Dst, Stmt* S, NodeTy* Pred, const GRState* St) { + NodeTy* MakeNode(NodeSet& Dst, Stmt* S, NodeTy* Pred, const GRState* St, + ProgramPoint::Kind K = ProgramPoint::PostStmtKind) { assert (Builder && "GRStmtNodeBuilder not present."); - return Builder->MakeNode(Dst, S, Pred, St); + return Builder->MakeNode(Dst, S, Pred, St, K); } /// Visit - Transfer function logic for all statements. Dispatches to diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp index 75ba46051f..affb02a962 100644 --- a/lib/Analysis/GRExprEngine.cpp +++ b/lib/Analysis/GRExprEngine.cpp @@ -954,22 +954,23 @@ void GRExprEngine::EvalLoad(NodeSet& Dst, Expr* Ex, NodeTy* Pred, return; // Proceed with the load. + ProgramPoint::Kind K = ProgramPoint::PostLoadKind; // FIXME: Currently symbolic analysis "generates" new symbols // for the contents of values. We need a better approach. // FIXME: The "CheckOnly" option exists only because Array and Field // loads aren't fully implemented. Eventually this option will go away. - + if (CheckOnly) - MakeNode(Dst, Ex, Pred, St); + MakeNode(Dst, Ex, Pred, St, K); else if (location.isUnknown()) { // This is important. We must nuke the old binding. - MakeNode(Dst, Ex, Pred, SetRVal(St, Ex, UnknownVal())); + MakeNode(Dst, Ex, Pred, SetRVal(St, Ex, UnknownVal()), K); } else MakeNode(Dst, Ex, Pred, SetRVal(St, Ex, GetRVal(St, cast<LVal>(location), - Ex->getType()))); + Ex->getType())), K); } const GRState* GRExprEngine::EvalLocation(Expr* Ex, NodeTy* Pred, |