svf-lib 1.0.2210 → 1.0.2212

package/SVF-linux/Release-build/include/Graphs/SVFG.h

@@ -82,8 +82,8 @@ public:
     typedef NodeBS FormalOUTSVFGNodeSet;
     typedef Map<const CallICFGNode*, ActualINSVFGNodeSet>  CallSiteToActualINsMapTy;
     typedef Map<const CallICFGNode*, ActualOUTSVFGNodeSet>  CallSiteToActualOUTsMapTy;
-    typedef Map<const SVFFunction*, FormalINSVFGNodeSet>  FunctionToFormalINsMapTy;
-    typedef Map<const SVFFunction*, FormalOUTSVFGNodeSet>  FunctionToFormalOUTsMapTy;
+    typedef Map<const FunObjVar*, FormalINSVFGNodeSet>  FunctionToFormalINsMapTy;
+    typedef Map<const FunObjVar*, FormalOUTSVFGNodeSet>  FunctionToFormalOUTsMapTy;
     typedef MemSSA::MUSet MUSet;
     typedef MemSSA::CHISet CHISet;
     typedef MemSSA::PHISet PHISet;
@@ -159,13 +159,13 @@ public:
     }
 
     /// Get all inter value flow edges of a indirect call site
-    void getInterVFEdgesForIndirectCallSite(const CallICFGNode* cs, const SVFFunction* callee, SVFGEdgeSetTy& edges);
+    void getInterVFEdgesForIndirectCallSite(const CallICFGNode* cs, const FunObjVar* callee, SVFGEdgeSetTy& edges);
 
     /// Dump graph into dot file
     void dump(const std::string& file, bool simple = false);
 
     /// Connect SVFG nodes between caller and callee for indirect call site
-    virtual void connectCallerAndCallee(const CallICFGNode* cs, const SVFFunction* callee, SVFGEdgeSetTy& edges);
+    virtual void connectCallerAndCallee(const CallICFGNode* cs, const FunObjVar* callee, SVFGEdgeSetTy& edges);
 
     /// Given a pagNode, return its definition site
     inline const SVFGNode* getDefSVFGNode(const PAGNode* pagNode) const
@@ -194,12 +194,12 @@ public:
         return callSiteToActualOUTMap.find(cs)!=callSiteToActualOUTMap.end();
     }
 
-    inline bool hasFormalINSVFGNodes(const SVFFunction* fun) const
+    inline bool hasFormalINSVFGNodes(const FunObjVar* fun) const
     {
         return funToFormalINMap.find(fun)!=funToFormalINMap.end();
     }
 
-    inline bool hasFormalOUTSVFGNodes(const SVFFunction* fun) const
+    inline bool hasFormalOUTSVFGNodes(const FunObjVar* fun) const
     {
         return funToFormalOUTMap.find(fun)!=funToFormalOUTMap.end();
     }
@@ -217,19 +217,19 @@ public:
         return callSiteToActualOUTMap[cs];
     }
 
-    inline FormalINSVFGNodeSet& getFormalINSVFGNodes(const SVFFunction* fun)
+    inline FormalINSVFGNodeSet& getFormalINSVFGNodes(const FunObjVar* fun)
     {
         return funToFormalINMap[fun];
     }
 
-    inline FormalOUTSVFGNodeSet& getFormalOUTSVFGNodes(const SVFFunction* fun)
+    inline FormalOUTSVFGNodeSet& getFormalOUTSVFGNodes(const FunObjVar* fun)
     {
         return funToFormalOUTMap[fun];
     }
     //@}
 
     /// Whether a node is function entry SVFGNode
-    const SVFFunction* isFunEntrySVFGNode(const SVFGNode* node) const;
+    const FunObjVar* isFunEntrySVFGNode(const SVFGNode* node) const;
 
     /// Whether a node is callsite return SVFGNode
     const CallICFGNode* isCallSiteRetSVFGNode(const SVFGNode* node) const;
@@ -325,7 +325,7 @@ protected:
         edges.insert(edge);
     }
 
-    virtual inline void getInterVFEdgeAtIndCSFromAInToFIn(ActualINSVFGNode* actualIn, const SVFFunction* callee, SVFGEdgeSetTy& edges)
+    virtual inline void getInterVFEdgeAtIndCSFromAInToFIn(ActualINSVFGNode* actualIn, const FunObjVar* callee, SVFGEdgeSetTy& edges)
     {
         for (SVFGNode::const_iterator outIt = actualIn->OutEdgeBegin(), outEit = actualIn->OutEdgeEnd(); outIt != outEit; ++outIt)
         {
@@ -335,7 +335,7 @@ protected:
         }
     }
 
-    virtual inline void getInterVFEdgeAtIndCSFromFOutToAOut(ActualOUTSVFGNode* actualOut, const SVFFunction* callee, SVFGEdgeSetTy& edges)
+    virtual inline void getInterVFEdgeAtIndCSFromFOutToAOut(ActualOUTSVFGNode* actualOut, const FunObjVar* callee, SVFGEdgeSetTy& edges)
     {
         for (SVFGNode::const_iterator inIt = actualOut->InEdgeBegin(), inEit = actualOut->InEdgeEnd(); inIt != inEit; ++inIt)
         {
@@ -446,11 +446,11 @@ protected:
 
     /// Has function for EntryCHI/RetMU/CallCHI/CallMU
     //@{
-    inline bool hasFuncEntryChi(const SVFFunction*  func) const
+    inline bool hasFuncEntryChi(const FunObjVar*  func) const
     {
         return (funToFormalINMap.find(func) != funToFormalINMap.end());
     }
-    inline bool hasFuncRetMu(const SVFFunction*  func) const
+    inline bool hasFuncRetMu(const FunObjVar*  func) const
     {
         return (funToFormalOUTMap.find(func) != funToFormalOUTMap.end());
     }

package/SVF-linux/Release-build/include/Graphs/SVFGNode.h

@@ -408,7 +408,7 @@ public:
         return (fun==nullptr) && (callInst != nullptr);
     }
 
-    inline const SVFFunction* getFun() const
+    inline const FunObjVar* getFun() const
     {
         assert(isFormalINPHI() && "expect a formal parameter phi");
         return fun;
@@ -447,7 +447,7 @@ public:
     virtual const std::string toString() const;
 
 private:
-    const SVFFunction* fun;
+    const FunObjVar* fun;
     const CallICFGNode* callInst;
 };
 

package/SVF-linux/Release-build/include/Graphs/ThreadCallGraph.h

@@ -67,16 +67,7 @@ public:
     }
     //@}
 
-    virtual const std::string toString() const
-    {
-        std::string str;
-        std::stringstream rawstr(str);
-        rawstr << "ThreadForkEdge ";
-        rawstr << "CallSiteID: " << getCallSiteID();
-        rawstr << " srcNodeID " << getSrcID() << " (fun: " << getSrcNode()->getFunction()->getName() << ")";
-        rawstr << " dstNodeID " << getDstID() << " (fun: " << getDstNode()->getFunction()->getName() << ")";
-        return rawstr.str();
-    }
+    virtual const std::string toString() const;
 
     typedef GenericNode<CallGraphNode, ThreadForkEdge>::GEdgeSetTy ForkEdgeSet;
 };
@@ -107,16 +98,7 @@ public:
         return edge->getEdgeKind() == CallGraphEdge::TDJoinEdge;
     }
 
-    virtual const std::string toString() const
-    {
-        std::string str;
-        std::stringstream rawstr(str);
-        rawstr << "ThreadJoinEdge ";
-        rawstr << "CallSiteID: " << getCallSiteID();
-        rawstr << " srcNodeID " << getSrcID() << " (fun: " << getSrcNode()->getFunction()->getName() << ")";
-        rawstr << " dstNodeID " << getDstID() << " (fun: " << getDstNode()->getFunction()->getName() << ")";
-        return rawstr.str();
-    }
+    virtual const std::string toString() const;
 
     typedef GenericNode<CallGraphNode, ThreadJoinEdge>::GEdgeSetTy JoinEdgeSet;
 };
@@ -350,7 +332,7 @@ public:
     /// Add direct/indirect thread fork edges
     //@{
     bool addDirectForkEdge(const CallICFGNode* cs);
-    bool addIndirectForkEdge(const CallICFGNode* cs, const SVFFunction* callee);
+    bool addIndirectForkEdge(const CallICFGNode* cs, const FunObjVar* callee);
     //@}
 
     /// Add thread join edges

package/SVF-linux/Release-build/include/Graphs/VFG.h

@@ -70,7 +70,7 @@ public:
     typedef Map<const PAGNode*, UnaryOPVFGNode*> PAGNodeToUnaryOPVFGNodeMapTy;
     typedef Map<const PAGNode*, BranchVFGNode*> PAGNodeToBranchVFGNodeMapTy;
     typedef Map<const PAGNode*, CmpVFGNode*> PAGNodeToCmpVFGNodeMapTy;
-    typedef Map<const SVFFunction*, VFGNodeSet > FunToVFGNodesMapTy;
+    typedef Map<const FunObjVar*, VFGNodeSet > FunToVFGNodesMapTy;
 
     typedef FormalParmVFGNode::CallPESet CallPESet;
     typedef FormalRetVFGNode::RetPESet RetPESet;
@@ -171,11 +171,11 @@ public:
     void updateCallGraph(PointerAnalysis* pta);
 
     /// Connect VFG nodes between caller and callee for indirect call site
-    virtual void connectCallerAndCallee(const CallICFGNode* cs, const SVFFunction* callee, VFGEdgeSetTy& edges);
+    virtual void connectCallerAndCallee(const CallICFGNode* cs, const FunObjVar* callee, VFGEdgeSetTy& edges);
 
     /// Get callsite given a callsiteID
     //@{
-    inline CallSiteID getCallSiteID(const CallICFGNode* cs, const SVFFunction* func) const
+    inline CallSiteID getCallSiteID(const CallICFGNode* cs, const FunObjVar* func) const
     {
         return callgraph->getCallSiteID(cs, func);
     }
@@ -259,7 +259,7 @@ public:
     //@}
 
     /// Whether a node is function entry VFGNode
-    const SVFFunction* isFunEntryVFGNode(const VFGNode* node) const;
+    const FunObjVar* isFunEntryVFGNode(const VFGNode* node) const;
 
     /// Whether a PAGNode has a blackhole or const object as its definition
     inline bool hasBlackHoleConstObjAddrAsDef(const PAGNode* pagNode) const
@@ -283,25 +283,25 @@ public:
 
     /// Return all the VFGNodes of a function
     ///@{
-    inline VFGNodeSet& getVFGNodes(const SVFFunction *fun)
+    inline VFGNodeSet& getVFGNodes(const FunObjVar *fun)
     {
         return funToVFGNodesMap[fun];
     }
-    inline bool hasVFGNodes(const SVFFunction *fun) const
+    inline bool hasVFGNodes(const FunObjVar *fun) const
     {
         return funToVFGNodesMap.find(fun) != funToVFGNodesMap.end();
     }
-    inline bool VFGNodes(const SVFFunction *fun) const
+    inline bool VFGNodes(const FunObjVar *fun) const
     {
         return funToVFGNodesMap.find(fun) != funToVFGNodesMap.end();
     }
-    inline VFGNodeSet::const_iterator getVFGNodeBegin(const SVFFunction *fun) const
+    inline VFGNodeSet::const_iterator getVFGNodeBegin(const FunObjVar *fun) const
     {
         FunToVFGNodesMapTy::const_iterator it = funToVFGNodesMap.find(fun);
         assert(it != funToVFGNodesMap.end() && "this function does not have any VFGNode");
         return it->second.begin();
     }
-    inline VFGNodeSet::const_iterator getVFGNodeEnd(const SVFFunction *fun) const
+    inline VFGNodeSet::const_iterator getVFGNodeEnd(const FunObjVar *fun) const
     {
         FunToVFGNodesMapTy::const_iterator it = funToVFGNodesMap.find(fun);
         assert(it != funToVFGNodesMap.end() && "this function does not have any VFGNode");
@@ -350,8 +350,8 @@ protected:
     /// sanitize Intra edges, verify that both nodes belong to the same function.
     inline void checkIntraEdgeParents(const VFGNode *srcNode, const VFGNode *dstNode)
     {
-        const SVFFunction *srcfun = srcNode->getFun();
-        const SVFFunction *dstfun = dstNode->getFun();
+        const FunObjVar *srcfun = srcNode->getFun();
+        const FunObjVar *dstfun = dstNode->getFun();
         if(srcfun != nullptr && dstfun != nullptr)
         {
             assert((srcfun == dstfun) && "src and dst nodes of an intra VFG edge are not in the same function?");
@@ -453,7 +453,7 @@ protected:
     void connectDirectVFGEdges();
 
     /// Create edges between VFG nodes across functions
-    void addVFGInterEdges(const CallICFGNode* cs, const SVFFunction* callee);
+    void addVFGInterEdges(const CallICFGNode* cs, const FunObjVar* callee);
 
     inline bool isPhiCopyEdge(const PAGEdge* copy) const
     {
@@ -467,7 +467,7 @@ protected:
         vfgNode->setICFGNode(icfgNode);
         icfgNode->addVFGNode(vfgNode);
 
-        if(const SVFFunction* fun = icfgNode->getFun())
+        if(const FunObjVar* fun = icfgNode->getFun())
             funToVFGNodesMap[fun].insert(vfgNode);
         else
             globalVFGNodes.insert(vfgNode);
@@ -535,7 +535,7 @@ protected:
         /// do not set def here, this node is not a variable definition
     }
     /// Add a formal parameter VFG node
-    inline void addFormalParmVFGNode(const PAGNode* fparm, const SVFFunction* fun, CallPESet& callPEs)
+    inline void addFormalParmVFGNode(const PAGNode* fparm, const FunObjVar* fun, CallPESet& callPEs)
     {
         FormalParmVFGNode* sNode = new FormalParmVFGNode(totalVFGNode++,fparm,fun);
         addVFGNode(sNode, pag->getICFG()->getFunEntryICFGNode(fun));
@@ -549,7 +549,7 @@ protected:
     /// Add a callee Return VFG node
     /// To be noted that here we assume returns of a procedure have already been unified into one
     /// Otherwise, we need to handle formalRet using <PAGNodeID,CallSiteID> pair to find FormalRetVFG node same as handling actual parameters
-    inline void addFormalRetVFGNode(const PAGNode* uniqueFunRet, const SVFFunction* fun, RetPESet& retPEs)
+    inline void addFormalRetVFGNode(const PAGNode* uniqueFunRet, const FunObjVar* fun, RetPESet& retPEs)
     {
         FormalRetVFGNode *sNode = new FormalRetVFGNode(totalVFGNode++, uniqueFunRet, fun);
         addVFGNode(sNode, pag->getICFG()->getFunExitICFGNode(fun));

package/SVF-linux/Release-build/include/Graphs/VFGNode.h

@@ -76,7 +76,7 @@ public:
     }
 
     /// Get the function of this SVFGNode
-    virtual const SVFFunction* getFun() const
+    virtual const FunObjVar* getFun() const
     {
         return icfgNode->getFun();
     }
@@ -947,12 +947,12 @@ public:
 class FormalParmVFGNode : public ArgumentVFGNode
 {
 private:
-    const SVFFunction* fun;
+    const FunObjVar* fun;
     CallPESet callPEs;
 
 public:
     /// Constructor
-    FormalParmVFGNode(NodeID id, const PAGNode* n, const SVFFunction* f):
+    FormalParmVFGNode(NodeID id, const PAGNode* n, const FunObjVar* f):
         ArgumentVFGNode(id, n, FParm),  fun(f)
     {
     }
@@ -964,7 +964,7 @@ public:
     }
 
     /// Return function
-    inline const SVFFunction* getFun() const override
+    inline const FunObjVar* getFun() const override
     {
         return fun;
     }
@@ -1038,7 +1038,7 @@ public:
         return cs;
     }
     /// Receive parameter at callsite
-    inline const SVFFunction* getCaller() const
+    inline const FunObjVar* getCaller() const
     {
         return cs->getCaller();
     }
@@ -1082,7 +1082,7 @@ public:
 class FormalRetVFGNode: public ArgumentVFGNode
 {
 private:
-    const SVFFunction* fun;
+    const FunObjVar* fun;
     RetPESet retPEs;
 
     FormalRetVFGNode();                      ///< place holder
@@ -1091,7 +1091,7 @@ private:
 
 public:
     /// Constructor
-    FormalRetVFGNode(NodeID id, const PAGNode* n, const SVFFunction* f);
+    FormalRetVFGNode(NodeID id, const PAGNode* n, const FunObjVar* f);
 
     /// Return value at callee
     inline const PAGNode* getRet() const
@@ -1099,7 +1099,7 @@ public:
         return param;
     }
     /// Function
-    inline const SVFFunction* getFun() const override
+    inline const FunObjVar* getFun() const override
     {
         return fun;
     }
@@ -1168,7 +1168,7 @@ public:
         return (fun!=nullptr) && (callInst != nullptr);
     }
 
-    inline const SVFFunction* getFun() const override
+    inline const FunObjVar* getFun() const override
     {
         assert((isFormalParmPHI() || isActualRetPHI())  && "expect a formal parameter phi");
         return fun;
@@ -1207,7 +1207,7 @@ public:
     const std::string toString() const override;
 
 private:
-    const SVFFunction* fun;
+    const FunObjVar* fun;
     const CallICFGNode* callInst;
 };
 

package/SVF-linux/Release-build/include/MSSA/MSSAMuChi.h

@@ -277,11 +277,11 @@ template<class Cond>
 class RetMU : public MSSAMU<Cond>
 {
 private:
-    const SVFFunction* fun;
+    const FunObjVar* fun;
 public:
     /// Constructor/Destructor for MU
     //@{
-    RetMU(const SVFFunction* f, const MemRegion* m, Cond c = true) :
+    RetMU(const FunObjVar* f, const MemRegion* m, Cond c = true) :
         MSSAMU<Cond>(MSSAMU<Cond>::RetMSSAMU,m,c), fun(f)
     {
     }
@@ -289,7 +289,7 @@ public:
     //@}
 
     /// Return function
-    inline const SVFFunction* getFunction() const
+    inline const FunObjVar* getFunction() const
     {
         return fun;
     }
@@ -578,11 +578,11 @@ template<class Cond>
 class EntryCHI : public MSSACHI<Cond>
 {
 private:
-    const SVFFunction* fun;
+    const FunObjVar* fun;
 public:
     /// Constructors for EntryCHI
     //@{
-    EntryCHI(const SVFFunction* f, const MemRegion* m, Cond c = true) :
+    EntryCHI(const FunObjVar* f, const MemRegion* m, Cond c = true) :
         MSSACHI<Cond>(MSSADEF::EntryMSSACHI,m,c),fun(f)
     {
     }
@@ -592,7 +592,7 @@ public:
     //@}
 
     /// Return function
-    inline const SVFFunction* getFunction() const
+    inline const FunObjVar* getFunction() const
     {
         return fun;
     }

package/SVF-linux/Release-build/include/MSSA/MemPartition.h

@@ -57,13 +57,13 @@ protected:
     virtual void partitionMRs();
 
     /// Get memory region at a load
-    virtual void getMRsForLoad(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction* fun);
+    virtual void getMRsForLoad(MRSet& aliasMRs, const NodeBS& cpts, const FunObjVar* fun);
 
     /// Get memory regions to be inserted at a load statement.
-    virtual void getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction* fun);
+    virtual void getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const FunObjVar* fun);
 private:
     /// Create memory regions for each points-to target.
-    void createDistinctMR(const SVFFunction* func, const NodeBS& cpts);
+    void createDistinctMR(const FunObjVar* func, const NodeBS& cpts);
 
 };
 
@@ -74,8 +74,8 @@ class IntraDisjointMRG : public MRGenerator
 {
 public:
     typedef OrderedMap<NodeBS, PointsToList> PtsToSubPtsMap;
-    typedef Map<const SVFFunction*, PtsToSubPtsMap> FunToPtsMap;
-    typedef Map<const SVFFunction*, PointsToList> FunToInterMap;
+    typedef Map<const FunObjVar*, PtsToSubPtsMap> FunToPtsMap;
+    typedef Map<const FunObjVar*, PointsToList> FunToInterMap;
 
     IntraDisjointMRG(BVDataPTAImpl* p, bool ptrOnly) : MRGenerator(p, ptrOnly)
     {}
@@ -94,7 +94,7 @@ protected:
      * @param mrs Memory region set contains all possible target memory regions.
      */
     virtual inline void getMRsForLoad(MRSet& aliasMRs, const NodeBS& cpts,
-                                      const SVFFunction* fun)
+                                      const FunObjVar* fun)
     {
         const PointsToList& inters = getIntersList(fun);
         getMRsForLoadFromInterList(aliasMRs, cpts, inters);
@@ -103,26 +103,26 @@ protected:
     void getMRsForLoadFromInterList(MRSet& mrs, const NodeBS& cpts, const PointsToList& inters);
 
     /// Get memory regions to be inserted at a load statement.
-    virtual void getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction* fun);
+    virtual void getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const FunObjVar* fun);
 
     /// Create disjoint memory region
-    void createDisjointMR(const SVFFunction* func, const NodeBS& cpts);
+    void createDisjointMR(const FunObjVar* func, const NodeBS& cpts);
 
     /// Compute intersections between cpts and computed cpts intersections before.
     void computeIntersections(const NodeBS& cpts, PointsToList& inters);
 
 private:
-    inline PtsToSubPtsMap& getPtsSubSetMap(const SVFFunction* func)
+    inline PtsToSubPtsMap& getPtsSubSetMap(const FunObjVar* func)
     {
         return funcToPtsMap[func];
     }
 
-    inline PointsToList& getIntersList(const SVFFunction* func)
+    inline PointsToList& getIntersList(const FunObjVar* func)
     {
         return funcToInterMap[func];
     }
 
-    inline const PtsToSubPtsMap& getPtsSubSetMap(const SVFFunction* func) const
+    inline const PtsToSubPtsMap& getPtsSubSetMap(const FunObjVar* func) const
     {
         FunToPtsMap::const_iterator it = funcToPtsMap.find(func);
         assert(it != funcToPtsMap.end() && "can not find pts map for specified function");
@@ -155,7 +155,7 @@ protected:
      * @param mrs Memory region set contains all possible target memory regions.
      */
     virtual inline void getMRsForLoad(MRSet& aliasMRs, const NodeBS& cpts,
-                                      const SVFFunction*)
+                                      const FunObjVar*)
     {
         getMRsForLoadFromInterList(aliasMRs, cpts, inters);
     }

package/SVF-linux/Release-build/include/MSSA/MemRegion.h

@@ -139,14 +139,14 @@ public:
     //@}
     ///Define mem region set
     typedef OrderedSet<const MemRegion*, MemRegion::equalMemRegion> MRSet;
-    typedef Map<const PAGEdge*, const SVFFunction*> PAGEdgeToFunMap;
+    typedef Map<const PAGEdge*, const FunObjVar*> PAGEdgeToFunMap;
     typedef OrderedSet<NodeBS, SVFUtil::equalNodeBS> PointsToList;
-    typedef Map<const SVFFunction*, NodeBS> FunToPointsToMap;
-    typedef Map<const SVFFunction*, PointsToList> FunToPointsTosMap;
+    typedef Map<const FunObjVar*, NodeBS> FunToPointsToMap;
+    typedef Map<const FunObjVar*, PointsToList> FunToPointsTosMap;
     typedef OrderedMap<NodeBS, NodeBS, SVFUtil::equalNodeBS> PtsToRepPtsSetMap;
 
     /// Map a function to its region set
-    typedef Map<const SVFFunction*, MRSet> FunToMRsMap;
+    typedef Map<const FunObjVar*, MRSet> FunToMRsMap;
     /// Map loads/stores to its mem regions,
     /// TODO:visitAtomicCmpXchgInst, visitAtomicRMWInst??
     //@{
@@ -165,7 +165,7 @@ public:
     /// Maps Mod-Ref analysis
     //@{
     /// Map a function to its indirect refs/mods of memory objects
-    typedef Map<const SVFFunction*, NodeBS> FunToNodeBSMap;
+    typedef Map<const FunObjVar*, NodeBS> FunToNodeBSMap;
     /// Map a callsite to its indirect refs/mods of memory objects
     typedef Map<const CallICFGNode*, NodeBS> CallSiteToNodeBSMap;
     //@}
@@ -263,7 +263,7 @@ private:
     }
     /// Whether the object node is a non-local object
     /// including global, heap, and stack variable in recursions
-    bool isNonLocalObject(NodeID id, const SVFFunction* curFun) const;
+    bool isNonLocalObject(NodeID id, const FunObjVar* curFun) const;
 
     /// Get all the objects in callee's modref escaped via global objects (the chain pts of globals)
     void getEscapObjviaGlobals(NodeBS& globs, const NodeBS& pts);
@@ -278,7 +278,7 @@ protected:
     PtsToRepPtsSetMap cptsToRepCPtsMap;
 
     /// Generate a memory region and put in into functions which use it
-    void createMR(const SVFFunction* fun, const NodeBS& cpts);
+    void createMR(const FunObjVar* fun, const NodeBS& cpts);
 
     /// Collect all global variables for later escape analysis
     void collectGlobals();
@@ -304,7 +304,7 @@ protected:
         return mr->getPointsTo().intersects(cpts);
     }
     /// Get all aliased mem regions from function fun according to cpts
-    virtual inline void getAliasMemRegions(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction* fun)
+    virtual inline void getAliasMemRegions(MRSet& aliasMRs, const NodeBS& cpts, const FunObjVar* fun)
     {
         for(MRSet::const_iterator it = funToMRsMap[fun].begin(), eit = funToMRsMap[fun].end(); it!=eit; ++it)
         {
@@ -314,14 +314,14 @@ protected:
     }
 
     /// Get memory regions for a load statement according to cpts.
-    virtual inline void getMRsForLoad(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction*)
+    virtual inline void getMRsForLoad(MRSet& aliasMRs, const NodeBS& cpts, const FunObjVar*)
     {
         const MemRegion* mr = getMR(cpts);
         aliasMRs.insert(mr);
     }
 
     /// Get memory regions for call site ref according to cpts.
-    virtual inline void getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction*)
+    virtual inline void getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const FunObjVar*)
     {
         const MemRegion* mr = getMR(cpts);
         aliasMRs.insert(mr);
@@ -331,18 +331,18 @@ protected:
     virtual void modRefAnalysis(CallGraphNode* callGraphNode, WorkList& worklist);
 
     /// Get Mod-Ref of a callee function
-    virtual bool handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallICFGNode* cs, const SVFFunction* fun);
+    virtual bool handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallICFGNode* cs, const FunObjVar* fun);
 
 
     /// Add cpts to store/load
     //@{
-    inline void addCPtsToStore(NodeBS& cpts, const StoreStmt *st, const SVFFunction* fun)
+    inline void addCPtsToStore(NodeBS& cpts, const StoreStmt *st, const FunObjVar* fun)
     {
         storesToPointsToMap[st] = cpts;
         funToPointsToMap[fun].insert(cpts);
         addModSideEffectOfFunction(fun,cpts);
     }
-    inline void addCPtsToLoad(NodeBS& cpts, const LoadStmt *ld, const SVFFunction* fun)
+    inline void addCPtsToLoad(NodeBS& cpts, const LoadStmt *ld, const FunObjVar* fun)
     {
         loadsToPointsToMap[ld] = cpts;
         funToPointsToMap[fun].insert(cpts);
@@ -358,11 +358,11 @@ protected:
         callsiteToModPointsToMap[cs] |= cpts;
         funToPointsToMap[cs->getCaller()].insert(cpts);
     }
-    inline bool hasCPtsList(const SVFFunction* fun) const
+    inline bool hasCPtsList(const FunObjVar* fun) const
     {
         return funToPointsToMap.find(fun)!=funToPointsToMap.end();
     }
-    inline PointsToList& getPointsToList(const SVFFunction* fun)
+    inline PointsToList& getPointsToList(const FunObjVar* fun)
     {
         return funToPointsToMap[fun];
     }
@@ -374,21 +374,21 @@ protected:
     /// Add/Get methods for side-effect of functions and callsites
     //@{
     /// Add indirect uses an memory object in the function
-    void addRefSideEffectOfFunction(const SVFFunction* fun, const NodeBS& refs);
+    void addRefSideEffectOfFunction(const FunObjVar* fun, const NodeBS& refs);
     /// Add indirect def an memory object in the function
-    void addModSideEffectOfFunction(const SVFFunction* fun, const NodeBS& mods);
+    void addModSideEffectOfFunction(const FunObjVar* fun, const NodeBS& mods);
     /// Add indirect uses an memory object in the function
     bool addRefSideEffectOfCallSite(const CallICFGNode* cs, const NodeBS& refs);
     /// Add indirect def an memory object in the function
     bool addModSideEffectOfCallSite(const CallICFGNode* cs, const NodeBS& mods);
 
     /// Get indirect refs of a function
-    inline const NodeBS& getRefSideEffectOfFunction(const SVFFunction* fun)
+    inline const NodeBS& getRefSideEffectOfFunction(const FunObjVar* fun)
     {
         return funToRefsMap[fun];
     }
     /// Get indirect mods of a function
-    inline const NodeBS& getModSideEffectOfFunction(const SVFFunction* fun)
+    inline const NodeBS& getModSideEffectOfFunction(const FunObjVar* fun)
     {
         return funToModsMap[fun];
     }
@@ -430,7 +430,7 @@ public:
     virtual void generateMRs();
 
     /// Get the function which SVFIR Edge located
-    const SVFFunction* getFunction(const PAGEdge* pagEdge) const
+    const FunObjVar* getFunction(const PAGEdge* pagEdge) const
     {
         PAGEdgeToFunMap::const_iterator it = pagEdgeToFunMap.find(pagEdge);
         assert(it!=pagEdgeToFunMap.end() && "can not find its function, it is a global SVFIR edge");
@@ -438,7 +438,7 @@ public:
     }
     /// Get Memory Region set
     //@{
-    inline MRSet& getFunMRSet(const SVFFunction* fun)
+    inline MRSet& getFunMRSet(const FunObjVar* fun)
     {
         return funToMRsMap[fun];
     }