svf-tools 1.0.1198 → 1.0.1200

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1198",
+  "version": "1.0.1200",
   "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/AE/Svfexe/AbstractInterpretation.h

@@ -267,7 +267,6 @@ private:
      */
     void collectCycleHeads(const std::list<const ICFGWTOComp*>& comps);
 
-
     /**
      * handle SVF Statement like CmpStmt, CallStmt, GepStmt, LoadStmt, StoreStmt, etc.
      *

package/svf/include/Util/WorkList.h

@@ -42,6 +42,7 @@
 #include <cstdlib>
 #include <vector>
 #include <deque>
+#include <list>
 #include <set>
 
 namespace SVF
@@ -141,6 +142,20 @@ class FIFOWorkList
 public:
     FIFOWorkList() {}
 
+    /// Construct from a vector, pushing all elements in order
+    explicit FIFOWorkList(const std::vector<Data>& vec)
+    {
+        for (const Data& d : vec)
+            push(d);
+    }
+
+    /// Construct from a list, pushing all elements in order
+    explicit FIFOWorkList(const std::list<Data>& lst)
+    {
+        for (const Data& d : lst)
+            push(d);
+    }
+
     ~FIFOWorkList() {}
 
     inline bool empty() const
@@ -233,6 +248,20 @@ class FILOWorkList
 public:
     FILOWorkList() {}
 
+    /// Construct from a vector, pushing all elements in order
+    explicit FILOWorkList(const std::vector<Data>& vec)
+    {
+        for (const Data& d : vec)
+            push(d);
+    }
+
+    /// Construct from a list, pushing all elements in order
+    explicit FILOWorkList(const std::list<Data>& lst)
+    {
+        for (const Data& d : lst)
+            push(d);
+    }
+
     ~FILOWorkList() {}
 
     inline bool empty() const

package/svf/lib/AE/Svfexe/AbstractInterpretation.cpp

@@ -807,46 +807,31 @@ std::vector<const ICFGNode*> AbstractInterpretation::getNextNodesOfCycle(const I
 }
 
 /**
- * Handle a function using worklist algorithm
- * This replaces the recursive WTO component handling with explicit worklist iteration
+ * Handle a function using worklist algorithm guided by WTO order.
+ * All top-level WTO components are pushed into the worklist upfront,
+ * so the traversal order is exactly the WTO order — each node is
+ * visited once, and cycles are handled as whole components.
  */
 void AbstractInterpretation::handleFunction(const ICFGNode* funEntry, const CallICFGNode* caller)
 {
-    FIFOWorkList<const ICFGNode*> worklist;
-    worklist.push(funEntry);
+    auto it = funcToWTO.find(funEntry->getFun());
+    if (it == funcToWTO.end())
+        return;
+
+    // Push all top-level WTO components into the worklist in WTO order
+    FIFOWorkList<const ICFGWTOComp*> worklist(it->second->getWTOComponents());
 
     while (!worklist.empty())
     {
-        const ICFGNode* node = worklist.pop();
+        const ICFGWTOComp* comp = worklist.pop();
 
-        // Check if this node is a cycle head
-        if (cycleHeadToCycle.find(node) != cycleHeadToCycle.end())
+        if (const ICFGSingletonWTO* singleton = SVFUtil::dyn_cast<ICFGSingletonWTO>(comp))
         {
-            const ICFGCycleWTO* cycle = cycleHeadToCycle[node];
-            handleLoopOrRecursion(cycle, caller);
-
-            // Push nodes outside the cycle to the worklist
-            std::vector<const ICFGNode*> cycleNextNodes = getNextNodesOfCycle(cycle);
-            for (const ICFGNode* nextNode : cycleNextNodes)
-            {
-                worklist.push(nextNode);
-            }
+            handleICFGNode(singleton->getICFGNode());
         }
-        else
+        else if (const ICFGCycleWTO* cycle = SVFUtil::dyn_cast<ICFGCycleWTO>(comp))
         {
-            // Handle regular node
-            if (!handleICFGNode(node))
-            {
-                // Fixpoint reached or infeasible, skip successors
-                continue;
-            }
-
-            // Push successor nodes to the worklist
-            std::vector<const ICFGNode*> nextNodes = getNextNodes(node);
-            for (const ICFGNode* nextNode : nextNodes)
-            {
-                worklist.push(nextNode);
-            }
+            handleLoopOrRecursion(cycle, caller);
         }
     }
 }