svf-tools 1.0.1196 → 1.0.1197

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1196",
+  "version": "1.0.1197",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/include/DDA/DDAClient.h

@@ -100,7 +100,7 @@ public:
 protected:
     void addCandidate(NodeID id)
     {
-        if (pag->isValidTopLevelPtr(pag->getGNode(id)))
+        if (pag->isValidTopLevelPtr(pag->getSVFVar(id)))
             candidateQueries.insert(id);
     }
 

package/svf/include/DDA/DDAVFSolver.h

@@ -475,7 +475,7 @@ protected:
         assert(baseObj && "base object is null??");
         if(SVFUtil::isa<StackObjVar>(baseObj))
         {
-            if(const FunObjVar* svffun = _pag->getGNode(id)->getFunction())
+            if(const FunObjVar* svffun = _pag->getSVFVar(id)->getFunction())
             {
                 return _callGraphSCC->isInCycle(_callGraph->getCallGraphNode(svffun)->getId());
             }
@@ -497,7 +497,7 @@ protected:
             {
                 NodeID funPtr = _pag->getFunPtr(cbn);
                 DPIm funPtrDpm(dpm);
-                funPtrDpm.setLocVar(getSVFG()->getDefSVFGNode(_pag->getGNode(funPtr)),funPtr);
+                funPtrDpm.setLocVar(getSVFG()->getDefSVFGNode(_pag->getSVFVar(funPtr)),funPtr);
                 findPT(funPtrDpm);
             }
         }
@@ -510,7 +510,7 @@ protected:
             {
                 NodeID funPtr = _pag->getFunPtr(*it);
                 DPIm funPtrDpm(dpm);
-                funPtrDpm.setLocVar(getSVFG()->getDefSVFGNode(_pag->getGNode(funPtr)),funPtr);
+                funPtrDpm.setLocVar(getSVFG()->getDefSVFGNode(_pag->getSVFVar(funPtr)),funPtr);
                 findPT(funPtrDpm);
             }
         }

package/svf/include/Graphs/ConsG.h

@@ -312,9 +312,9 @@ public:
     {
         return pag->getAllFieldsObjVars(id);
     }
-    inline NodeID getBaseObjVar(NodeID id)
+    inline NodeID getBaseObjVarID(NodeID id)
     {
-        return pag->getBaseObjVar(id);
+        return pag->getBaseObjVarID(id);
     }
     inline bool isSingleFieldObj(NodeID id) const
     {

package/svf/include/MemoryModel/PointerAnalysis.h

@@ -312,11 +312,11 @@ public:
     ///@{
     inline bool isFIObjNode(NodeID id) const
     {
-        return (SVFUtil::isa<BaseObjVar>(pag->getGNode(id)));
+        return (SVFUtil::isa<BaseObjVar>(pag->getSVFVar(id)));
     }
-    inline NodeID getBaseObjVar(NodeID id)
+    inline NodeID getBaseObjVarID(NodeID id)
     {
-        return pag->getBaseObjVar(id);
+        return pag->getBaseObjVarID(id);
     }
     inline NodeID getFIObjVar(NodeID id)
     {

package/svf/include/MemoryModel/PointerAnalysisImpl.h

@@ -348,7 +348,7 @@ public:
         expandedCpts = cpts;;
         for(typename CPtSet::const_iterator cit = cpts.begin(), ecit=cpts.end(); cit!=ecit; ++cit)
         {
-            if(pag->getBaseObjVar(cit->get_id())==cit->get_id())
+            if(pag->getBaseObjVarID(cit->get_id())==cit->get_id())
             {
                 NodeBS& fields = pag->getAllFieldsObjVars(cit->get_id());
                 for(NodeBS::iterator it = fields.begin(), eit = fields.end(); it!=eit; ++it)
@@ -564,7 +564,7 @@ public:
     {
         for (OrderedNodeSet::iterator nIter = this->getAllValidPtrs().begin(); nIter != this->getAllValidPtrs().end(); ++nIter)
         {
-            const PAGNode* node = this->getPAG()->getGNode(*nIter);
+            const SVFVar* node = this->getPAG()->getSVFVar(*nIter);
             if (this->getPAG()->isValidTopLevelPtr(node))
             {
                 if (SVFUtil::isa<DummyObjVar>(node))

package/svf/include/SVFIR/SVFIR.h

@@ -64,9 +64,9 @@ public:
     typedef Map<const FunObjVar*,SVFStmtSet> FunToPAGEdgeSetMap;
     typedef Map<const ICFGNode*,SVFStmtList> ICFGNode2SVFStmtsMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
-    typedef std::pair<NodeID, APOffset> NodeOffset;
+    typedef std::pair<NodeID, APOffset> GepOffset;
     typedef std::pair<NodeID, AccessPath> NodeAccessPath;
-    typedef Map<NodeOffset,NodeID> NodeOffsetMap;
+    typedef Map<GepOffset,NodeID> OffsetToGepVarMap;
     typedef Map<NodeAccessPath,NodeID> NodeAccessPathMap;
     typedef Map<NodeID, NodeAccessPathMap> GepValueVarMap;
     typedef std::pair<const SVFType*, std::vector<AccessPath>> SVFTypeLocSetsPair;
@@ -80,7 +80,7 @@ private:
     ICFGNode2SVFStmtsMap icfgNode2PTASVFStmtsMap;	///< Map an ICFGNode to its PointerAnalysis related SVFStmts
     GepValueVarMap GepValObjMap;	///< Map a pair<base,off> to a gep value node id
     TypeLocSetsMap typeLocSetsMap;	///< Map an arg to its base SVFType* and all its field location sets
-    NodeOffsetMap GepObjVarMap;	///< Map a pair<base,off> to a gep obj node id
+    OffsetToGepVarMap GepObjVarMap;	///< Map a pair<base,off> to a gep obj node id
     MemObjToFieldsMap memToFieldsMap;	///< Map a mem object id to all its fields
     SVFStmtSet globSVFStmtSet;	///< Global PAGEdges without control flow information
     PHINodeMap phiNodeMap;	///< A set of phi copy edges
@@ -126,13 +126,67 @@ public:
         pag = nullptr;
     }
     //@}
+    /// ObjVar/GepObjVar/BaseObjVar
+    //@{
+    inline const SVFVar* getSVFVar(NodeID id) const
+    {
+        return getGNode(id);
+    }
+    inline const ObjVar* getObjVar(NodeID id) const
+    {
+        if(const SVFVar* var = getSVFVar(id))
+            return SVFUtil::dyn_cast<ObjVar>(var);
+        else
+        {
+            assert(false && "the Node is not an ObjVar");
+            return nullptr;
+        }
+    }
+    inline const BaseObjVar* getBaseObjVar(NodeID id) const
+    {
+        if(const SVFVar* var = getSVFVar(id))
+            return SVFUtil::dyn_cast<BaseObjVar>(var);
+        else
+        {
+            assert(false && "the Node is not a BaseObjVar");
+            return nullptr;
+        }
+    }
+    inline const GepObjVar* getGepObjVar(NodeID id) const
+    {
+        if(const SVFVar* var = getSVFVar(id))
+            return SVFUtil::dyn_cast<GepObjVar>(var);
+        else
+        {
+            assert(false && "the Node is not a GepObjVar");
+            return nullptr;
+        }
+    }
+    inline bool isObjVar(NodeID id) const
+    {
+        return SVFUtil::isa<ObjVar>(getSVFVar(id));
+    }
+    inline bool isBaseObjVar(NodeID id) const
+    {
+        return SVFUtil::isa<BaseObjVar>(getSVFVar(id));
+    }
+    inline bool isGepObjVar(NodeID id) const
+    {
+        return SVFUtil::isa<GepObjVar>(getSVFVar(id));
+    }
+    /// Return the entire SVFID to SVFVar map
+    inline const IDToNodeMapTy& getSVFVarMap() const
+    {
+        return IDToNodeMap;
+    }
+    //@}
     /// Return memToFieldsMap
     inline MemObjToFieldsMap& getMemToFieldsMap()
     {
         return memToFieldsMap;
     }
     /// Return GepObjVarMap
-    inline NodeOffsetMap& getGepObjNodeMap()
+    inline OffsetToGepVarMap& getGepObjNodeMap()
     {
         return GepObjVarMap;
     }
@@ -423,17 +477,17 @@ public:
     //@{
     inline const BaseObjVar* getBaseObject(NodeID id) const
     {
-        const SVFVar* node = getGNode(id);
+        const SVFVar* node = getSVFVar(id);
         if(const GepObjVar* gepObjVar = SVFUtil::dyn_cast<GepObjVar>(node))
             return SVFUtil::dyn_cast<BaseObjVar>(
-                       getGNode(gepObjVar->getBaseNode()));
+                       getSVFVar(gepObjVar->getBaseNode()));
         else
             return SVFUtil::dyn_cast<BaseObjVar>(node);
     }
 
     inline const ValVar* getBaseValVar(NodeID id) const
     {
-        const SVFVar* node = getGNode(id);
+        const SVFVar* node = getSVFVar(id);
         if(const GepValVar* gepVar = SVFUtil::dyn_cast<GepValVar>(node))
             return gepVar->getBaseNode();
         else
@@ -453,7 +507,7 @@ public:
     }
     inline NodeID getFIObjVar(NodeID id) const
     {
-        return getBaseObjVar(id);
+        return getBaseObjVarID(id);
     }
     //@}
 
@@ -477,7 +531,7 @@ public:
     /// Base and Offset methods for Value and Object node
     //@{
     /// Get a base pointer node given a field pointer
-    inline NodeID getBaseObjVar(NodeID id) const
+    inline NodeID getBaseObjVarID(NodeID id) const
     {
         return getBaseObject(id)->getId();
     }

package/svf/lib/AE/Core/AbstractState.cpp

@@ -172,7 +172,7 @@ AddressValue AbstractState::getGepObjAddrs(u32_t pointer, IntervalValue offset)
         for (const auto& addr : addrs.getAddrs())
         {
             s64_t baseObj = getIDFromAddr(addr);
-            assert(SVFUtil::isa<ObjVar>(PAG::getPAG()->getGNode(baseObj)) && "Fail to get the base object address!");
+            assert(SVFUtil::isa<ObjVar>(PAG::getPAG()->getSVFVar(baseObj)) && "Fail to get the base object address!");
             NodeID gepObj = PAG::getPAG()->getGepObjVar(baseObj, i);
             (*this)[gepObj] = AddressValue(AbstractState::getVirtualMemAddress(gepObj));
             gepAddrs.insert(AbstractState::getVirtualMemAddress(gepObj));

package/svf/lib/AE/Svfexe/AEDetector.cpp

@@ -313,7 +313,7 @@ void BufOverflowDetector::detectExtAPI(AbstractState& as,
 IntervalValue BufOverflowDetector::getAccessOffset(SVF::AbstractState& as, SVF::NodeID objId, const SVF::GepStmt* gep)
 {
     SVFIR* svfir = PAG::getPAG();
-    auto obj = svfir->getGNode(objId);
+    auto obj = svfir->getSVFVar(objId);
 
     if (SVFUtil::isa<BaseObjVar>(obj))
     {
@@ -351,7 +351,7 @@ void BufOverflowDetector::updateGepObjOffsetFromBase(AbstractState& as, SVF::Add
     for (const auto& objAddr : objAddrs)
     {
         NodeID objId = as.getIDFromAddr(objAddr);
-        auto obj = svfir->getGNode(objId);
+        auto obj = svfir->getSVFVar(objId);
 
         if (SVFUtil::isa<BaseObjVar>(obj))
         {
@@ -361,7 +361,7 @@ void BufOverflowDetector::updateGepObjOffsetFromBase(AbstractState& as, SVF::Add
             for (const auto& gepAddr : gepAddrs)
             {
                 NodeID gepObj = as.getIDFromAddr(gepAddr);
-                if (const GepObjVar* gepObjVar = SVFUtil::dyn_cast<GepObjVar>(svfir->getGNode(gepObj)))
+                if (const GepObjVar* gepObjVar = SVFUtil::dyn_cast<GepObjVar>(svfir->getSVFVar(gepObj)))
                 {
                     addToGepObjOffsetFromBase(gepObjVar, offset);
                 }
@@ -380,7 +380,7 @@ void BufOverflowDetector::updateGepObjOffsetFromBase(AbstractState& as, SVF::Add
             for (const auto& gepAddr : gepAddrs)
             {
                 NodeID gepObj = as.getIDFromAddr(gepAddr);
-                if (const GepObjVar* gepObjVar = SVFUtil::dyn_cast<GepObjVar>(svfir->getGNode(gepObj)))
+                if (const GepObjVar* gepObjVar = SVFUtil::dyn_cast<GepObjVar>(svfir->getSVFVar(gepObj)))
                 {
                     if (hasGepObjOffsetFromBase(objVar))
                     {
@@ -520,11 +520,11 @@ bool BufOverflowDetector::canSafelyAccessMemory(AbstractState& as, const SVF::SV
 
         IntervalValue offset(0);
         // if the object is a GepObjVar, get the offset from the base object
-        if (SVFUtil::isa<GepObjVar>(svfir->getGNode(objId)))
+        if (SVFUtil::isa<GepObjVar>(svfir->getSVFVar(objId)))
         {
-            offset = getGepObjOffsetFromBase(SVFUtil::cast<GepObjVar>(svfir->getGNode(objId))) + len;
+            offset = getGepObjOffsetFromBase(SVFUtil::cast<GepObjVar>(svfir->getSVFVar(objId))) + len;
         }
-        else if (SVFUtil::isa<BaseObjVar>(svfir->getGNode(objId)))
+        else if (SVFUtil::isa<BaseObjVar>(svfir->getSVFVar(objId)))
         {
             // if the object is a BaseObjVar, get the offset directly
             offset = len;

package/svf/lib/AE/Svfexe/AbsExtAPI.cpp

@@ -165,7 +165,7 @@ void AbsExtAPI::initExtFunMap()
             for (auto vaddr: Addrs.getAddrs())
             {
                 u32_t objId = as.getIDFromAddr(vaddr);
-                AbstractValue range = getRangeLimitFromType(svfir->getGNode(objId)->getType());
+                AbstractValue range = getRangeLimitFromType(svfir->getSVFVar(objId)->getType());
                 as.store(vaddr, range);
             }
         }
@@ -185,7 +185,7 @@ void AbsExtAPI::initExtFunMap()
             for (auto vaddr: Addrs.getAddrs())
             {
                 u32_t objId = as.getIDFromAddr(vaddr);
-                AbstractValue range = getRangeLimitFromType(svfir->getGNode(objId)->getType());
+                AbstractValue range = getRangeLimitFromType(svfir->getSVFVar(objId)->getType());
                 as.store(vaddr, range);
             }
         }
@@ -423,7 +423,7 @@ void AbsExtAPI::handleExtAPI(const CallICFGNode *call)
     else if (extType == MEMCPY)
     {
         IntervalValue len = as[call->getArgument(2)->getId()].getInterval();
-        svfir->getGNode(call->getArgument(0)->getId());
+        (void)svfir->getSVFVar(call->getArgument(0)->getId());
         handleMemcpy(as, call->getArgument(0), call->getArgument(1), len, 0);
     }
     else if (extType == MEMSET)

package/svf/lib/AE/Svfexe/AbstractInterpretation.cpp

@@ -360,7 +360,7 @@ bool AbstractInterpretation::isCmpBranchFeasible(const CmpStmt* cmpStmt, s64_t s
     const LoadStmt *load_op0 = nullptr;
     const LoadStmt *load_op1 = nullptr;
     // get '%1 = load i32 s', and load inst may not exist
-    SVFVar* loadVar0 = svfir->getGNode(op0);
+    const SVFVar* loadVar0 = svfir->getSVFVar(op0);
     if (!loadVar0->getInEdges().empty())
     {
         SVFStmt *loadVar0InStmt = *loadVar0->getInEdges().begin();
@@ -370,7 +370,7 @@ bool AbstractInterpretation::isCmpBranchFeasible(const CmpStmt* cmpStmt, s64_t s
         }
         else if (const CopyStmt *copyStmt = SVFUtil::dyn_cast<CopyStmt>(loadVar0InStmt))
         {
-            loadVar0 = svfir->getGNode(copyStmt->getRHSVarID());
+            loadVar0 = svfir->getSVFVar(copyStmt->getRHSVarID());
             if (!loadVar0->getInEdges().empty())
             {
                 SVFStmt *loadVar0InStmt2 = *loadVar0->getInEdges().begin();
@@ -382,7 +382,7 @@ bool AbstractInterpretation::isCmpBranchFeasible(const CmpStmt* cmpStmt, s64_t s
         }
     }
 
-    SVFVar* loadVar1 = svfir->getGNode(op1);
+    const SVFVar* loadVar1 = svfir->getSVFVar(op1);
     if (!loadVar1->getInEdges().empty())
     {
         SVFStmt *loadVar1InStmt = *loadVar1->getInEdges().begin();
@@ -392,7 +392,7 @@ bool AbstractInterpretation::isCmpBranchFeasible(const CmpStmt* cmpStmt, s64_t s
         }
         else if (const CopyStmt *copyStmt = SVFUtil::dyn_cast<CopyStmt>(loadVar1InStmt))
         {
-            loadVar1 = svfir->getGNode(copyStmt->getRHSVarID());
+            loadVar1 = svfir->getSVFVar(copyStmt->getRHSVarID());
             if (!loadVar1->getInEdges().empty())
             {
                 SVFStmt *loadVar1InStmt2 = *loadVar1->getInEdges().begin();
@@ -954,7 +954,7 @@ const FunObjVar* AbstractInterpretation::getCallee(const CallICFGNode* callNode)
         return nullptr;
 
     NodeID addr = *Addrs.getAddrs().begin();
-    SVFVar* func_var = svfir->getGNode(as.getIDFromAddr(addr));
+    const SVFVar* func_var = svfir->getSVFVar(as.getIDFromAddr(addr));
     return SVFUtil::dyn_cast<FunObjVar>(func_var);
 }
 

package/svf/lib/DDA/ContextDDA.cpp

@@ -79,7 +79,7 @@ const CxtPtSet& ContextDDA::computeDDAPts(const CxtVar& var)
     LocDPItem::setMaxBudget(Options::CxtBudget());
 
     NodeID id = var.get_id();
-    PAGNode* node = getPAG()->getGNode(id);
+    const SVFVar* node = getPAG()->getSVFVar(id);
     CxtLocDPItem dpm = getDPIm(var, getDefSVFGNode(node));
 
     // start DDA analysis
@@ -191,7 +191,7 @@ bool ContextDDA::testIndCallReachability(CxtLocDPItem& dpm, const FunObjVar* cal
     if(getPAG()->isIndirectCallSites(cs))
     {
         NodeID id = getPAG()->getFunPtr(cs);
-        PAGNode* node = getPAG()->getGNode(id);
+        const SVFVar* node = getPAG()->getSVFVar(id);
         CxtVar funptrVar(dpm.getCondVar().get_cond(), id);
         CxtLocDPItem funptrDpm = getDPIm(funptrVar,getDefSVFGNode(node));
         PointsTo pts = getBVPointsTo(findPT(funptrDpm));
@@ -342,11 +342,11 @@ bool ContextDDA::isHeapCondMemObj(const CxtVar& var, const StoreSVFGNode*)
     {
         if (!isa<DummyObjVar>(baseVar))
         {
-            PAGNode *pnode = _pag->getGNode(getPtrNodeID(var));
-            GepObjVar* gepobj = SVFUtil::dyn_cast<GepObjVar>(pnode);
+            const SVFVar* pnode = _pag->getSVFVar(getPtrNodeID(var));
+            const GepObjVar* gepobj = SVFUtil::dyn_cast<GepObjVar>(pnode);
             if (gepobj != nullptr)
             {
-                assert(SVFUtil::isa<DummyObjVar>(_pag->getGNode(gepobj->getBaseNode()))
+                assert(SVFUtil::isa<DummyObjVar>(_pag->getSVFVar(gepobj->getBaseNode()))
                        && "empty refVal in a gep object whose base is a non-dummy object");
             }
             else

package/svf/lib/DDA/DDAClient.cpp

@@ -58,7 +58,7 @@ void DDAClient::answerQueries(PointerAnalysis* pta)
     for (OrderedNodeSet::iterator nIter = candidateQueries.begin();
             nIter != candidateQueries.end(); ++nIter,++count)
     {
-        PAGNode* node = pta->getPAG()->getGNode(*nIter);
+        const SVFVar* node = pta->getPAG()->getSVFVar(*nIter);
         if(pta->getPAG()->isValidTopLevelPtr(node))
         {
             DBOUT(DGENERAL,outs() << "\n@@Computing PointsTo for :" << node->getId() <<

package/svf/lib/DDA/DDAPass.cpp

@@ -282,10 +282,10 @@ AliasResult DDAPass::alias(NodeID node1, NodeID node2)
 {
     SVFIR* pag = _pta->getPAG();
 
-    if(pag->isValidTopLevelPtr(pag->getGNode(node1)))
+    if(pag->isValidTopLevelPtr(pag->getSVFVar(node1)))
         _pta->computeDDAPts(node1);
 
-    if(pag->isValidTopLevelPtr(pag->getGNode(node2)))
+    if(pag->isValidTopLevelPtr(pag->getSVFVar(node2)))
         _pta->computeDDAPts(node2);
 
     return _pta->alias(node1,node2);

package/svf/lib/DDA/FlowDDA.cpp

@@ -45,7 +45,7 @@ void FlowDDA::computeDDAPts(NodeID id)
     resetQuery();
     LocDPItem::setMaxBudget(Options::FlowBudget());
 
-    PAGNode* node = getPAG()->getGNode(id);
+    const SVFVar* node = getPAG()->getSVFVar(id);
     LocDPItem dpm = getDPIm(node->getId(),getDefSVFGNode(node));
 
     /// start DDA analysis

package/svf/lib/Graphs/ConsG.cpp

@@ -163,7 +163,7 @@ void ConstraintGraph::clearSolitaries()
     {
         if (it->second->hasIncomingEdge() || it->second->hasOutgoingEdge())
             continue;
-        if (pag->getGNode(it->first)->isPointer())
+        if (pag->getSVFVar(it->first)->isPointer())
             continue;
         if (retFromIndCalls.find(it->first)!=retFromIndCalls.end())
             continue;
@@ -188,8 +188,7 @@ AddrCGEdge::AddrCGEdge(ConstraintNode* s, ConstraintNode* d, EdgeID id)
     : ConstraintEdge(s,d,Addr,id)
 {
     // Retarget addr edges may lead s to be a dummy node
-    PAGNode* node = SVFIR::getPAG()->getGNode(s->getId());
-    (void)node; // Suppress warning of unused variable under release build
+    const SVFVar* node = SVFIR::getPAG()->getSVFVar(s->getId());
     if (!SVFIR::pagReadFromTXT())
     {
         assert(!SVFUtil::isa<DummyValVar>(node) && "a dummy node??");
@@ -730,7 +729,7 @@ ConstraintNode::const_iterator ConstraintNode::directInEdgeEnd() const
 
 const std::string ConstraintNode::toString() const
 {
-    return SVFIR::getPAG()->getGNode(getId())->toString();
+    return SVFIR::getPAG()->getSVFVar(getId())->toString();
 }
 
 /*!
@@ -764,7 +763,7 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
     /// Either you can choose to display the name of the value or the whole instruction
     static std::string getNodeLabel(NodeType *n, ConstraintGraph*)
     {
-        PAGNode* node = SVFIR::getPAG()->getGNode(n->getId());
+        const SVFVar* node = SVFIR::getPAG()->getSVFVar(n->getId());
         bool briefDisplay = Options::BriefConsCGDotGraph();
         bool nameDisplay = true;
         std::string str;
@@ -797,7 +796,7 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
 
     static std::string getNodeAttributes(NodeType *n, ConstraintGraph*)
     {
-        PAGNode* node = SVFIR::getPAG()->getGNode(n->getId());
+        const SVFVar* node = SVFIR::getPAG()->getSVFVar(n->getId());
         if (SVFUtil::isa<ValVar>(node))
         {
             if(SVFUtil::isa<GepValVar>(node))

package/svf/lib/Graphs/SVFG.cpp

@@ -595,8 +595,8 @@ void SVFG::getInterVFEdgesForIndirectCallSite(const CallICFGNode* callICFGNode,
         SVFIR::SVFVarList::const_iterator funArgIt = funArgList.begin(), funArgEit = funArgList.end();
         for (; funArgIt != funArgEit && csArgIt != csArgEit; funArgIt++, csArgIt++)
         {
-            const PAGNode *cs_arg = *csArgIt;
-            const PAGNode *fun_arg = *funArgIt;
+            const SVFVar *cs_arg = *csArgIt;
+            const SVFVar *fun_arg = *funArgIt;
             if (isInterestedPAGNode(fun_arg) && isInterestedPAGNode(cs_arg))
                 getInterVFEdgeAtIndCSFromAPToFP(cs_arg, fun_arg, callICFGNode, csId, edges);
         }
@@ -604,12 +604,12 @@ void SVFG::getInterVFEdgesForIndirectCallSite(const CallICFGNode* callICFGNode,
         if (callee->isVarArg())
         {
             NodeID varFunArg = pag->getVarargNode(callee);
-            const PAGNode* varFunArgNode = pag->getGNode(varFunArg);
+            const SVFVar* varFunArgNode = pag->getSVFVar(varFunArg);
             if (isInterestedPAGNode(varFunArgNode))
             {
                 for (; csArgIt != csArgEit; csArgIt++)
                 {
-                    const PAGNode *cs_arg = *csArgIt;
+                    const SVFVar *cs_arg = *csArgIt;
                     if (isInterestedPAGNode(cs_arg))
                         getInterVFEdgeAtIndCSFromAPToFP(cs_arg, varFunArgNode, callICFGNode, csId, edges);
                 }
@@ -620,8 +620,8 @@ void SVFG::getInterVFEdgesForIndirectCallSite(const CallICFGNode* callICFGNode,
     // Find inter direct return edges between actual return and formal return.
     if (pag->funHasRet(callee) && pag->callsiteHasRet(retICFGNode))
     {
-        const PAGNode* cs_return = pag->getCallSiteRet(retICFGNode);
-        const PAGNode* fun_return = pag->getFunRet(callee);
+        const SVFVar* cs_return = pag->getCallSiteRet(retICFGNode);
+        const SVFVar* fun_return = pag->getFunRet(callee);
         if (isInterestedPAGNode(cs_return) && isInterestedPAGNode(fun_return))
             getInterVFEdgeAtIndCSFromFRToAR(fun_return, cs_return, csId, edges);
     }

package/svf/lib/Graphs/ThreadCallGraph.cpp

@@ -101,7 +101,7 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
             const NodeBS targets = pta->getPts(forkedval->getId()).toNodeBS();
             for (NodeBS::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
             {
-                if(ObjVar* objPN = SVFUtil::dyn_cast<ObjVar>(pag->getGNode(*ii)))
+                if(const ObjVar* objPN = pag->getObjVar(*ii))
                 {
                     const BaseObjVar* obj = pag->getBaseObject(objPN->getId());
                     if(obj->isFunction())