svf-lib 1.0.786 → 1.0.790

package/SVF-osx/include/SABER/SaberCheckerAPI.h

@@ -105,7 +105,7 @@ public:
     {
         return getType(SVFUtil::getCallee(inst)) == CK_ALLOC;
     }
-    inline bool isMemAlloc(const CallBlockNode* cs) const
+    inline bool isMemAlloc(const CallICFGNode* cs) const
     {
         return isMemAlloc(cs->getCallSite());
     }
@@ -121,7 +121,7 @@ public:
     {
         return getType(SVFUtil::getCallee(inst)) == CK_FREE;
     }
-    inline bool isMemDealloc(const CallBlockNode* cs) const
+    inline bool isMemDealloc(const CallICFGNode* cs) const
     {
         return isMemDealloc(cs->getCallSite());
     }
@@ -137,7 +137,7 @@ public:
     {
         return getType(SVFUtil::getCallee(inst)) == CK_FOPEN;
     }
-    inline bool isFOpen(const CallBlockNode* cs) const
+    inline bool isFOpen(const CallICFGNode* cs) const
     {
         return isFOpen(cs->getCallSite());
     }
@@ -153,7 +153,7 @@ public:
     {
         return getType(SVFUtil::getCallee(inst)) == CK_FCLOSE;
     }
-    inline bool isFClose(const CallBlockNode* cs) const
+    inline bool isFClose(const CallICFGNode* cs) const
     {
         return isFClose(cs->getCallSite());
     }

package/SVF-osx/include/SABER/SaberSVFGBuilder.h

@@ -57,7 +57,7 @@ public:
     }
 
     /// Add ActualParmVFGNode
-    inline void addActualParmVFGNode(const PAGNode* pagNode, const CallBlockNode* cs)
+    inline void addActualParmVFGNode(const PAGNode* pagNode, const CallICFGNode* cs)
     {
     	svfg->addActualParmVFGNode(pagNode, cs);
     }

package/SVF-osx/include/SABER/SrcSnkDDA.h

@@ -53,7 +53,7 @@ public:
     typedef CxtDPItem DPIm;
     typedef Set<DPIm> DPImSet;							///< dpitem set
     typedef Map<const SVFGNode*, DPImSet> SVFGNodeToDPItemsMap; 	///< map a SVFGNode to its visited dpitems
-    typedef Set<const CallBlockNode*> CallSiteSet;
+    typedef Set<const CallICFGNode*> CallSiteSet;
     typedef NodeBS SVFGNodeBS;
     typedef ProgSlice::VFWorkList WorkList;
 

package/SVF-osx/include/SVF-FE/ICFGBuilder.h

@@ -69,7 +69,7 @@ private:
     void connectGlobalToProgEntry(SVFModule* svfModule);
 
     /// Add/Get an inter block ICFGNode
-    InterBlockNode* getOrAddInterBlockICFGNode(const Instruction* inst);
+    InterICFGNode* getOrAddInterBlockICFGNode(const Instruction* inst);
 
     /// Add/Get a basic block ICFGNode
     inline ICFGNode* getOrAddBlockICFGNode(const Instruction* inst)
@@ -84,18 +84,18 @@ private:
     void addICFGInterEdges(const Instruction*  cs, const SVFFunction*  callee);
 
     /// Add a call node
-    inline CallBlockNode* getOrAddCallICFGNode(const Instruction*  cs)
+    inline CallICFGNode* getOrAddCallICFGNode(const Instruction*  cs)
     {
         return icfg->getCallBlockNode(cs);
     }
     /// Add a return node
-    inline RetBlockNode* getOrAddRetICFGNode(const Instruction*  cs)
+    inline RetICFGNode* getOrAddRetICFGNode(const Instruction*  cs)
     {
         return icfg->getRetBlockNode(cs);
     }
 
     /// Add and get IntraBlock ICFGNode
-    IntraBlockNode* getOrAddIntraBlockICFGNode(const Instruction* inst)
+    IntraICFGNode* getOrAddIntraBlockICFGNode(const Instruction* inst)
     {
         return icfg->getIntraBlockNode(inst);
     }

package/SVF-osx/include/SVF-FE/SVFIRBuilder.h

@@ -343,7 +343,7 @@ public:
     /// Add Store edge
     inline StoreStmt* addStoreEdge(NodeID src, NodeID dst)
     {
-        IntraBlockNode* node;
+        IntraICFGNode* node;
         if(const Instruction* inst = SVFUtil::dyn_cast<Instruction>(curVal))
             node = pag->getICFG()->getIntraBlockNode(inst);
         else
@@ -353,14 +353,14 @@ public:
         return edge;
     }
     /// Add Call edge
-    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallBlockNode* cs)
+    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
     {
         CallPE *edge = pag->addCallPE(src, dst, cs);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Return edge
-    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallBlockNode* cs)
+    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
     {
         RetPE *edge = pag->addRetPE(src, dst, cs);
         setCurrentBBAndValueForPAGEdge(edge);
@@ -388,14 +388,14 @@ public:
         return edge;
     }
     /// Add Thread fork edge for parameter passing
-    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallBlockNode* cs)
+    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
     {
         TDForkPE *edge = pag->addThreadForkPE(src, dst, cs);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Thread join edge for parameter passing
-    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallBlockNode* cs)
+    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
     {
         TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs);
         setCurrentBBAndValueForPAGEdge(edge);

package/package.json

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