GRStmtNodeBuilderImpl::GRStmtNodeBuilderImpl(CFGBlock* b, unsigned idx,
ExplodedNodeImpl* N, GRCoreEngineImpl* e)
- : Eng(*e), B(*b), Idx(idx), LastNode(N), Populated(false) {
+ : Eng(*e), B(*b), Idx(idx), Pred(N), LastNode(N), Populated(false) {
Deferred.insert(N);
}
GRCoreEngineImpl& Eng;
CFGBlock& B;
const unsigned Idx;
+ ExplodedNodeImpl* Pred;
ExplodedNodeImpl* LastNode;
bool HasGeneratedNode;
bool Populated;
~GRStmtNodeBuilderImpl();
- inline ExplodedNodeImpl* getLastNode() {
+ ExplodedNodeImpl* getBasePredecessor() const { return Pred; }
+
+ ExplodedNodeImpl* getLastNode() const {
return LastNode ? (LastNode->isSink() ? NULL : LastNode) : NULL;
}
typedef ExplodedNode<StateTy> NodeTy;
GRStmtNodeBuilderImpl& NB;
+ StateTy* CleanedState;
public:
- GRStmtNodeBuilder(GRStmtNodeBuilderImpl& nb) : NB(nb), BuildSinks(false) {}
+ GRStmtNodeBuilder(GRStmtNodeBuilderImpl& nb) : NB(nb), BuildSinks(false) {
+ CleanedState = getLastNode()->getState();
+ }
NodeTy* getLastNode() const {
return static_cast<NodeTy*>(NB.getLastNode());
return static_cast<NodeTy*>(NB.generateNodeImpl(S, St));
}
+ StateTy* GetState(NodeTy* Pred) const {
+ if ((ExplodedNodeImpl*) Pred == NB.getBasePredecessor())
+ return CleanedState;
+ else
+ return Pred->getState();
+ }
+
+ void SetCleanedState(StateTy* St) {
+ CleanedState = St;
+ }
+
NodeTy* Nodify(ExplodedNodeSet<StateTy>& Dst, Stmt* S,
NodeTy* Pred, StateTy* St) {
+ StateTy* PredState = GetState(Pred);
// If the state hasn't changed, don't generate a new node.
- if (!BuildSinks && St == Pred->getState()) {
+ if (!BuildSinks && St == PredState) {
Dst.Add(Pred);
return NULL;
}