svf-tools 1.0.342 → 1.0.346

package/include/Graphs/ThreadCallGraph.h

@@ -159,17 +159,17 @@ class ThreadCallGraph: public PTACallGraph
 {
 
 public:
-    typedef Set<const CallBlockNode*> InstSet;
+    typedef Set<const CallICFGNode*> InstSet;
     typedef InstSet CallSiteSet;
     typedef std::vector<const Instruction*> InstVector;
     typedef Map<const Instruction*, InstSet> CallToInstMap;
     typedef Set<CallSiteSet*> CtxSet;
     typedef ThreadForkEdge::ForkEdgeSet ForkEdgeSet;
-    typedef Map<const CallBlockNode*, ForkEdgeSet> CallInstToForkEdgesMap;
+    typedef Map<const CallICFGNode*, ForkEdgeSet> CallInstToForkEdgesMap;
     typedef ThreadJoinEdge::JoinEdgeSet JoinEdgeSet;
-    typedef Map<const CallBlockNode*, JoinEdgeSet> CallInstToJoinEdgesMap;
+    typedef Map<const CallICFGNode*, JoinEdgeSet> CallInstToJoinEdgesMap;
     typedef HareParForEdge::ParForEdgeSet ParForEdgeSet;
-    typedef Map<const CallBlockNode*, ParForEdgeSet> CallInstToParForEdgesMap;
+    typedef Map<const CallICFGNode*, ParForEdgeSet> CallInstToParForEdgesMap;
 
     /// Constructor
     ThreadCallGraph();
@@ -199,17 +199,17 @@ public:
     /// Get call graph edge via call instruction
     //@{
     /// whether this call instruction has a valid call graph edge
-    inline bool hasThreadForkEdge(const CallBlockNode* cs) const
+    inline bool hasThreadForkEdge(const CallICFGNode* cs) const
     {
         return callinstToThreadForkEdgesMap.find(cs) != callinstToThreadForkEdgesMap.end();
     }
-    inline ForkEdgeSet::const_iterator getForkEdgeBegin(const CallBlockNode* cs) const
+    inline ForkEdgeSet::const_iterator getForkEdgeBegin(const CallICFGNode* cs) const
     {
         CallInstToForkEdgesMap::const_iterator it = callinstToThreadForkEdgesMap.find(cs);
         assert(it != callinstToThreadForkEdgesMap.end() && "call instruction not found");
         return it->second.begin();
     }
-    inline ForkEdgeSet::const_iterator getForkEdgeEnd(const CallBlockNode* cs) const
+    inline ForkEdgeSet::const_iterator getForkEdgeEnd(const CallICFGNode* cs) const
     {
         CallInstToForkEdgesMap::const_iterator it = callinstToThreadForkEdgesMap.find(cs);
         assert(it != callinstToThreadForkEdgesMap.end() && "call instruction not found");
@@ -219,17 +219,17 @@ public:
     /// Get call graph edge via call instruction
     //@{
     /// whether this call instruction has a valid call graph edge
-    inline bool hasThreadJoinEdge(const CallBlockNode* cs) const
+    inline bool hasThreadJoinEdge(const CallICFGNode* cs) const
     {
         return callinstToThreadJoinEdgesMap.find(cs) != callinstToThreadJoinEdgesMap.end();
     }
-    inline JoinEdgeSet::const_iterator getJoinEdgeBegin(const CallBlockNode* cs) const
+    inline JoinEdgeSet::const_iterator getJoinEdgeBegin(const CallICFGNode* cs) const
     {
         CallInstToJoinEdgesMap::const_iterator it = callinstToThreadJoinEdgesMap.find(cs);
         assert(it != callinstToThreadJoinEdgesMap.end() && "call instruction does not have a valid callee");
         return it->second.begin();
     }
-    inline JoinEdgeSet::const_iterator getJoinEdgeEnd(const CallBlockNode* cs) const
+    inline JoinEdgeSet::const_iterator getJoinEdgeEnd(const CallICFGNode* cs) const
     {
         CallInstToJoinEdgesMap::const_iterator it = callinstToThreadJoinEdgesMap.find(cs);
         assert(it != callinstToThreadJoinEdgesMap.end() && "call instruction does not have a valid callee");
@@ -252,15 +252,15 @@ public:
 
     /// Whether a callsite is a fork or join or hare_parallel_for
     ///@{
-    inline bool isForksite(const CallBlockNode* csInst)
+    inline bool isForksite(const CallICFGNode* csInst)
     {
         return forksites.find(csInst) != forksites.end();
     }
-    inline bool isJoinsite(const CallBlockNode* csInst)
+    inline bool isJoinsite(const CallICFGNode* csInst)
     {
         return joinsites.find(csInst) != joinsites.end();
     }
-    inline bool isParForSite(const CallBlockNode* csInst)
+    inline bool isParForSite(const CallICFGNode* csInst)
     {
         return parForSites.find(csInst) != parForSites.end();
     }
@@ -326,17 +326,17 @@ public:
 
     /// Add fork sites which directly or indirectly create a thread
     //@{
-    inline bool addForksite(const CallBlockNode* cs)
+    inline bool addForksite(const CallICFGNode* cs)
     {
         callinstToThreadForkEdgesMap[cs];
         return forksites.insert(cs).second;
     }
-    inline bool addJoinsite(const CallBlockNode* cs)
+    inline bool addJoinsite(const CallICFGNode* cs)
     {
         callinstToThreadJoinEdgesMap[cs];
         return joinsites.insert(cs).second;
     }
-    inline bool addParForSite(const CallBlockNode* cs)
+    inline bool addParForSite(const CallICFGNode* cs)
     {
         callinstToHareParForEdgesMap[cs];
         return parForSites.insert(cs).second;
@@ -345,24 +345,24 @@ public:
 
     /// Add direct/indirect thread fork edges
     //@{
-    void addDirectForkEdge(const CallBlockNode* cs);
-    void addIndirectForkEdge(const CallBlockNode* cs, const SVFFunction* callee);
+    void addDirectForkEdge(const CallICFGNode* cs);
+    void addIndirectForkEdge(const CallICFGNode* cs, const SVFFunction* callee);
     //@}
 
     /// Add thread join edges
     //@{
-    void addDirectJoinEdge(const CallBlockNode* cs,const CallSiteSet& forksite);
+    void addDirectJoinEdge(const CallICFGNode* cs,const CallSiteSet& forksite);
     //@}
 
     /// Add direct/indirect parallel for edges
     //@{
-    void addDirectParForEdge(const CallBlockNode* cs);
-    void addIndirectParForEdge(const CallBlockNode* cs, const SVFFunction* callee);
+    void addDirectParForEdge(const CallICFGNode* cs);
+    void addIndirectParForEdge(const CallICFGNode* cs, const SVFFunction* callee);
     //@}
 
 
     /// map call instruction to its CallGraphEdge map
-    inline void addThreadForkEdgeSetMap(const CallBlockNode* cs, ThreadForkEdge* edge)
+    inline void addThreadForkEdgeSetMap(const CallICFGNode* cs, ThreadForkEdge* edge)
     {
         if(edge!=nullptr)
         {
@@ -372,7 +372,7 @@ public:
     }
 
     /// map call instruction to its CallGraphEdge map
-    inline void addThreadJoinEdgeSetMap(const CallBlockNode* cs, ThreadJoinEdge* edge)
+    inline void addThreadJoinEdgeSetMap(const CallICFGNode* cs, ThreadJoinEdge* edge)
     {
         if(edge!=nullptr)
         {
@@ -382,7 +382,7 @@ public:
     }
 
     /// map call instruction to its CallGraphEdge map
-    inline void addHareParForEdgeSetMap(const CallBlockNode* cs, HareParForEdge* edge)
+    inline void addHareParForEdgeSetMap(const CallICFGNode* cs, HareParForEdge* edge)
     {
         if(edge!=nullptr)
         {
@@ -392,7 +392,7 @@ public:
     }
 
     /// has thread join edge
-    inline ThreadJoinEdge* hasThreadJoinEdge(const CallBlockNode* call, PTACallGraphNode* joinFunNode, PTACallGraphNode* threadRoutineFunNode, CallSiteID csId) const
+    inline ThreadJoinEdge* hasThreadJoinEdge(const CallICFGNode* call, PTACallGraphNode* joinFunNode, PTACallGraphNode* threadRoutineFunNode, CallSiteID csId) const
     {
         ThreadJoinEdge joinEdge(joinFunNode,threadRoutineFunNode, csId);
         CallInstToJoinEdgesMap::const_iterator it = callinstToThreadJoinEdgesMap.find(call);

package/include/Graphs/VFG.h

@@ -41,7 +41,7 @@ namespace SVF
 
 class PointerAnalysis;
 class VFGStat;
-class CallBlockNode;
+class CallICFGNode;
 
 /*!
  * Interprocedural Control-Flow Graph (VFG)
@@ -60,7 +60,7 @@ public:
     typedef Map<NodeID, VFGNode *> VFGNodeIDToNodeMapTy;
     typedef Set<VFGNode*> VFGNodeSet;
     typedef Map<const PAGNode*, NodeID> PAGNodeToDefMapTy;
-    typedef Map<std::pair<NodeID,const CallBlockNode*>, ActualParmVFGNode *> PAGNodeToActualParmMapTy;
+    typedef Map<std::pair<NodeID,const CallICFGNode*>, ActualParmVFGNode *> PAGNodeToActualParmMapTy;
     typedef Map<const PAGNode*, ActualRetVFGNode *> PAGNodeToActualRetMapTy;
     typedef Map<const PAGNode*, FormalParmVFGNode *> PAGNodeToFormalParmMapTy;
     typedef Map<const PAGNode*, FormalRetVFGNode *> PAGNodeToFormalRetMapTy;
@@ -171,15 +171,15 @@ public:
     void updateCallGraph(PointerAnalysis* pta);
 
     /// Connect VFG nodes between caller and callee for indirect call site
-    virtual void connectCallerAndCallee(const CallBlockNode* cs, const SVFFunction* callee, VFGEdgeSetTy& edges);
+    virtual void connectCallerAndCallee(const CallICFGNode* cs, const SVFFunction* callee, VFGEdgeSetTy& edges);
 
     /// Get callsite given a callsiteID
     //@{
-    inline CallSiteID getCallSiteID(const CallBlockNode* cs, const SVFFunction* func) const
+    inline CallSiteID getCallSiteID(const CallICFGNode* cs, const SVFFunction* func) const
     {
         return callgraph->getCallSiteID(cs, func);
     }
-    inline const CallBlockNode* getCallSite(CallSiteID id) const
+    inline const CallICFGNode* getCallSite(CallSiteID id) const
     {
         return callgraph->getCallSite(id);
     }
@@ -232,7 +232,7 @@ public:
         assert(it != PAGNodeToCmpVFGNodeMap.end() && "CmpVFGNode can not be found??");
         return it->second;
     }
-    inline ActualParmVFGNode* getActualParmVFGNode(const PAGNode* aparm,const CallBlockNode* cs) const
+    inline ActualParmVFGNode* getActualParmVFGNode(const PAGNode* aparm,const CallICFGNode* cs) const
     {
         PAGNodeToActualParmMapTy::const_iterator it = PAGNodeToActualParmMap.find(std::make_pair(aparm->getId(),cs));
         assert(it!=PAGNodeToActualParmMap.end() && "actual parameter VFG node can not be found??");
@@ -377,7 +377,7 @@ protected:
     /// Connect VFG nodes between caller and callee for indirect call site
     //@{
     /// Connect actual-param and formal param
-    virtual inline void connectAParamAndFParam(const PAGNode* csArg, const PAGNode* funArg, const CallBlockNode* cbn, CallSiteID csId, VFGEdgeSetTy& edges)
+    virtual inline void connectAParamAndFParam(const PAGNode* csArg, const PAGNode* funArg, const CallICFGNode* cbn, CallSiteID csId, VFGEdgeSetTy& edges)
     {
         NodeID actualParam = getActualParmVFGNode(csArg, cbn)->getId();
         NodeID formalParam = getFormalParmVFGNode(funArg)->getId();
@@ -447,7 +447,7 @@ protected:
     void connectDirectVFGEdges();
 
     /// Create edges between VFG nodes across functions
-    void addVFGInterEdges(const CallBlockNode* cs, const SVFFunction* callee);
+    void addVFGInterEdges(const CallICFGNode* cs, const SVFFunction* callee);
 
     inline bool isPhiCopyEdge(const PAGEdge* copy) const
     {
@@ -521,7 +521,7 @@ protected:
     /// Add an actual parameter VFG node
     /// To be noted that multiple actual parameters may have same value (PAGNode)
     /// So we need to make a pair <PAGNodeID,CallSiteID> to find the right VFGParmNode
-    inline void addActualParmVFGNode(const PAGNode* aparm, const CallBlockNode* cs)
+    inline void addActualParmVFGNode(const PAGNode* aparm, const CallICFGNode* cs)
     {
         ActualParmVFGNode* sNode = new ActualParmVFGNode(totalVFGNode++,aparm,cs);
         addVFGNode(sNode, pag->getICFG()->getCallBlockNode(cs->getCallSite()));
@@ -561,7 +561,7 @@ protected:
 		}
     }
     /// Add a callsite Receive VFG node
-    inline void addActualRetVFGNode(const PAGNode* ret,const CallBlockNode* cs)
+    inline void addActualRetVFGNode(const PAGNode* ret,const CallICFGNode* cs)
     {
         ActualRetVFGNode* sNode = new ActualRetVFGNode(totalVFGNode++,ret,cs);
         addVFGNode(sNode, pag->getICFG()->getRetBlockNode(cs->getCallSite()));

package/include/Graphs/VFGNode.h

@@ -831,16 +831,16 @@ public:
 class ActualParmVFGNode : public ArgumentVFGNode
 {
 private:
-    const CallBlockNode* cs;
+    const CallICFGNode* cs;
 public:
     /// Constructor
-    ActualParmVFGNode(NodeID id, const PAGNode* n, const CallBlockNode* c) :
+    ActualParmVFGNode(NodeID id, const PAGNode* n, const CallICFGNode* c) :
         ArgumentVFGNode(id, n, AParm), cs(c)
     {
     }
 
     /// Return callsite
-    inline const CallBlockNode* getCallSite() const
+    inline const CallICFGNode* getCallSite() const
     {
         return cs;
     }
@@ -948,7 +948,7 @@ public:
 class ActualRetVFGNode: public ArgumentVFGNode
 {
 private:
-    const CallBlockNode* cs;
+    const CallICFGNode* cs;
 
     ActualRetVFGNode();                      ///< place holder
     ActualRetVFGNode(const ActualRetVFGNode &);  ///< place holder
@@ -956,12 +956,12 @@ private:
 
 public:
     /// Constructor
-    ActualRetVFGNode(NodeID id, const PAGNode* n, const CallBlockNode* c) :
+    ActualRetVFGNode(NodeID id, const PAGNode* n, const CallICFGNode* c) :
         ArgumentVFGNode(id, n, ARet), cs(c)
     {
     }
     /// Return callsite
-    inline const CallBlockNode* getCallSite() const
+    inline const CallICFGNode* getCallSite() const
     {
         return cs;
     }
@@ -1090,7 +1090,7 @@ public:
         return fun;
     }
 
-    inline const CallBlockNode* getCallSite() const
+    inline const CallICFGNode* getCallSite() const
     {
         assert(isActualRetPHI() && "expect a actual return phi");
         return callInst;
@@ -1120,7 +1120,7 @@ public:
 
 private:
     const SVFFunction* fun;
-    const CallBlockNode* callInst;
+    const CallICFGNode* callInst;
 };
 
 

package/include/MSSA/MSSAMuChi.h

@@ -222,12 +222,12 @@ class CallMU : public MSSAMU<Cond>
 {
 
 private:
-    const CallBlockNode* callsite;
+    const CallICFGNode* callsite;
 
 public:
     /// Constructor/Destructor for MU
     //@{
-    CallMU(const CallBlockNode* cs, const MemRegion* m, Cond c = true) :
+    CallMU(const CallICFGNode* cs, const MemRegion* m, Cond c = true) :
         MSSAMU<Cond>(MSSAMU<Cond>::CallMSSAMU,m,c), callsite(cs)
     {
     }
@@ -238,7 +238,7 @@ public:
     //@}
 
     /// Return callsite
-    inline const CallBlockNode* getCallSite() const
+    inline const CallICFGNode* getCallSite() const
     {
         return callsite;
     }
@@ -521,11 +521,11 @@ template<class Cond>
 class CallCHI : public MSSACHI<Cond>
 {
 private:
-    const CallBlockNode* callsite;
+    const CallICFGNode* callsite;
 public:
     /// Constructors for StoreCHI
     //@{
-    CallCHI(const CallBlockNode* cs, const MemRegion* m, Cond c = true) :
+    CallCHI(const CallICFGNode* cs, const MemRegion* m, Cond c = true) :
         MSSACHI<Cond>(MSSADEF::CallMSSACHI,m,c), callsite(cs)
     {
     }
@@ -541,7 +541,7 @@ public:
     }
 
     /// Return callsite
-    inline const CallBlockNode* getCallSite() const
+    inline const CallICFGNode* getCallSite() const
     {
         return callsite;
     }

package/include/MSSA/MemRegion.h

@@ -148,14 +148,14 @@ public:
     //@{
     typedef Map<const LoadStmt*, MRSet> LoadsToMRsMap;
     typedef Map<const StoreStmt*, MRSet> StoresToMRsMap;
-    typedef Map<const CallBlockNode*, MRSet> CallSiteToMRsMap;
+    typedef Map<const CallICFGNode*, MRSet> CallSiteToMRsMap;
     //@}
 
     /// Map loads/stores/callsites to their cpts set
     //@{
     typedef Map<const LoadStmt*, NodeBS> LoadsToPointsToMap;
     typedef Map<const StoreStmt*, NodeBS> StoresToPointsToMap;
-    typedef Map<const CallBlockNode*, NodeBS> CallSiteToPointsToMap;
+    typedef Map<const CallICFGNode*, NodeBS> CallSiteToPointsToMap;
     //@}
 
     /// Maps Mod-Ref analysis
@@ -163,7 +163,7 @@ public:
     /// Map a function to its indirect refs/mods of memory objects
     typedef Map<const SVFFunction*, NodeBS> FunToNodeBSMap;
     /// Map a callsite to its indirect refs/mods of memory objects
-    typedef Map<const CallBlockNode*, NodeBS> CallSiteToNodeBSMap;
+    typedef Map<const CallICFGNode*, NodeBS> CallSiteToNodeBSMap;
     //@}
 
     typedef Map<NodeID, NodeBS> NodeToPTSSMap;
@@ -242,18 +242,18 @@ private:
     void destroy();
 
     //Get all objects might pass into callee from a callsite
-    void collectCallSitePts(const CallBlockNode* cs);
+    void collectCallSitePts(const CallICFGNode* cs);
 
     //Recursive collect points-to chain
     NodeBS& CollectPtsChain(NodeID id);
 
     /// Return the pts chain of all callsite arguments
-    inline NodeBS& getCallSiteArgsPts(const CallBlockNode* cs)
+    inline NodeBS& getCallSiteArgsPts(const CallICFGNode* cs)
     {
         return csToCallSiteArgsPtsMap[cs];
     }
     /// Return the pts chain of the return parameter of the callsite
-    inline NodeBS& getCallSiteRetPts(const CallBlockNode* cs)
+    inline NodeBS& getCallSiteRetPts(const CallICFGNode* cs)
     {
         return csToCallSiteRetPtsMap[cs];
     }
@@ -329,7 +329,7 @@ protected:
     virtual void modRefAnalysis(PTACallGraphNode* callGraphNode, WorkList& worklist);
 
     /// Get Mod-Ref of a callee function
-    virtual bool handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallBlockNode* cs, const SVFFunction* fun);
+    virtual bool handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallICFGNode* cs, const SVFFunction* fun);
 
 
     /// Add cpts to store/load
@@ -346,12 +346,12 @@ protected:
         funToPointsToMap[fun].insert(cpts);
         addRefSideEffectOfFunction(fun,cpts);
     }
-    inline void addCPtsToCallSiteRefs(NodeBS& cpts, const CallBlockNode* cs)
+    inline void addCPtsToCallSiteRefs(NodeBS& cpts, const CallICFGNode* cs)
     {
         callsiteToRefPointsToMap[cs] |= cpts;
         funToPointsToMap[cs->getCaller()].insert(cpts);
     }
-    inline void addCPtsToCallSiteMods(NodeBS& cpts, const CallBlockNode* cs)
+    inline void addCPtsToCallSiteMods(NodeBS& cpts, const CallICFGNode* cs)
     {
         callsiteToModPointsToMap[cs] |= cpts;
         funToPointsToMap[cs->getCaller()].insert(cpts);
@@ -376,9 +376,9 @@ protected:
     /// Add indirect def an memory object in the function
     void addModSideEffectOfFunction(const SVFFunction* fun, const NodeBS& mods);
     /// Add indirect uses an memory object in the function
-    bool addRefSideEffectOfCallSite(const CallBlockNode* cs, const NodeBS& refs);
+    bool addRefSideEffectOfCallSite(const CallICFGNode* cs, const NodeBS& refs);
     /// Add indirect def an memory object in the function
-    bool addModSideEffectOfCallSite(const CallBlockNode* cs, const NodeBS& mods);
+    bool addModSideEffectOfCallSite(const CallICFGNode* cs, const NodeBS& mods);
 
     /// Get indirect refs of a function
     inline const NodeBS& getRefSideEffectOfFunction(const SVFFunction* fun)
@@ -391,22 +391,22 @@ protected:
         return funToModsMap[fun];
     }
     /// Get indirect refs of a callsite
-    inline const NodeBS& getRefSideEffectOfCallSite(const CallBlockNode* cs)
+    inline const NodeBS& getRefSideEffectOfCallSite(const CallICFGNode* cs)
     {
         return csToRefsMap[cs];
     }
     /// Get indirect mods of a callsite
-    inline const NodeBS& getModSideEffectOfCallSite(const CallBlockNode* cs)
+    inline const NodeBS& getModSideEffectOfCallSite(const CallICFGNode* cs)
     {
         return csToModsMap[cs];
     }
     /// Has indirect refs of a callsite
-    inline bool hasRefSideEffectOfCallSite(const CallBlockNode* cs)
+    inline bool hasRefSideEffectOfCallSite(const CallICFGNode* cs)
     {
         return csToRefsMap.find(cs) != csToRefsMap.end();
     }
     /// Has indirect mods of a callsite
-    inline bool hasModSideEffectOfCallSite(const CallBlockNode* cs)
+    inline bool hasModSideEffectOfCallSite(const CallICFGNode* cs)
     {
         return csToModsMap.find(cs) != csToModsMap.end();
     }
@@ -448,19 +448,19 @@ public:
     {
         return storesToMRsMap[store];
     }
-    inline bool hasRefMRSet(const CallBlockNode* cs)
+    inline bool hasRefMRSet(const CallICFGNode* cs)
     {
         return callsiteToRefMRsMap.find(cs)!=callsiteToRefMRsMap.end();
     }
-    inline bool hasModMRSet(const CallBlockNode* cs)
+    inline bool hasModMRSet(const CallICFGNode* cs)
     {
         return callsiteToModMRsMap.find(cs)!=callsiteToModMRsMap.end();
     }
-    inline MRSet& getCallSiteRefMRSet(const CallBlockNode* cs)
+    inline MRSet& getCallSiteRefMRSet(const CallICFGNode* cs)
     {
         return callsiteToRefMRsMap[cs];
     }
-    inline MRSet& getCallSiteModMRSet(const CallBlockNode* cs)
+    inline MRSet& getCallSiteModMRSet(const CallICFGNode* cs)
     {
         return callsiteToModMRsMap[cs];
     }
@@ -473,11 +473,11 @@ public:
     /// getModRefInfo APIs
     //@{
     /// Collect mod ref for external callsite other than heap alloc external call
-    NodeBS getModInfoForCall(const CallBlockNode* cs);
-    NodeBS getRefInfoForCall(const CallBlockNode* cs);
-    ModRefInfo getModRefInfo(const CallBlockNode* cs);
-    ModRefInfo getModRefInfo(const CallBlockNode* cs, const Value* V);
-    ModRefInfo getModRefInfo(const CallBlockNode* cs1, const CallBlockNode* cs2);
+    NodeBS getModInfoForCall(const CallICFGNode* cs);
+    NodeBS getRefInfoForCall(const CallICFGNode* cs);
+    ModRefInfo getModRefInfo(const CallICFGNode* cs);
+    ModRefInfo getModRefInfo(const CallICFGNode* cs, const Value* V);
+    ModRefInfo getModRefInfo(const CallICFGNode* cs1, const CallICFGNode* cs2);
     //@}
 
 };

package/include/MSSA/MemSSA.h

@@ -73,8 +73,8 @@ public:
     //@{
     typedef Map<const LoadStmt*, MUSet> LoadToMUSetMap;
     typedef Map<const StoreStmt*, CHISet> StoreToChiSetMap;
-    typedef Map<const CallBlockNode*, MUSet> CallSiteToMUSetMap;
-    typedef Map<const CallBlockNode*, CHISet> CallSiteToCHISetMap;
+    typedef Map<const CallICFGNode*, MUSet> CallSiteToMUSetMap;
+    typedef Map<const CallICFGNode*, CHISet> CallSiteToCHISetMap;
     typedef Map<const BasicBlock*, PHISet> BBToPhiSetMap;
     //@}
 
@@ -190,12 +190,12 @@ private:
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
             AddStoreCHI(bb,store,*iter);
     }
-    inline void AddCallSiteMU(const CallBlockNode* cs,  const MRSet& mrSet)
+    inline void AddCallSiteMU(const CallICFGNode* cs,  const MRSet& mrSet)
     {
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
             AddCallSiteMU(cs,*iter);
     }
-    inline void AddCallSiteCHI(const CallBlockNode* cs,  const MRSet& mrSet)
+    inline void AddCallSiteCHI(const CallICFGNode* cs,  const MRSet& mrSet)
     {
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
             AddCallSiteCHI(cs,*iter);
@@ -218,13 +218,13 @@ private:
         collectRegUses(mr);
         collectRegDefs(bb,mr);
     }
-    inline void AddCallSiteMU(const CallBlockNode* cs, const MemRegion* mr)
+    inline void AddCallSiteMU(const CallICFGNode* cs, const MemRegion* mr)
     {
         CALLMU* mu = new CALLMU(cs, mr);
         callsiteToMuSetMap[cs].insert(mu);
         collectRegUses(mr);
     }
-    inline void AddCallSiteCHI(const CallBlockNode* cs, const MemRegion* mr)
+    inline void AddCallSiteCHI(const CallICFGNode* cs, const MemRegion* mr)
     {
         CALLCHI* chi = new CALLCHI(cs, mr);
         callsiteToChiSetMap[cs].insert(chi);
@@ -352,11 +352,11 @@ public:
         else
             return false;
     }
-    inline bool hasMU(const CallBlockNode* cs) const
+    inline bool hasMU(const CallICFGNode* cs) const
     {
         return callsiteToMuSetMap.find(cs)!=callsiteToMuSetMap.end();
     }
-    inline bool hasCHI(const CallBlockNode* cs) const
+    inline bool hasCHI(const CallICFGNode* cs) const
     {
         return callsiteToChiSetMap.find(cs)!=callsiteToChiSetMap.end();
     }
@@ -393,11 +393,11 @@ public:
     {
         return store2ChiSetMap[st];
     }
-    inline MUSet& getMUSet(const CallBlockNode* cs)
+    inline MUSet& getMUSet(const CallICFGNode* cs)
     {
         return callsiteToMuSetMap[cs];
     }
-    inline CHISet& getCHISet(const CallBlockNode* cs)
+    inline CHISet& getCHISet(const CallICFGNode* cs)
     {
         return callsiteToChiSetMap[cs];
     }

package/include/MTA/LockResultValidator.h

@@ -33,8 +33,8 @@ public:
 		return _mod;
 	}
 private:
-	// Get CallBlockNode
-	inline CallBlockNode* getCBN(const Instruction* inst) {
+	// Get CallICFGNode
+	inline CallICFGNode* getCBN(const Instruction* inst) {
 		return _la->getTCT()->getCallBlockNode(inst);
 	}
 	const Instruction *getPreviousMemoryAccessInst( const Instruction *I) {

package/include/MTA/MHP.h

@@ -61,8 +61,8 @@ public:
         return tct;
     }
 	
-	// Get CallBlockNode
-	inline CallBlockNode* getCBN(const Instruction* inst) {
+	// Get CallICFGNode
+	inline CallICFGNode* getCBN(const Instruction* inst) {
 		return tct->getCallBlockNode(inst);
 	}
 
@@ -379,8 +379,8 @@ private:
     {
         return tct->getPTA()->alias(getForkedThread(forkSite), getJoinedThread(joinSite)) && isSameSCEV(forkSite,joinSite);
     }
-    // Get CallBlockNode
-	inline CallBlockNode* getCBN(const Instruction* inst) {
+    // Get CallICFGNode
+	inline CallICFGNode* getCBN(const Instruction* inst) {
 		return tct->getCallBlockNode(inst);
 	}
     /// Mark thread flags for cxtStmt

package/include/MTA/PCG.h

@@ -123,7 +123,7 @@ public:
     {
     }
 	
-	CallBlockNode* getCallBlockNode(const Instruction* inst) {
+	CallICFGNode* getCallBlockNode(const Instruction* inst) {
 		return pta->getICFG()->getCallBlockNode(inst);
 	}
 	const SVFFunction* getSVFFun(const Function* fun) const {

package/include/MTA/TCT.h

@@ -147,8 +147,8 @@ public:
     {
         destroy();
     }
-    /// Get CallBlockNode given inst
-    CallBlockNode* getCallBlockNode(const Instruction* inst) {
+    /// Get CallICFGNode given inst
+    CallICFGNode* getCallBlockNode(const Instruction* inst) {
 		return pta->getICFG()->getCallBlockNode(inst);
 	}
 	/// Get SVFFuntion given Function