svf-tools 1.0.1195 → 1.0.1197

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1195",
+  "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)
@@ -465,7 +465,7 @@ u32_t AbsExtAPI::getElementSize(AbstractState& as, const SVFVar* var)
     if (var->getType()->isArrayTy())
     {
         return SVFUtil::dyn_cast<SVFArrayType>(var->getType())
-            ->getTypeOfElement()->getByteSize();
+               ->getTypeOfElement()->getByteSize();
     }
     if (var->getType()->isPointerTy())
     {
@@ -473,7 +473,7 @@ u32_t AbsExtAPI::getElementSize(AbstractState& as, const SVFVar* var)
         {
             if (elemType->isArrayTy())
                 return SVFUtil::dyn_cast<SVFArrayType>(elemType)
-                    ->getTypeOfElement()->getByteSize();
+                       ->getTypeOfElement()->getByteSize();
             return elemType->getByteSize();
         }
         return 1;
@@ -593,8 +593,8 @@ void AbsExtAPI::handleStrncat(const CallICFGNode *call)
 
 /// Core memcpy: copy `len` bytes from src to dst starting at dst[start_idx].
 void AbsExtAPI::handleMemcpy(AbstractState& as, const SVF::SVFVar *dst,
-                              const SVF::SVFVar *src, IntervalValue len,
-                              u32_t start_idx)
+                             const SVF::SVFVar *src, IntervalValue len,
+                             u32_t start_idx)
 {
     if (!isValidLength(len)) return;
 
@@ -634,7 +634,7 @@ void AbsExtAPI::handleMemcpy(AbstractState& as, const SVF::SVFVar *dst,
 /// wchar_t[100], elemSize = sizeof(wchar_t[100]), so range_val reflects the
 /// number of top-level GEP fields, not individual array elements.
 void AbsExtAPI::handleMemset(AbstractState& as, const SVF::SVFVar *dst,
-                              IntervalValue elem, IntervalValue len)
+                             IntervalValue elem, IntervalValue len)
 {
     if (!isValidLength(len)) return;
 
@@ -643,7 +643,7 @@ void AbsExtAPI::handleMemset(AbstractState& as, const SVF::SVFVar *dst,
     if (dst->getType()->isArrayTy())
     {
         elemSize = SVFUtil::dyn_cast<SVFArrayType>(dst->getType())
-            ->getTypeOfElement()->getByteSize();
+                   ->getTypeOfElement()->getByteSize();
     }
     else if (dst->getType()->isPointerTy())
     {

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())

package/svf/lib/Graphs/VFG.cpp

@@ -212,7 +212,7 @@ const std::string PHIVFGNode::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "PHIVFGNode ID: " << getId() << " ";
-    rawstr << "PAGNode: [" << res->getId() << " = PHI(";
+    rawstr << "SVFVar: [" << res->getId() << " = PHI(";
     for(PHIVFGNode::OPVers::const_iterator it = opVerBegin(), eit = opVerEnd();
             it != eit; it++)
         rawstr << it->second->getId() << ", ";
@@ -227,7 +227,7 @@ const std::string IntraPHIVFGNode::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "IntraPHIVFGNode ID: " << getId() << " ";
-    rawstr << "PAGNode: [" << res->getId() << " = PHI(";
+    rawstr << "SVFVar: [" << res->getId() << " = PHI(";
     for(PHIVFGNode::OPVers::const_iterator it = opVerBegin(), eit = opVerEnd();
             it != eit; it++)
         rawstr << it->second->getId() << ", ";
@@ -337,9 +337,9 @@ const std::string InterPHIVFGNode::toString() const
     std::string str;
     std::stringstream rawstr(str);
     if(isFormalParmPHI())
-        rawstr << "FormalParmPHI ID: " << getId() << " PAGNode ID: " << res->getId() << "\n" << res->valueOnlyToString();
+        rawstr << "FormalParmPHI ID: " << getId() << " SVFVar ID: " << res->getId() << "\n" << res->valueOnlyToString();
     else
-        rawstr << "ActualRetPHI ID: " << getId() << " PAGNode ID: " << res->getId() << "\n" << res->valueOnlyToString();
+        rawstr << "ActualRetPHI ID: " << getId() << " SVFVar ID: " << res->getId() << "\n" << res->valueOnlyToString();
     return rawstr.str();
 }
 
@@ -355,7 +355,7 @@ const std::string NullPtrVFGNode::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "NullPtrVFGNode ID: " << getId();
-    rawstr << " PAGNode ID: " << node->getId() << "\n";
+    rawstr << " SVFVar ID: " << node->getId() << "\n";
     return rawstr.str();
 }
 
@@ -404,12 +404,12 @@ const std::string RetDirSVFGEdge::toString() const
 
 
 
-FormalRetVFGNode::FormalRetVFGNode(NodeID id, const PAGNode* n, const FunObjVar* f) :
+FormalRetVFGNode::FormalRetVFGNode(NodeID id, const SVFVar* n, const FunObjVar* f) :
     ArgumentVFGNode(id, n, FRet), fun(f)
 {
 }
 
-PHIVFGNode::PHIVFGNode(NodeID id, const PAGNode* r,VFGNodeK k): VFGNode(id, k), res(r)
+PHIVFGNode::PHIVFGNode(NodeID id, const SVFVar* r,VFGNodeK k): VFGNode(id, k), res(r)
 {
 
 }
@@ -450,7 +450,7 @@ void VFG::addVFGNodes()
     // initialize dummy definition null pointers in order to uniform the construction
     // to be noted for black hole pointer it has already has address edge connected,
     // and its definition will be set when processing addr SVFIR edge.
-    addNullPtrVFGNode(pag->getGNode(pag->getNullPtr()));
+    addNullPtrVFGNode(pag->getSVFVar(pag->getNullPtr()));
 
     // initialize address nodes
     SVFStmt::SVFStmtSetTy& addrs = getPAGEdgeSet(SVFStmt::Addr);
@@ -508,7 +508,7 @@ void VFG::addVFGNodes()
 
         for(SVFIR::SVFVarList::iterator pit = it->second.begin(), epit = it->second.end(); pit!=epit; ++pit)
         {
-            const PAGNode* pagNode = *pit;
+            const SVFVar* pagNode = *pit;
             if (isInterestedPAGNode(pagNode))
                 addActualParmVFGNode(pagNode,it->first);
         }
@@ -534,7 +534,7 @@ void VFG::addVFGNodes()
 
         for(SVFIR::SVFVarList::iterator pit = it->second.begin(), epit = it->second.end(); pit!=epit; ++pit)
         {
-            const PAGNode* param = *pit;
+            const SVFVar* param = *pit;
             if (isInterestedPAGNode(param) == false || hasBlackHoleConstObjAddrAsDef(param))
                 continue;
 
@@ -554,7 +554,7 @@ void VFG::addVFGNodes()
 
         if (func->isVarArg())
         {
-            const PAGNode* varParam = pag->getGNode(pag->getVarargNode(func));
+            const SVFVar* varParam = pag->getSVFVar(pag->getVarargNode(func));
             if (isInterestedPAGNode(varParam) == false || hasBlackHoleConstObjAddrAsDef(varParam))
                 continue;
 
@@ -578,7 +578,7 @@ void VFG::addVFGNodes()
     {
         const FunObjVar* func = it->first;
 
-        const PAGNode* uniqueFunRetNode = it->second;
+        const SVFVar* uniqueFunRetNode = it->second;
 
         RetPESet retPEs;
         if (uniqueFunRetNode->hasOutgoingEdges(SVFStmt::Ret))
@@ -969,8 +969,8 @@ void VFG::connectCallerAndCallee(const CallICFGNode* callBlockNode, const FunObj
         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(cs_arg) && isInterestedPAGNode(fun_arg))
                 connectAParamAndFParam(cs_arg, fun_arg, callBlockNode, csId, edges);
         }
@@ -979,12 +979,12 @@ void VFG::connectCallerAndCallee(const CallICFGNode* callBlockNode, const FunObj
         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))
                         connectAParamAndFParam(cs_arg, varFunArgNode, callBlockNode, csId, edges);
                 }
@@ -995,8 +995,8 @@ void VFG::connectCallerAndCallee(const CallICFGNode* callBlockNode, const FunObj
     // connect actual return and formal return
     if (pag->funHasRet(callee) && pag->callsiteHasRet(retBlockNode))
     {
-        const PAGNode* cs_return = pag->getCallSiteRet(retBlockNode);
-        const PAGNode* fun_return = pag->getFunRet(callee);
+        const SVFVar* cs_return = pag->getCallSiteRet(retBlockNode);
+        const SVFVar* fun_return = pag->getFunRet(callee);
         if (isInterestedPAGNode(cs_return) && isInterestedPAGNode(fun_return))
             connectFRetAndARet(fun_return, cs_return, csId, edges);
     }
@@ -1005,7 +1005,7 @@ void VFG::connectCallerAndCallee(const CallICFGNode* callBlockNode, const FunObj
 /*!
  * Given a VFG node, return its left hand side top level pointer
  */
-const PAGNode* VFG::getLHSTopLevPtr(const VFGNode* node) const
+const SVFVar* VFG::getLHSTopLevPtr(const VFGNode* node) const
 {
 
     if(const AddrVFGNode* addr = SVFUtil::dyn_cast<AddrVFGNode>(node))

package/svf/lib/MSSA/MemRegion.cpp

@@ -508,7 +508,7 @@ void MRGenerator::collectCallSitePts(const CallICFGNode* cs)
  */
 NodeBS& MRGenerator::CollectPtsChain(NodeID id)
 {
-    NodeID baseId = pta->getPAG()->getBaseObjVar(id);
+    NodeID baseId = pta->getPAG()->getBaseObjVarID(id);
     NodeToPTSSMap::iterator it = cachedPtsChainMap.find(baseId);
     if(it!=cachedPtsChainMap.end())
         return it->second;

package/svf/lib/MTA/TCT.cpp

@@ -273,10 +273,10 @@ void TCT::handleCallRelation(CxtThreadProc& ctp, const CallGraphEdge* cgEdge, co
         if(pushToCTPWorkList(newctp))
         {
             /// Add TCT nodes and edge
-            if(addTCTEdge(this->getGNode(ctp.getTid()), spawneeNode))
+            if(addTCTEdge(this->getTCTNode(ctp.getTid()), spawneeNode))
             {
                 DBOUT(DMTA,outs() << "Add TCT Edge from thread " << ctp.getTid() << "  ";
-                      this->getGNode(ctp.getTid())->getCxtThread().dump();
+                      this->getTCTNode(ctp.getTid())->getCxtThread().dump();
                       outs() << " to thread " << spawneeNode->getId() << "  ";
                       spawneeNode->getCxtThread().dump();
                       outs() << "\n" );

package/svf/lib/MemoryModel/PointerAnalysis.cpp

@@ -136,7 +136,7 @@ bool PointerAnalysis::isLocalVarInRecursiveFun(NodeID id) const
     assert(baseObjVar && "base object not found!!");
     if(SVFUtil::isa<StackObjVar>(baseObjVar))
     {
-        if(const FunObjVar* svffun = pag->getGNode(id)->getFunction())
+        if(const FunObjVar* svffun = pag->getSVFVar(id)->getFunction())
         {
             return callGraphSCC->isInCycle(getCallGraph()->getCallGraphNode(svffun)->getId());
         }
@@ -234,7 +234,7 @@ void PointerAnalysis::dumpAllTypes()
     for (OrderedNodeSet::iterator nIter = this->getAllValidPtrs().begin();
             nIter != this->getAllValidPtrs().end(); ++nIter)
     {
-        const PAGNode* node = getPAG()->getGNode(*nIter);
+        const SVFVar* node = getPAG()->getSVFVar(*nIter);
         if (SVFUtil::isa<DummyObjVar, DummyValVar>(node))
             continue;
 
@@ -253,7 +253,7 @@ void PointerAnalysis::dumpAllTypes()
 void PointerAnalysis::dumpPts(NodeID ptr, const PointsTo& pts)
 {
 
-    const PAGNode* node = pag->getGNode(ptr);
+    const SVFVar* node = pag->getSVFVar(ptr);
     /// print the points-to set of node which has the maximum pts size.
     if (SVFUtil::isa<DummyObjVar> (node))
     {
@@ -283,12 +283,12 @@ void PointerAnalysis::dumpPts(NodeID ptr, const PointsTo& pts)
 
     for (PointsTo::iterator it = pts.begin(), eit = pts.end(); it != eit; ++it)
     {
-        const PAGNode* node = pag->getGNode(*it);
+        const SVFVar* node = pag->getSVFVar(*it);
         if(SVFUtil::isa<ObjVar>(node) == false)
             continue;
         NodeID ptd = node->getId();
         outs() << "!!Target NodeID " << ptd << "\t [";
-        const PAGNode* pagNode = pag->getGNode(ptd);
+        const SVFVar* pagNode = pag->getSVFVar(ptd);
         if (SVFUtil::isa<DummyValVar>(node))
             outs() << "DummyVal\n";
         else if (SVFUtil::isa<DummyObjVar>(node))
@@ -387,7 +387,7 @@ void PointerAnalysis::resolveIndCalls(const CallICFGNode* cs, const PointsTo& ta
             return;
         }
 
-        if(ObjVar* objPN = SVFUtil::dyn_cast<ObjVar>(pag->getGNode(*ii)))
+        if(const ObjVar* objPN = pag->getObjVar(*ii))
         {
             const BaseObjVar* obj = pag->getBaseObject(objPN->getId());
 
@@ -436,7 +436,7 @@ void PointerAnalysis::getVFnsFromPts(const CallICFGNode* cs, const PointsTo &tar
         const VTableSet &chaVtbls = chgraph->getCSVtblsBasedonCHA(cs);
         for (PointsTo::iterator it = target.begin(), eit = target.end(); it != eit; ++it)
         {
-            const PAGNode *ptdnode = pag->getGNode(*it);
+            const SVFVar* ptdnode = pag->getSVFVar(*it);
             const GlobalObjVar* pVar = nullptr;
             if (isa<ObjVar>(ptdnode) && isa<GlobalObjVar>(pag->getBaseObject(ptdnode->getId())))
             {

package/svf/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -135,7 +135,7 @@ void BVDataPTAImpl::expandFIObjs(const PointsTo& pts, PointsTo& expandedPts)
     expandedPts = pts;;
     for(PointsTo::iterator pit = pts.begin(), epit = pts.end(); pit!=epit; ++pit)
     {
-        if (pag->getBaseObjVar(*pit) == *pit || isFieldInsensitive(*pit))
+        if (pag->getBaseObjVarID(*pit) == *pit || isFieldInsensitive(*pit))
         {
             expandedPts |= pag->getAllFieldsObjVars(*pit);
         }
@@ -147,7 +147,7 @@ void BVDataPTAImpl::expandFIObjs(const NodeBS& pts, NodeBS& expandedPts)
     expandedPts = pts;
     for (const NodeID o : pts)
     {
-        if (pag->getBaseObjVar(o) == o || isFieldInsensitive(o))
+        if (pag->getBaseObjVarID(o) == o || isFieldInsensitive(o))
         {
             expandedPts |= pag->getAllFieldsObjVars(o);
         }
@@ -176,7 +176,7 @@ void BVDataPTAImpl::writeObjVarToFile(const string& filename)
     {
         PAGNode* pagNode = it->second;
         if (!isa<ObjVar>(pagNode)) continue;
-        NodeID n = pag->getBaseObjVar(it->first);
+        NodeID n = pag->getBaseObjVarID(it->first);
         if (NodeIDs.test(n)) continue;
         f << n << " ";
         f << isFieldInsensitive(n) << "\n";
@@ -224,10 +224,10 @@ void BVDataPTAImpl::writePtsResultToFile(std::fstream& f)
 void BVDataPTAImpl::writeGepObjVarMapToFile(std::fstream& f)
 {
     //write gepObjVarMap to file(in form of: baseID offset gepObjNodeId)
-    SVFIR::NodeOffsetMap &gepObjVarMap = pag->getGepObjNodeMap();
-    for(SVFIR::NodeOffsetMap::const_iterator it = gepObjVarMap.begin(), eit = gepObjVarMap.end(); it != eit; it++)
+    SVFIR::OffsetToGepVarMap &gepObjVarMap = pag->getGepObjNodeMap();
+    for(SVFIR::OffsetToGepVarMap::const_iterator it = gepObjVarMap.begin(), eit = gepObjVarMap.end(); it != eit; it++)
     {
-        const SVFIR::NodeOffset offsetPair = it -> first;
+        const SVFIR::GepOffset offsetPair = it -> first;
         //write the base id to file
         f << offsetPair.first << " ";
         //write the offset to file
@@ -270,7 +270,7 @@ void BVDataPTAImpl::writeToFile(const string& filename)
     {
         PAGNode* pagNode = it->second;
         if (!isa<ObjVar>(pagNode)) continue;
-        NodeID n = pag->getBaseObjVar(it->first);
+        NodeID n = pag->getBaseObjVarID(it->first);
         if (NodeIDs.test(n)) continue;
         f << n << " ";
         f << isFieldInsensitive(n) << "\n";
@@ -344,7 +344,7 @@ void BVDataPTAImpl::readGepObjVarMapFromFile(std::ifstream& F)
 {
     string line;
     //read GepObjVarMap from file
-    SVFIR::NodeOffsetMap gepObjVarMap = pag->getGepObjNodeMap();
+    SVFIR::OffsetToGepVarMap gepObjVarMap = pag->getGepObjNodeMap();
     while (F.good())
     {
         getline(F, line);
@@ -355,20 +355,20 @@ void BVDataPTAImpl::readGepObjVarMapFromFile(std::ifstream& F)
         size_t offset;
         NodeID id;
         ss >> base >> offset >>id;
-        SVFIR::NodeOffsetMap::const_iterator iter = gepObjVarMap.find(std::make_pair(base, offset));
+        SVFIR::OffsetToGepVarMap::const_iterator iter = gepObjVarMap.find(std::make_pair(base, offset));
         if (iter == gepObjVarMap.end())
         {
-            SVFVar* node = pag->getGNode(base);
+            const SVFVar* node = pag->getSVFVar(base);
             const BaseObjVar* obj = nullptr;
-            if (GepObjVar* gepObjVar = SVFUtil::dyn_cast<GepObjVar>(node))
+            if (const GepObjVar* gepObjVar = SVFUtil::dyn_cast<GepObjVar>(node))
             {
                 obj = gepObjVar->getBaseObj();
             }
-            else if (BaseObjVar* baseNode = SVFUtil::dyn_cast<BaseObjVar>(node))
+            else if (const BaseObjVar* baseNode = SVFUtil::dyn_cast<BaseObjVar>(node))
             {
                 obj = baseNode;
             }
-            else if (DummyObjVar* baseNode = SVFUtil::dyn_cast<DummyObjVar>(node))
+            else if (const DummyObjVar* baseNode = SVFUtil::dyn_cast<DummyObjVar>(node))
             {
                 obj = baseNode;
             }
@@ -446,7 +446,7 @@ void BVDataPTAImpl::dumpTopLevelPtsTo()
     for (OrderedNodeSet::iterator nIter = this->getAllValidPtrs().begin();
             nIter != this->getAllValidPtrs().end(); ++nIter)
     {
-        const PAGNode* node = getPAG()->getGNode(*nIter);
+        const SVFVar* node = getPAG()->getSVFVar(*nIter);
         if (getPAG()->isValidTopLevelPtr(node))
         {
             const PointsTo& pts = this->getPts(node->getId());
@@ -536,7 +536,7 @@ void BVDataPTAImpl::onTheFlyThreadCallGraphSolve(const CallSiteToFunPtrMap& call
                 const NodeBS targets = this->getPts(pVar->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())
@@ -558,7 +558,7 @@ void BVDataPTAImpl::onTheFlyThreadCallGraphSolve(const CallSiteToFunPtrMap& call
 void BVDataPTAImpl::normalizePointsTo()
 {
     SVFIR::MemObjToFieldsMap &memToFieldsMap = pag->getMemToFieldsMap();
-    SVFIR::NodeOffsetMap &GepObjVarMap = pag->getGepObjNodeMap();
+    SVFIR::OffsetToGepVarMap &GepObjVarMap = pag->getGepObjNodeMap();
 
     // collect each gep node whose base node has been set as field-insensitive
     NodeBS dropNodes;
@@ -572,7 +572,7 @@ void BVDataPTAImpl::normalizePointsTo()
         {
             for (NodeID id : t.second)
             {
-                if (SVFUtil::isa<GepObjVar>(pag->getGNode(id)))
+                if (SVFUtil::isa<GepObjVar>(pag->getSVFVar(id)))
                 {
                     dropNodes.set(id);
                 }
@@ -592,7 +592,7 @@ void BVDataPTAImpl::normalizePointsTo()
         {
             if (!dropNodes.test(obj))
                 continue;
-            NodeID baseObj = pag->getBaseObjVar(obj);
+            NodeID baseObj = pag->getBaseObjVarID(obj);
             clearPts(n, obj);
             addPts(n, baseObj);
         }
@@ -602,7 +602,7 @@ void BVDataPTAImpl::normalizePointsTo()
     // and remove those nodes from pag
     for (NodeID n: dropNodes)
     {
-        NodeID base = pag->getBaseObjVar(n);
+        NodeID base = pag->getBaseObjVarID(n);
         GepObjVar *gepNode = SVFUtil::dyn_cast<GepObjVar>(pag->getGNode(n));
         const APOffset apOffset = gepNode->getConstantFieldIdx();
         GepObjVarMap.erase(std::make_pair(base, apOffset));

package/svf/lib/SABER/SaberSVFGBuilder.cpp

@@ -79,7 +79,7 @@ void SaberSVFGBuilder::collectGlobals(BVDataPTAImpl* pta)
 
         if(GepObjVar* gepobj = SVFUtil::dyn_cast<GepObjVar>(pagNode))
         {
-            if(SVFUtil::isa<DummyObjVar>(pag->getGNode(gepobj->getBaseNode())))
+            if(SVFUtil::isa<DummyObjVar>(pag->getSVFVar(gepobj->getBaseNode())))
                 continue;
         }
         if ((isa<ObjVar>(pagNode) && isa<GlobalObjVar>(pag->getBaseObject(pagNode->getId()))) ||
@@ -121,7 +121,7 @@ PointsTo& SaberSVFGBuilder::CollectPtsChain(BVDataPTAImpl* pta, NodeID id, NodeT
 {
     SVFIR* pag = svfg->getPAG();
 
-    NodeID baseId = pag->getBaseObjVar(id);
+    NodeID baseId = pag->getBaseObjVarID(id);
     NodeToPTSSMap::iterator it = cachedPtsMap.find(baseId);
     if(it!=cachedPtsMap.end())
     {
@@ -135,7 +135,7 @@ PointsTo& SaberSVFGBuilder::CollectPtsChain(BVDataPTAImpl* pta, NodeID id, NodeT
         {
             if(pta->isFIObjNode(baseId))
             {
-                ValVar* valVar = SVFUtil::dyn_cast<ValVar>(pag->getGNode(baseId));
+                const ValVar* valVar = SVFUtil::dyn_cast<ValVar>(pag->getSVFVar(baseId));
                 if(valVar && valVar->getICFGNode() && SVFUtil::isExtCall(valVar->getICFGNode()))
                 {
                     return pts;

package/svf/lib/SVFIR/SVFIR.cpp

@@ -485,12 +485,12 @@ NodeID SVFIR::addGepValNode(NodeID curInst,const ValVar* baseVar, const AccessPa
  */
 NodeID SVFIR::getGepObjVar(NodeID id, const APOffset& apOffset)
 {
-    SVFVar* node = pag->getGNode(id);
-    if (GepObjVar* gepNode = SVFUtil::dyn_cast<GepObjVar>(node))
+    const SVFVar* node = pag->getSVFVar(id);
+    if (const GepObjVar* gepNode = SVFUtil::dyn_cast<GepObjVar>(node))
         return getGepObjVar(gepNode->getBaseObj(), gepNode->getConstantFieldIdx() + apOffset);
-    else if (BaseObjVar* baseNode = SVFUtil::dyn_cast<BaseObjVar>(node))
+    else if (const BaseObjVar* baseNode = SVFUtil::dyn_cast<BaseObjVar>(node))
         return getGepObjVar(baseNode, apOffset);
-    else if (DummyObjVar* baseNode = SVFUtil::dyn_cast<DummyObjVar>(node))
+    else if (const DummyObjVar* baseNode = SVFUtil::dyn_cast<DummyObjVar>(node))
         return getGepObjVar(baseNode, apOffset);
     else
     {
@@ -518,7 +518,7 @@ NodeID SVFIR::getGepObjVar(const BaseObjVar* baseObj, const APOffset& apOffset)
     // Base and first field are the same memory location.
     if (Options::FirstFieldEqBase() && newLS == 0) return base;
 
-    NodeOffsetMap::iterator iter = GepObjVarMap.find(std::make_pair(base, newLS));
+    OffsetToGepVarMap::iterator iter = GepObjVarMap.find(std::make_pair(base, newLS));
     if (iter == GepObjVarMap.end())
     {
         NodeID gepId = NodeIDAllocator::get()->allocateGepObjectId(base, apOffset, Options::MaxFieldLimit());
@@ -566,7 +566,7 @@ NodeBS& SVFIR::getAllFieldsObjVars(const BaseObjVar* obj)
  */
 NodeBS& SVFIR::getAllFieldsObjVars(NodeID id)
 {
-    const SVFVar* node = pag->getGNode(id);
+    const SVFVar* node = pag->getSVFVar(id);
     assert(SVFUtil::isa<ObjVar>(node) && "need an object node");
     return getAllFieldsObjVars(getBaseObject(id));
 }
@@ -578,7 +578,7 @@ NodeBS& SVFIR::getAllFieldsObjVars(NodeID id)
  */
 NodeBS SVFIR::getFieldsAfterCollapse(NodeID id)
 {
-    const SVFVar* node = pag->getGNode(id);
+    const SVFVar* node = pag->getSVFVar(id);
     assert(SVFUtil::isa<ObjVar>(node) && "need an object node");
     const BaseObjVar* obj = getBaseObject(id);
     if(obj->isFieldInsensitive())
@@ -732,7 +732,7 @@ void SVFIR::initialiseCandidatePointers()
  */
 bool SVFIR::isValidPointer(NodeID nodeId) const
 {
-    SVFVar* node = pag->getGNode(nodeId);
+    const SVFVar* node = pag->getSVFVar(nodeId);
 
     if(node->isPointer())
         if (const ValVar* pVar = pag->getBaseValVar(nodeId))

package/svf/lib/Util/CDGBuilder.cpp

@@ -230,7 +230,7 @@ void CDGBuilder::buildICFGNodeControlMap()
                         SVFIR* pag = PAG::getPAG();
                         _controlDG->addCDGEdgeFromSrcDst(
                             controlNode, controllee,
-                            pag->getGNode(pag->getNullPtr()), pos);
+                            pag->getSVFVar(pag->getNullPtr()), pos);
                     }
 
                 }

package/svf/lib/WPA/Andersen.cpp

@@ -394,21 +394,21 @@ void AndersenBase::heapAllocatorViaIndCall(const CallICFGNode* cs, NodePairSet &
 void AndersenBase::normalizePointsTo()
 {
     SVFIR::MemObjToFieldsMap &memToFieldsMap = pag->getMemToFieldsMap();
-    SVFIR::NodeOffsetMap &GepObjVarMap = pag->getGepObjNodeMap();
+    SVFIR::OffsetToGepVarMap &GepObjVarMap = pag->getGepObjNodeMap();
 
     // clear GepObjVarMap/memToFieldsMap/nodeToSubsMap/nodeToRepMap
     // for redundant gepnodes and remove those nodes from pag
     for (NodeID n: redundantGepNodes)
     {
-        NodeID base = pag->getBaseObjVar(n);
-        GepObjVar *gepNode = SVFUtil::dyn_cast<GepObjVar>(pag->getGNode(n));
+        NodeID base = pag->getBaseObjVarID(n);
+        const GepObjVar* gepNode = pag->getGepObjVar(n);
         assert(gepNode && "Not a gep node in redundantGepNodes set");
         const APOffset apOffset = gepNode->getConstantFieldIdx();
         GepObjVarMap.erase(std::make_pair(base, apOffset));
         memToFieldsMap[base].reset(n);
         cleanConsCG(n);
 
-        pag->removeGNode(gepNode);
+        pag->removeGNode(const_cast<GepObjVar*>(gepNode));
     }
 }
 
@@ -556,7 +556,7 @@ bool Andersen::processLoad(NodeID node, const ConstraintEdge* load)
     ///       make gcc in spec 2000 pass the flow-sensitive analysis.
     ///       Try to handle black hole obj in an appropriate way.
 //	if (pag->isBlkObjOrConstantObj(node))
-    if (pag->isConstantObj(node) || pag->getGNode(load->getDstID())->isPointer() == false)
+    if (pag->isConstantObj(node) || pag->getSVFVar(load->getDstID())->isPointer() == false)
         return false;
 
     numOfProcessedLoad++;
@@ -576,7 +576,7 @@ bool Andersen::processStore(NodeID node, const ConstraintEdge* store)
     ///       make gcc in spec 2000 pass the flow-sensitive analysis.
     ///       Try to handle black hole obj in an appropriate way
 //	if (pag->isBlkObjOrConstantObj(node))
-    if (pag->isConstantObj(node) || pag->getGNode(store->getSrcID())->isPointer() == false)
+    if (pag->isConstantObj(node) || pag->getSVFVar(store->getSrcID())->isPointer() == false)
         return false;
 
     numOfProcessedStore++;
@@ -640,7 +640,7 @@ bool Andersen::processGepPts(const PointsTo& pts, const GepCGEdge* edge)
             if (!isFieldInsensitive(o))
             {
                 setObjFieldInsensitive(o);
-                consCG->addNodeToBeCollapsed(consCG->getBaseObjVar(o));
+                consCG->addNodeToBeCollapsed(consCG->getBaseObjVarID(o));
             }
 
             // Add the field-insensitive node into pts.
@@ -932,7 +932,7 @@ void Andersen::dumpTopLevelPtsTo()
     for (OrderedNodeSet::iterator nIter = this->getAllValidPtrs().begin();
             nIter != this->getAllValidPtrs().end(); ++nIter)
     {
-        const PAGNode* node = getPAG()->getGNode(*nIter);
+        const SVFVar* node = getPAG()->getSVFVar(*nIter);
         if (getPAG()->isValidTopLevelPtr(node))
         {
             const PointsTo& pts = this->getPts(node->getId());
@@ -955,7 +955,7 @@ void Andersen::dumpTopLevelPtsTo()
                 for (multiset<u32_t>::const_iterator it = line.begin(); it != line.end(); ++it)
                 {
                     if(Options::PrintFieldWithBasePrefix())
-                        if (auto gepNode = SVFUtil::dyn_cast<GepObjVar>(pag->getGNode(*it)))
+                        if (auto gepNode = pag->getGepObjVar(*it))
                             outs() << gepNode->getBaseNode() << "_" << gepNode->getConstantFieldIdx() << " ";
                         else
                             outs() << *it << " ";

package/svf/lib/WPA/AndersenStat.cpp

@@ -73,10 +73,10 @@ void AndersenStat::collectCycleInfo(ConstraintGraph* consCG)
         for (NodeBS::iterator it = subNodes.begin(), eit = subNodes.end(); it != eit; ++it)
         {
             NodeID nodeId = *it;
-            PAGNode* pagNode = pta->getPAG()->getGNode(nodeId);
+            const SVFVar* pagNode = pta->getPAG()->getSVFVar(nodeId);
             if (SVFUtil::isa<ObjVar>(pagNode) && pta->isFieldInsensitive(nodeId))
             {
-                NodeID baseId = consCG->getBaseObjVar(nodeId);
+                NodeID baseId = consCG->getBaseObjVarID(nodeId);
                 clone.reset(nodeId);
                 clone.set(baseId);
             }
@@ -141,7 +141,7 @@ void AndersenStat::constraintGraphStat()
         if(nodeIt->second->getInEdges().empty() && nodeIt->second->getOutEdges().empty())
             continue;
         cgNodeNumber++;
-        if(SVFUtil::isa<ObjVar>(pta->getPAG()->getGNode(nodeIt->first)))
+        if(SVFUtil::isa<ObjVar>(pta->getPAG()->getSVFVar(nodeIt->first)))
             objNodeNumber++;
 
         u32_t nCopyIn = nodeIt->second->getDirectInEdges().size();
@@ -289,7 +289,7 @@ void AndersenStat::performStat()
         totalPointers++;
         totalPtsSize+=size;
 
-        if(pta->getPAG()->isValidTopLevelPtr(pta->getPAG()->getGNode(node)))
+        if(pta->getPAG()->isValidTopLevelPtr(pta->getPAG()->getSVFVar(node)))
         {
             totalTopLevPointers++;
             totalTopLevPtsSize+=size;