Inter-procedural analysis: now we can return from the callee.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@92116 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Analysis/PathSensitive/GRCoreEngine.h b/include/clang/Analysis/PathSensitive/GRCoreEngine.h
index e2a03a2..74f7a14 100644
--- a/include/clang/Analysis/PathSensitive/GRCoreEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRCoreEngine.h
@@ -211,6 +211,8 @@
/// of this builder.
CFGBlock* getBlock() const { return &B; }
+ unsigned getIndex() const { return Idx; }
+
void setAuditor(GRAuditor* A) { Auditor = A; }
const GRState* GetState(ExplodedNode* Pred) const {
@@ -401,7 +403,7 @@
};
class GREndPathNodeBuilder {
- GRCoreEngine& Eng;
+ GRCoreEngine &Eng;
CFGBlock& B;
ExplodedNode* Pred;
@@ -414,6 +416,8 @@
~GREndPathNodeBuilder();
+ GRWorkList &getWorkList() { return *Eng.WList; }
+
ExplodedNode* getPredecessor() const { return Pred; }
GRBlockCounter getBlockCounter() const {
diff --git a/lib/Analysis/CallInliner.cpp b/lib/Analysis/CallInliner.cpp
index 2f748bd..618d823 100644
--- a/lib/Analysis/CallInliner.cpp
+++ b/lib/Analysis/CallInliner.cpp
@@ -19,6 +19,11 @@
namespace {
class CallInliner : public Checker {
+
+ /// CallSitePosition - Map the call site to its CFG block and stmt index. This
+ /// is used when exiting from a callee.
+ llvm::DenseMap<const Stmt *, std::pair<CFGBlock*,unsigned> > CallSitePosition;
+
public:
static void *getTag() {
static int x;
@@ -26,6 +31,7 @@
}
virtual bool EvalCallExpr(CheckerContext &C, const CallExpr *CE);
+ virtual void EvalEndPath(GREndPathNodeBuilder &B,void *tag,GRExprEngine &Eng);
};
}
@@ -77,6 +83,37 @@
Builder.HasGeneratedNode = true;
+ // Record the call site position.
+ CallSitePosition[CE] = std::make_pair(Builder.getBlock(), Builder.getIndex());
return true;
}
+void CallInliner::EvalEndPath(GREndPathNodeBuilder &B, void *tag,
+ GRExprEngine &Eng) {
+ const GRState *state = B.getState();
+ ExplodedNode *Pred = B.getPredecessor();
+ const StackFrameContext *LocCtx =
+ cast<StackFrameContext>(Pred->getLocationContext());
+
+ const Stmt *CE = LocCtx->getCallSite();
+
+ // Check if this is the top level stack frame.
+ if (!LocCtx->getParent())
+ return;
+
+ PostStmt NodeLoc(CE, LocCtx->getParent());
+
+ bool isNew;
+ ExplodedNode *Succ = Eng.getGraph().getNode(NodeLoc, state, &isNew);
+ Succ->addPredecessor(Pred, Eng.getGraph());
+
+ assert(CallSitePosition.find(CE) != CallSitePosition.end());
+
+ // When creating the new work list unit, increment the statement index to
+ // point to the statement after the CallExpr.
+ if (isNew)
+ B.getWorkList().Enqueue(Succ, *CallSitePosition[CE].first,
+ CallSitePosition[CE].second + 1);
+
+ B.HasGeneratedNode = true;
+}