svf-lib 1.0.1676 → 1.0.1678

package/SVF-linux/svf/include/Graphs/CFBasicBlockG.h

@@ -71,6 +71,11 @@ public:
     {
     }
 
+    CFBasicBlockEdge(CFBasicBlockNode* src, CFBasicBlockNode* dst)
+        : GenericCFBasicBlockEdgeTy(src, dst, 0), _icfgEdge(nullptr)
+    {
+    }
+
     friend std::ostream &operator<<(std::ostream &o, const CFBasicBlockEdge &edge)
     {
         o << edge.toString();
@@ -351,7 +356,7 @@ private:
     u32_t _totalCFBasicBlockNode{0};
     u32_t _totalCFBasicBlockEdge{0};
     Map<const SVFBasicBlock*, CFBasicBlockNode*> _bbToNode;
-
+    Map<const SVFFunction*, CFBasicBlockNode*> _funToFirstNode;
 public:
 
     CFBasicBlockGraph() = default;
@@ -392,6 +397,37 @@ public:
         return bb && _bbToNode.find(bb) != _bbToNode.end();
     }
 
+    inline CFBasicBlockNode* getFirstCFBasicBlockNode(const SVFFunction* fun) const
+    {
+        if (fun && _funToFirstNode.find(fun) != _funToFirstNode.end())
+        {
+            return _funToFirstNode.at(fun);
+        }
+        else
+        {
+            return nullptr;
+        }
+    }
+    inline bool hasFirstCFBasicBlockNode(const SVFFunction* fun) const
+    {
+        return fun && _funToFirstNode.find(fun) != _funToFirstNode.end();
+    }
+
+    inline void setFirstCFBasicBlockNode(const Map<const SVFFunction*, CFBasicBlockNode*>& svfNodeMap)
+    {
+        _funToFirstNode = svfNodeMap;
+    }
+
+    inline void setBBCFNodeMap(const Map<const SVFBasicBlock*, CFBasicBlockNode*>& svfNodeMap)
+    {
+        _bbToNode = svfNodeMap;
+    }
+
+    inline const Map<const SVFBasicBlock*, CFBasicBlockNode*>& getBBCFNodeMap() const
+    {
+        return _bbToNode;
+    }
+
     bool hasCFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst, ICFGEdge *icfgEdge)
     {
         CFBasicBlockEdge edge(src, dst, icfgEdge);

package/SVF-osx/svf/include/Graphs/CFBasicBlockG.h

@@ -355,7 +355,6 @@ class CFBasicBlockGraph : public GenericCFBasicBlockGTy
 private:
     u32_t _totalCFBasicBlockNode{0};
     u32_t _totalCFBasicBlockEdge{0};
-    Map<const SVFBasicBlock*, CFBasicBlockNode*> _bbToNode;
     Map<const SVFFunction*, CFBasicBlockNode*> _funToFirstNode;
 public:
 
@@ -380,23 +379,6 @@ public:
         return hasGNode(id);
     }
 
-    inline CFBasicBlockNode* getCFBasicBlockNode(const SVFBasicBlock* bb) const
-    {
-        if (bb && _bbToNode.find(bb) != _bbToNode.end())
-        {
-            return _bbToNode.at(bb);
-        }
-        else
-        {
-            return nullptr;
-        }
-    }
-
-    inline bool hasCFBasicBlockNode(const SVFBasicBlock* bb) const
-    {
-        return bb && _bbToNode.find(bb) != _bbToNode.end();
-    }
-
     inline CFBasicBlockNode* getFirstCFBasicBlockNode(const SVFFunction* fun) const
     {
         if (fun && _funToFirstNode.find(fun) != _funToFirstNode.end())
@@ -418,16 +400,6 @@ public:
         _funToFirstNode = svfNodeMap;
     }
 
-    inline void setBBCFNodeMap(const Map<const SVFBasicBlock*, CFBasicBlockNode*>& svfNodeMap)
-    {
-        _bbToNode = svfNodeMap;
-    }
-
-    inline const Map<const SVFBasicBlock*, CFBasicBlockNode*>& getBBCFNodeMap() const
-    {
-        return _bbToNode;
-    }
-
     bool hasCFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst, ICFGEdge *icfgEdge)
     {
         CFBasicBlockEdge edge(src, dst, icfgEdge);

package/package.json

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