svf-tools 1.0.1038 → 1.0.1040

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1038",
+  "version": "1.0.1040",
   "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/Graphs/SCC.h

@@ -123,14 +123,35 @@ public:
 
 
     // Return a handle to the stack of nodes in topological
-    // order.  This will be used to seed the initial solution
+    // order. This will be used to seed the initial solution
     // and improve efficiency.
     inline GNodeStack &topoNodeStack()
     {
         return _T;
     }
 
-    const inline  GNODESCCInfoMap &GNodeSCCInfo() const
+    inline const GNodeStack& topoNodeStack() const
+    {
+        return _T;
+    }
+
+    /// Return a handle to the stack of nodes in reverse topological
+    /// order. This will be used to seed the initial solution
+    /// and improve efficiency.
+    inline FIFOWorkList<NodeID> revTopoNodeStack() const
+    {
+        FIFOWorkList<NodeID> revTopoOrder;
+        GNodeStack topoOrder = topoNodeStack();
+        while(!topoOrder.empty())
+        {
+            NodeID nodeID = topoOrder.top();
+            topoOrder.pop();
+            revTopoOrder.push(nodeID);
+        }
+        return revTopoOrder;
+    }
+
+    const inline GNODESCCInfoMap &GNodeSCCInfo() const
     {
         return _NodeSCCAuxInfo;
     }

package/svf/include/MSSA/MemRegion.h

@@ -268,8 +268,6 @@ private:
     /// Get all the objects in callee's modref escaped via global objects (the chain pts of globals)
     void getEscapObjviaGlobals(NodeBS& globs, const NodeBS& pts);
 
-    /// Get reverse topo call graph scc
-    void getCallGraphSCCRevTopoOrder(WorkList& worklist);
 
 protected:
     MRGenerator(BVDataPTAImpl* p, bool ptrOnly);

package/svf/include/WPA/WPAFSSolver.h

@@ -69,31 +69,23 @@ protected:
         /// SCC detection
         this->getSCCDetector()->find();
 
+        assert(nodeStack.empty() && "node stack is not empty, some nodes are not popped properly.");
+
         /// Both rep and sub nodes need to be processed later.
         /// Collect sub nodes from SCCDetector.
-        NodeStack revTopoStack;
-        NodeStack& topoStack = this->getSCCDetector()->topoNodeStack();
-        while (!topoStack.empty())
+        FIFOWorkList<NodeID> revTopoStack = this->getSCCDetector()->revTopoNodeStack();
+        while (!revTopoStack.empty())
         {
-            NodeID nodeId = topoStack.top();
-            topoStack.pop();
+            NodeID nodeId = revTopoStack.front();
+            revTopoStack.pop();
             const NodeBS& subNodes = this->getSCCDetector()->subNodes(nodeId);
             for (NodeBS::iterator it = subNodes.begin(), eit = subNodes.end(); it != eit; ++it)
             {
-                revTopoStack.push(*it);
+                /// restore the topological order.
+                nodeStack.push(*it);
             }
         }
 
-        assert(nodeStack.empty() && "node stack is not empty, some nodes are not popped properly.");
-
-        /// restore the topological order.
-        while (!revTopoStack.empty())
-        {
-            NodeID nodeId = revTopoStack.top();
-            revTopoStack.pop();
-            nodeStack.push(nodeId);
-        }
-
         return nodeStack;
     }
 };

package/svf/lib/MSSA/MemRegion.cpp

@@ -238,12 +238,12 @@ void MRGenerator::collectModRefForCall()
 
     DBOUT(DGENERAL, outs() << pasMsg("\t\tPerform Callsite Mod-Ref \n"));
 
-    WorkList worklist;
-    getCallGraphSCCRevTopoOrder(worklist);
+    WorkList worklist = callGraphSCC->revTopoNodeStack();
 
     while(!worklist.empty())
     {
-        NodeID callGraphNodeID = worklist.pop();
+        NodeID callGraphNodeID = worklist.front();
+        worklist.pop();
         /// handle all sub scc nodes of this rep node
         const NodeBS& subNodes = callGraphSCC->subNodes(callGraphNodeID);
         for(NodeBS::iterator it = subNodes.begin(), eit = subNodes.end(); it!=eit; ++it)
@@ -456,21 +456,6 @@ bool MRGenerator::addModSideEffectOfCallSite(const CallICFGNode* cs, const NodeB
 }
 
 
-/*!
- * Get the reverse topo order of scc call graph
- */
-void MRGenerator::getCallGraphSCCRevTopoOrder(WorkList& worklist)
-{
-
-    NodeStack& topoOrder = callGraphSCC->topoNodeStack();
-    while(!topoOrder.empty())
-    {
-        NodeID callgraphNodeID = topoOrder.top();
-        topoOrder.pop();
-        worklist.push(callgraphNodeID);
-    }
-}
-
 /*!
  * Get all objects might pass into and pass out of callee(s) from a callsite
  */

package/svf/lib/WPA/Andersen.cpp

@@ -709,25 +709,16 @@ inline void Andersen::collapseFields()
  */
 void Andersen::mergeSccCycle()
 {
-    NodeStack revTopoOrder;
-    NodeStack & topoOrder = getSCCDetector()->topoNodeStack();
+    NodeStack topoOrder = getSCCDetector()->topoNodeStack();
+
     while (!topoOrder.empty())
     {
         NodeID repNodeId = topoOrder.top();
         topoOrder.pop();
-        revTopoOrder.push(repNodeId);
         const NodeBS& subNodes = getSCCDetector()->subNodes(repNodeId);
         // merge sub nodes to rep node
         mergeSccNodes(repNodeId, subNodes);
     }
-
-    // restore the topological order for later solving.
-    while (!revTopoOrder.empty())
-    {
-        NodeID nodeId = revTopoOrder.top();
-        revTopoOrder.pop();
-        topoOrder.push(nodeId);
-    }
 }