svf-lib 1.0.2479 → 1.0.2480

package/SVF-linux-aarch64/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-linux-aarch64/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-linux-aarch64/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-linux-aarch64/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-linux-aarch64/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-linux-aarch64/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.2479",
+  "version": "1.0.2480",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {