SVF-tools · yuleisui · Jan 31, 2025 · Jan 26, 2025 · Jan 26, 2025 · Jan 26, 2025
diff --git a/svf/include/Graphs/SCC.h b/svf/include/Graphs/SCC.h
@@ -130,12 +130,17 @@ class SCCDetection
         return _T;
     }
 
+    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 GNodeStack revTopoNodeStack()
+    inline FIFOWorkList<NodeID> revTopoNodeStack() const
     {
-        GNodeStack revTopoOrder;
+        FIFOWorkList<NodeID> revTopoOrder;
         GNodeStack topoOrder = topoNodeStack();
         while(!topoOrder.empty())
         {

diff --git a/svf/include/MSSA/MemRegion.h b/svf/include/MSSA/MemRegion.h
@@ -268,8 +268,6 @@ class MRGenerator
     /// 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);

diff --git a/svf/include/WPA/WPAFSSolver.h b/svf/include/WPA/WPAFSSolver.h
@@ -73,10 +73,10 @@ class WPAFSSolver : public WPASolver<GraphType>
 
         /// Both rep and sub nodes need to be processed later.
         /// Collect sub nodes from SCCDetector.
-        NodeStack revTopoStack = this->getSCCDetector()->revTopoNodeStack();
+        FIFOWorkList<NodeID> revTopoStack = this->getSCCDetector()->revTopoNodeStack();
         while (!revTopoStack.empty())
         {
-            NodeID nodeId = revTopoStack.top();
+            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)

diff --git a/svf/lib/MSSA/MemRegion.cpp b/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,20 +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 revTopoNodeStack = callGraphSCC->revTopoNodeStack();
-    while(!revTopoNodeStack.empty())
-    {
-        NodeID callgraphNodeID = revTopoNodeStack.top();
-        revTopoNodeStack.pop();
-        worklist.push(callgraphNodeID);
-    }
-}
-
 /*!
  * Get all objects might pass into and pass out of callee(s) from a callsite
  */

diff --git a/svf/lib/WPA/Andersen.cpp b/svf/lib/WPA/Andersen.cpp
@@ -709,12 +709,12 @@ inline void Andersen::collapseFields()
  */
 void Andersen::mergeSccCycle()
 {
-    NodeStack revTopoOrder = getSCCDetector()->revTopoNodeStack();
-    while (!revTopoOrder.empty())
-    {
-        NodeID repNodeId = revTopoOrder.top();
-        revTopoOrder.pop();
+    NodeStack topoOrder = getSCCDetector()->topoNodeStack();
 
+    while (!topoOrder.empty())
+    {
+        NodeID repNodeId = topoOrder.top();
+        topoOrder.pop();
         const NodeBS& subNodes = getSCCDetector()->subNodes(repNodeId);
         // merge sub nodes to rep node
         mergeSccNodes(repNodeId, subNodes);