fix incorrect implementation of getting CallGraphSCCRevTopoOrder

svf/include/Graphs/SCC.h

@@ -123,14 +123,30 @@ class SCCDetection
 
 
     // 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
+    /// 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()
+    {
+        GNodeStack revTopoOrder;
+        GNodeStack &topoOrder = topoNodeStack();
+        while(!topoOrder.empty())
+        {
+            NodeID callgraphNodeID = topoOrder.top();
+            topoOrder.pop();
+            revTopoOrder.push(callgraphNodeID);
+        }
+        return revTopoOrder;
+    }
+
+    const inline GNODESCCInfoMap &GNodeSCCInfo() const
     {
         return _NodeSCCAuxInfo;
     }

svf/include/WPA/WPAFSSolver.h

@@ -69,31 +69,23 @@ class WPAFSSolver : public WPASolver<GraphType>
         /// 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())
+        NodeStack revTopoStack = this->getSCCDetector()->revTopoNodeStack();
+        while (!revTopoStack.empty())
         {
-            NodeID nodeId = topoStack.top();
-            topoStack.pop();
+            NodeID nodeId = revTopoStack.top();
+            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;
     }
 };

svf/lib/MSSA/MemRegion.cpp

@@ -250,6 +250,7 @@ void MRGenerator::collectModRefForCall()
         {
             PTACallGraphNode* subCallGraphNode = callGraph->getCallGraphNode(*it);
             /// Get mod-ref of all callsites calling callGraphNode
+            std::cout << subCallGraphNode->getFunction()->getName() << std::endl;
             modRefAnalysis(subCallGraphNode,worklist);
         }
     }
@@ -461,12 +462,11 @@ bool MRGenerator::addModSideEffectOfCallSite(const CallICFGNode* cs, const NodeB
  */
 void MRGenerator::getCallGraphSCCRevTopoOrder(WorkList& worklist)
 {
-
-    NodeStack& topoOrder = callGraphSCC->topoNodeStack();
-    while(!topoOrder.empty())
+    NodeStack revTopoNodeStack = callGraphSCC->revTopoNodeStack();
+    while(!revTopoNodeStack.empty())
     {
-        NodeID callgraphNodeID = topoOrder.top();
-        topoOrder.pop();
+        NodeID callgraphNodeID = revTopoNodeStack.top();
+        revTopoNodeStack.pop();
         worklist.push(callgraphNodeID);
     }
 }

svf/lib/WPA/Andersen.cpp

@@ -709,24 +709,20 @@ inline void Andersen::collapseFields()
  */
 void Andersen::mergeSccCycle()
 {
-    NodeStack revTopoOrder;
-    NodeStack & topoOrder = getSCCDetector()->topoNodeStack();
-    while (!topoOrder.empty())
+    NodeStack revTopoOrder = getSCCDetector()->revTopoNodeStack();
+    /// referenced topoOrder is used for restoring the topological order for later solving.
+    NodeStack &topoOrder = getSCCDetector()->topoNodeStack();
+    while (!revTopoOrder.empty())
     {
-        NodeID repNodeId = topoOrder.top();
-        topoOrder.pop();
-        revTopoOrder.push(repNodeId);
+        NodeID repNodeId = revTopoOrder.top();
+        revTopoOrder.pop();
+
         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);
+        /// restore the topological order for later solving.
+        topoOrder.push(repNodeId);
     }
 }