svf-lib 1.0.2011 → 1.0.2013

package/SVF-linux/Release-build/include/AE/Core/ICFGWTO.h

@@ -41,8 +41,8 @@ namespace SVF
 {
 
 typedef WTOComponent<ICFG> ICFGWTOComp;
-typedef WTONode<ICFG> ICFGWTONode;
-typedef WTOCycle<ICFG> ICFGWTOCycle;
+typedef WTONode<ICFG> ICFGSingletonWTO;
+typedef WTOCycle<ICFG> ICFGCycleWTO;
 
 class ICFGWTO : public WTO<ICFG>
 {

package/SVF-linux/Release-build/include/AE/Svfexe/AbstractInterpretation.h

@@ -157,11 +157,11 @@ protected:
     bool isBranchFeasible(const IntraCFGEdge* intraEdge, AbstractState& as);
 
     /**
-     * handle instructions in ICFGNode
+     * handle instructions in ICFGSingletonWTO
      *
-     * @param block basic block that has a series of instructions
+     * @param block basic block that has one instruction or a series of instructions
      */
-    virtual void handleWTONode(const ICFGNode* node);
+    virtual void handleWTONode(const ICFGSingletonWTO *icfgSingletonWto);
 
     /**
      * handle one instruction in ICFGNode
@@ -182,7 +182,7 @@ protected:
      *
      * @param cycle WTOCycle which has weak topo order of basic blocks and nested cycles
      */
-    virtual void handleCycle(const ICFGWTOCycle* cycle);
+    virtual void handleCycle(const ICFGCycleWTO* cycle);
 
     /**
      * handle user defined function, ext function is not included.

package/SVF-linux/Release-build/include/Graphs/WTO.h

@@ -395,21 +395,21 @@ public:
 
 private:
     /// Head of the cycle
-    const NodeT* _head;
+    const WTONode<GraphT>* _head;
 
     /// List of components
     WTOComponentRefList _components;
 
 public:
     /// Constructor
-    WTOCycle(const NodeT* head, WTOComponentRefList components)
+    WTOCycle(const WTONode<GraphT>* head, WTOComponentRefList components)
         : WTOComponent<GraphT>(WTOComponent<GraphT>::Cycle), _head(head),
           _components(std::move(components))
     {
     }
 
     /// Return the head of the cycle
-    const NodeT* head() const
+    const WTONode<GraphT>* head() const
     {
         return _head;
     }
@@ -451,7 +451,7 @@ public:
         std::string str;
         std::stringstream rawstr(str);
         rawstr << "(";
-        rawstr << _head->getId() << ", ";
+        rawstr << _head->node()->getId() << ", ";
         for (auto it = begin(), et = end(); it != et;)
         {
             rawstr << (*it)->toString();
@@ -687,7 +687,7 @@ protected:
 
         void visit(const WTOCycleT& cycle) override
         {
-            const NodeT* head = cycle.head();
+            const NodeT* head = cycle.head()->node();
             WTOCycleDepthPtr previous_cycleDepth = _wtoCycleDepth;
             _nodeToWTOCycleDepth.insert(std::make_pair(head, _wtoCycleDepth));
             _wtoCycleDepth =
@@ -765,7 +765,7 @@ protected:
         return ptr;
     }
 
-    const WTOCycleT* newCycle(const NodeT* node,
+    const WTOCycleT* newCycle(const WTONodeT* node,
                               const WTOComponentRefList& partition)
     {
         const WTOCycleT* ptr = new WTOCycleT(node, std::move(partition));
@@ -784,7 +784,8 @@ protected:
                 visit(succ, partition);
             }
         });
-        const WTOCycleT* ptr = newCycle(node, partition);
+        const WTONodeT* head = newNode(node);
+        const WTOCycleT* ptr = newCycle(head, partition);
         headRefToCycle.emplace(node, ptr);
         return ptr;
     }

package/SVF-osx/Release-build/include/AE/Core/ICFGWTO.h

@@ -41,8 +41,8 @@ namespace SVF
 {
 
 typedef WTOComponent<ICFG> ICFGWTOComp;
-typedef WTONode<ICFG> ICFGWTONode;
-typedef WTOCycle<ICFG> ICFGWTOCycle;
+typedef WTONode<ICFG> ICFGSingletonWTO;
+typedef WTOCycle<ICFG> ICFGCycleWTO;
 
 class ICFGWTO : public WTO<ICFG>
 {

package/SVF-osx/Release-build/include/AE/Svfexe/AbstractInterpretation.h

@@ -157,11 +157,11 @@ protected:
     bool isBranchFeasible(const IntraCFGEdge* intraEdge, AbstractState& as);
 
     /**
-     * handle instructions in ICFGNode
+     * handle instructions in ICFGSingletonWTO
      *
-     * @param block basic block that has a series of instructions
+     * @param block basic block that has one instruction or a series of instructions
      */
-    virtual void handleWTONode(const ICFGNode* node);
+    virtual void handleWTONode(const ICFGSingletonWTO *icfgSingletonWto);
 
     /**
      * handle one instruction in ICFGNode
@@ -182,7 +182,7 @@ protected:
      *
      * @param cycle WTOCycle which has weak topo order of basic blocks and nested cycles
      */
-    virtual void handleCycle(const ICFGWTOCycle* cycle);
+    virtual void handleCycle(const ICFGCycleWTO* cycle);
 
     /**
      * handle user defined function, ext function is not included.

package/SVF-osx/Release-build/include/Graphs/WTO.h

@@ -395,21 +395,21 @@ public:
 
 private:
     /// Head of the cycle
-    const NodeT* _head;
+    const WTONode<GraphT>* _head;
 
     /// List of components
     WTOComponentRefList _components;
 
 public:
     /// Constructor
-    WTOCycle(const NodeT* head, WTOComponentRefList components)
+    WTOCycle(const WTONode<GraphT>* head, WTOComponentRefList components)
         : WTOComponent<GraphT>(WTOComponent<GraphT>::Cycle), _head(head),
           _components(std::move(components))
     {
     }
 
     /// Return the head of the cycle
-    const NodeT* head() const
+    const WTONode<GraphT>* head() const
     {
         return _head;
     }
@@ -451,7 +451,7 @@ public:
         std::string str;
         std::stringstream rawstr(str);
         rawstr << "(";
-        rawstr << _head->getId() << ", ";
+        rawstr << _head->node()->getId() << ", ";
         for (auto it = begin(), et = end(); it != et;)
         {
             rawstr << (*it)->toString();
@@ -687,7 +687,7 @@ protected:
 
         void visit(const WTOCycleT& cycle) override
         {
-            const NodeT* head = cycle.head();
+            const NodeT* head = cycle.head()->node();
             WTOCycleDepthPtr previous_cycleDepth = _wtoCycleDepth;
             _nodeToWTOCycleDepth.insert(std::make_pair(head, _wtoCycleDepth));
             _wtoCycleDepth =
@@ -765,7 +765,7 @@ protected:
         return ptr;
     }
 
-    const WTOCycleT* newCycle(const NodeT* node,
+    const WTOCycleT* newCycle(const WTONodeT* node,
                               const WTOComponentRefList& partition)
     {
         const WTOCycleT* ptr = new WTOCycleT(node, std::move(partition));
@@ -784,7 +784,8 @@ protected:
                 visit(succ, partition);
             }
         });
-        const WTOCycleT* ptr = newCycle(node, partition);
+        const WTONodeT* head = newNode(node);
+        const WTOCycleT* ptr = newCycle(head, partition);
         headRefToCycle.emplace(node, ptr);
         return ptr;
     }

package/package.json

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