remove 1st arg of ICFGWTO

Author: yuleisui

svf/include/AE/Core/ICFGWTO.h

@@ -45,18 +45,20 @@ typedef WTOComponent<ICFG> ICFGWTOComp;
 typedef WTONode<ICFG> ICFGSingletonWTO;
 typedef WTOCycle<ICFG> ICFGCycleWTO;
 
-// Added for IWTO
+/// Interprocedural Weak Topological Order
+/// Each IWTO has an entry ICFGNode within an function-level SCC boundary. Here scc is one or more functions.
 class ICFGWTO : public WTO<ICFG>
 {
 public:
     typedef WTO<ICFG> Base;
     typedef WTOComponentVisitor<ICFG>::WTONodeT ICFGWTONode;
     Set<const FunObjVar*> scc;
 
-    explicit ICFGWTO(ICFG* graph,const ICFGNode* node, Set<const FunObjVar*> funcScc = {}) :
-        Base(graph, node), scc(funcScc)
+    // 1st argument is the SCC's entry ICFGNode and 2nd argument is the function(s) in this SCC.
+    explicit ICFGWTO(const ICFGNode* node, Set<const FunObjVar*> funcScc = {}) :
+        Base(node), scc(funcScc)
     {
-        if (scc.empty()) // if empty funcScc, default use the function of the node
+        if (scc.empty()) // if funcScc is empty, the scc is the function itself
             scc.insert(node->getFun());
     }
 

svf/include/Graphs/WTO.h

@@ -554,13 +554,12 @@ template <typename GraphT> class WTO
     NodeRefToCycleDepthNumber _nodeToCDN;
     CycleDepthNumber _num;
     Stack _stack;
-    GraphT* _graph;
     const NodeT* _entry;
 
 public:
 
     /// Compute the weak topological order of the given graph
-    explicit WTO(GraphT* graph, const NodeT* entry) : _num(0), _graph(graph), _entry(entry)
+    explicit WTO(const NodeT* entry) : _num(0), _entry(entry)
     {
     }
 

svf/lib/AE/Svfexe/AbstractInterpretation.cpp

@@ -137,7 +137,7 @@ void AbstractInterpretation::initWTO()
             {
                 funcScc.insert(callGraph->getGNode(node)->getFunction());
             }
-            ICFGWTO* iwto = new ICFGWTO(icfg, icfg->getFunEntryICFGNode(fun), funcScc);
+            ICFGWTO* iwto = new ICFGWTO(icfg->getFunEntryICFGNode(fun), funcScc);
             iwto->init();
             funcToWTO[it->second->getFunction()] = iwto;
         }