svf-lib 1.0.2414 → 1.0.2416

package/SVF-osx/include/AE/Core/ICFGWTO.h

@@ -45,75 +45,43 @@ typedef WTOComponent<ICFG> ICFGWTOComp;
 typedef WTONode<ICFG> ICFGSingletonWTO;
 typedef WTOCycle<ICFG> ICFGCycleWTO;
 
+// Added for IWTO
 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) : Base(graph, node) {}
-
-    virtual ~ICFGWTO()
+    explicit ICFGWTO(ICFG* graph,const ICFGNode* node, Set<const FunObjVar*> funcScc = {}) :
+        Base(graph, node), scc(funcScc)
     {
+        if (scc.empty()) // if empty funcScc, default use the function of the node
+            scc.insert(node->getFun());
     }
 
-    inline void forEachSuccessor(
-        const ICFGNode* node,
-        std::function<void(const ICFGNode*)> func) const override
+    virtual ~ICFGWTO()
     {
-        if (const auto* callNode = SVFUtil::dyn_cast<CallICFGNode>(node))
-        {
-            const ICFGNode* succ = callNode->getRetICFGNode();
-            func(succ);
-        }
-        else
-        {
-            for (const auto& e : node->getOutEdges())
-            {
-                if (!e->isIntraCFGEdge() ||
-                        node->getFun() != e->getDstNode()->getFun())
-                    continue;
-                func(e->getDstNode());
-            }
-        }
     }
-};
-
-// Added for IWTO
-class ICFGIWTO : public ICFGWTO
-{
-public:
-    typedef ICFGWTO Base;
-    typedef WTOComponentVisitor<ICFG>::WTONodeT ICFGWTONode;
-    NodeBS &funcPar;
-    CallGraph *cg;
-
-    explicit ICFGIWTO(ICFG* graph, const ICFGNode* node, NodeBS & funcPar, CallGraph* cg) :
-        Base(graph, node), funcPar(funcPar), cg(cg) {}
 
-    virtual ~ICFGIWTO()
+    inline virtual std::vector<const ICFGNode*> getSuccessors(const ICFGNode* node) override
     {
-    }
+        std::vector<const ICFGNode*> successors;
 
-    inline void forEachSuccessor(
-        const ICFGNode* node,
-        std::function<void(const ICFGNode*)> func) const override
-    {
         if (const auto* callNode = SVFUtil::dyn_cast<CallICFGNode>(node))
         {
 
             for (const auto &e : callNode->getOutEdges())
             {
                 ICFGNode *calleeEntryICFGNode = e->getDstNode();
-                CallGraphNode * calleeCGNode = cg->getCallGraphNode(calleeEntryICFGNode->getFun());
+                const ICFGNode *succ = nullptr;
 
-                const ICFGNode* succ = nullptr;
-                if (funcPar.test(calleeCGNode->getId()))
+                if (scc.find(calleeEntryICFGNode->getFun()) != scc.end()) // caller & callee in the same SCC
                     succ = calleeEntryICFGNode;
                 else
-                    succ = callNode->getRetICFGNode();
+                    succ = callNode->getRetICFGNode(); // caller & callee in different SCC
 
-                func(succ);
+                successors.push_back(succ);
             }
         }
         else
@@ -121,12 +89,13 @@ public:
             for (const auto& e : node->getOutEdges())
             {
                 ICFGNode *succ = e->getDstNode();
-                CallGraphNode *succCGNode = cg->getCallGraphNode(succ->getFun());
-                if (!funcPar.test(succCGNode->getId()))
+                if (scc.find(succ->getFun()) == scc.end()) // if not in the same SCC, skip
                     continue;
-                func(succ);
+                successors.push_back(succ);
             }
         }
+
+        return successors;
     }
 };
 

package/SVF-osx/include/Graphs/WTO.h

@@ -720,13 +720,15 @@ protected:
     }; // end class WTOCycleDepthBuilder
 
 protected:
-
-    inline virtual void forEachSuccessor(const NodeT* node, std::function<void(const NodeT*)> func) const
+    /// Return the successors of node
+    inline virtual std::vector<const NodeT *> getSuccessors(const NodeT* node)
     {
+        std::vector<const NodeT *> succssors;
         for (const auto& e : node->getOutEdges())
         {
-            func(e->getDstNode());
+            succssors.push_back(e->getDstNode());
         }
+        return succssors;
     }
 
 protected:
@@ -788,13 +790,14 @@ protected:
     virtual const WTOCycleT* component(const NodeT* node)
     {
         WTOComponentRefList partition;
-        forEachSuccessor(node, [&](const NodeT* succ)
+
+        for (auto succ: getSuccessors(node))
         {
             if (getCDN(succ) == 0)
             {
                 visit(succ, partition);
             }
-        });
+        }
         const WTONodeT* head = newNode(node);
         const WTOCycleT* ptr = newCycle(head, partition);
         headRefToCycle.emplace(node, ptr);
@@ -816,7 +819,8 @@ protected:
         head = _num;
         setCDN(node, head);
         loop = false;
-        forEachSuccessor(node, [&](const NodeT* succ)
+
+        for (auto succ: getSuccessors(node))
         {
             CycleDepthNumber succ_dfn = getCDN(succ);
             if (succ_dfn == CycleDepthNumber(0))
@@ -832,7 +836,7 @@ protected:
                 head = min;
                 loop = true;
             }
-        });
+        }
 
         if (head == getCDN(node))
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.2414",
+  "version": "1.0.2416",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {