svf-lib 1.0.1682 → 1.0.1684

package/SVF-linux/svf/include/AbstractExecution/WTO.h

@@ -492,11 +492,12 @@ protected:
     NodeRefToCycleDepthNumber _nodeToCDN;
     CycleDepthNumber _num;
     CFBasicBlockNodes _stack;
+    CFBasicBlockGraph* _graph;
 
 public:
     explicit CFBasicBlockGWTO() : _num(0) {}
 
-    explicit CFBasicBlockGWTO(const CFBasicBlockNode *entry) : _num(0)
+    explicit CFBasicBlockGWTO(CFBasicBlockGraph* graph, const CFBasicBlockNode *entry) : _num(0), _graph(graph)
     {
         build(entry);
     }
@@ -652,12 +653,13 @@ protected:
         const CFBasicBlockGWTOCycleDepth &_headWTOCycleDepth;
         const CFBasicBlockNode *_head;
         NodeRefToWTOCycleDepthPtr &_nodeToWTOCycleDepth;
+        CFBasicBlockGraph* _graph;
 
     public:
 
-        explicit TailBuilder(NodeRefToWTOCycleDepthPtr &nodeToWTOCycleDepth, NodeRefSet &tails, const CFBasicBlockNode *head,
+        explicit TailBuilder(CFBasicBlockGraph* graph, NodeRefToWTOCycleDepthPtr &nodeToWTOCycleDepth, NodeRefSet &tails, const CFBasicBlockNode *head,
                              const CFBasicBlockGWTOCycleDepth &headWTOCycleDepth) : _tails(tails), _headWTOCycleDepth(headWTOCycleDepth), _head(head), _nodeToWTOCycleDepth(
-                                     nodeToWTOCycleDepth)
+                                     nodeToWTOCycleDepth),  _graph(graph)
         {
         }
 
@@ -671,15 +673,27 @@ protected:
 
         virtual void visit(const CFBasicBlockGWTONode &node) override
         {
-            for (const auto &edge: node.node()->getOutEdges())
+            if(const CallICFGNode* callNode = SVFUtil::dyn_cast<CallICFGNode>(node.node()->getICFGNodes().front()))
             {
-                const CFBasicBlockNode *succ = edge->getDstNode();
+                const CFBasicBlockNode *succ = _graph->getCFBasicBlockNode(callNode->getRetICFGNode()->getId());
                 const CFBasicBlockGWTOCycleDepth &succNesting = getWTOCycleDepth(succ);
                 if (succ != _head && succNesting <= _headWTOCycleDepth)
                 {
                     _tails.insert(node.node());
                 }
             }
+            else
+            {
+                for (const auto &edge: node.node()->getOutEdges())
+                {
+                    const CFBasicBlockNode *succ = edge->getDstNode();
+                    const CFBasicBlockGWTOCycleDepth &succNesting = getWTOCycleDepth(succ);
+                    if (succ != _head && succNesting <= _headWTOCycleDepth)
+                    {
+                        _tails.insert(node.node());
+                    }
+                }
+            }
         }
 
     protected:
@@ -751,14 +765,25 @@ protected:
     const CFBasicBlockGWTOCycle *component(const CFBasicBlockNode *node)
     {
         WTOCompRefList partition;
-        for (auto it = node->getOutEdges().begin(), et = node->getOutEdges().end(); it != et; ++it)
+        if (const CallICFGNode* callNode = SVFUtil::dyn_cast<CallICFGNode>(node->getICFGNodes().front()))
         {
-            const CFBasicBlockNode *succ = (*it)->getDstNode();
+            const CFBasicBlockNode *succ = _graph->getCFBasicBlockNode(callNode->getRetICFGNode()->getId());
             if (getCDN(succ) == 0)
             {
                 visit(succ, partition);
             }
         }
+        else
+        {
+            for (auto it = node->getOutEdges().begin(), et = node->getOutEdges().end(); it != et; ++it)
+            {
+                const CFBasicBlockNode *succ = (*it)->getDstNode();
+                if (getCDN(succ) == 0)
+                {
+                    visit(succ, partition);
+                }
+            }
+        }
         const CFBasicBlockGWTOCycle *ptr = newCycle(node, partition);
         _headToCycle.emplace(node, ptr);
         return ptr;
@@ -776,9 +801,9 @@ protected:
         head = _num;
         setCDN(node, head);
         loop = false;
-        for (auto it = node->getOutEdges().begin(), et = node->getOutEdges().end(); it != et; ++it)
+        if (const CallICFGNode* callNode = SVFUtil::dyn_cast<CallICFGNode>(node->getICFGNodes().front()))
         {
-            const CFBasicBlockNode *succ = (*it)->getDstNode();
+            const CFBasicBlockNode *succ = _graph->getCFBasicBlockNode(callNode->getRetICFGNode()->getId());
             CycleDepthNumber succ_dfn = getCDN(succ);
             if (succ_dfn == CycleDepthNumber(0))
             {
@@ -794,6 +819,27 @@ protected:
                 loop = true;
             }
         }
+        else
+        {
+            for (auto it = node->getOutEdges().begin(), et = node->getOutEdges().end(); it != et; ++it)
+            {
+                const CFBasicBlockNode *succ = (*it)->getDstNode();
+                CycleDepthNumber succ_dfn = getCDN(succ);
+                if (succ_dfn == CycleDepthNumber(0))
+                {
+                    min = visit(succ, partition);
+                }
+                else
+                {
+                    min = succ_dfn;
+                }
+                if (min <= head)
+                {
+                    head = min;
+                    loop = true;
+                }
+            }
+        }
         if (head == getCDN(node))
         {
             setCDN(node, UINT_MAX);
@@ -831,7 +877,7 @@ protected:
         for (const auto &head: _headToCycle)
         {
             NodeRefSet tails;
-            TailBuilder builder(_nodeToDepth, tails, head.first, getWTOCycleDepth(head.first));
+            TailBuilder builder(_graph, _nodeToDepth, tails, head.first, getWTOCycleDepth(head.first));
             for (auto it = head.second->begin(), eit = head.second->end(); it != eit; ++it)
             {
                 (*it)->accept(&builder);

package/SVF-linux/svf/include/Graphs/CFBasicBlockG.h

@@ -127,8 +127,6 @@ public:
     {
     }
 
-    CFBasicBlockNode(const SVFBasicBlock* bb);
-
     friend std::ostream &operator<<(std::ostream &o, const CFBasicBlockNode &node)
     {
         o << node.toString();
@@ -143,10 +141,9 @@ public:
         return (*_icfgNodes.begin())->getBB()->getName();
     }
 
-    inline const SVFBasicBlock *getSVFBasicBlock() const
+    inline const std::vector<const ICFGNode*>& getICFGNodes() const
     {
-        assert(!_icfgNodes.empty() && "no ICFG nodes in CFBB");
-        return (*_icfgNodes.begin())->getBB();
+        return _icfgNodes;
     }
 
     inline const SVFFunction *getFunction() const
@@ -355,7 +352,6 @@ class CFBasicBlockGraph : public GenericCFBasicBlockGTy
 private:
     u32_t _totalCFBasicBlockNode{0};
     u32_t _totalCFBasicBlockEdge{0};
-    Map<const SVFFunction*, CFBasicBlockNode*> _funToFirstNode;
 public:
 
     CFBasicBlockGraph() = default;
@@ -379,27 +375,6 @@ public:
         return hasGNode(id);
     }
 
-    inline CFBasicBlockNode* getFirstCFBasicBlockNode(const SVFFunction* fun) const
-    {
-        if (fun && _funToFirstNode.find(fun) != _funToFirstNode.end())
-        {
-            return _funToFirstNode.at(fun);
-        }
-        else
-        {
-            return nullptr;
-        }
-    }
-    inline bool hasFirstCFBasicBlockNode(const SVFFunction* fun) const
-    {
-        return fun && _funToFirstNode.find(fun) != _funToFirstNode.end();
-    }
-
-    inline void setFirstCFBasicBlockNode(const Map<const SVFFunction*, CFBasicBlockNode*>& svfNodeMap)
-    {
-        _funToFirstNode = svfNodeMap;
-    }
-
 
     bool hasCFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst, ICFGEdge *icfgEdge)
     {
@@ -490,24 +465,6 @@ public:
     }
 };
 
-class CFBasicBlockGBuilder
-{
-
-private:
-    CFBasicBlockGraph* _CFBasicBlockG;
-
-public:
-    CFBasicBlockGBuilder() : _CFBasicBlockG() {}
-
-    virtual void build(SVFModule* module);
-
-    virtual void build(ICFG* icfg);
-
-    inline CFBasicBlockGraph* getCFBasicBlockGraph()
-    {
-        return _CFBasicBlockG;
-    }
-};
 }
 
 
@@ -537,6 +494,10 @@ struct GenericGraphTraits<SVF::CFBasicBlockGraph *>
     typedef SVF::CFBasicBlockNode *NodeRef;
 };
 
+} // End namespace SVF
+
+namespace SVF
+{
 template<>
 struct DOTGraphTraits<SVF::CFBasicBlockGraph *> : public DOTGraphTraits<SVF::SVFIR *>
 {
@@ -574,22 +535,73 @@ struct DOTGraphTraits<SVF::CFBasicBlockGraph *> : public DOTGraphTraits<SVF::SVF
     {
         std::string str;
         std::stringstream rawstr(str);
-        rawstr << "color=black";
+        if(node->getICFGNodes().size() == 1)
+        {
+            const ICFGNode* n = node->getICFGNodes()[0];
+            if(SVFUtil::isa<IntraICFGNode>(n))
+            {
+                rawstr <<  "color=black";
+            }
+            else if(SVFUtil::isa<FunEntryICFGNode>(n))
+            {
+                rawstr <<  "color=yellow";
+            }
+            else if(SVFUtil::isa<FunExitICFGNode>(n))
+            {
+                rawstr <<  "color=green";
+            }
+            else if(SVFUtil::isa<CallICFGNode>(n))
+            {
+                rawstr <<  "color=red";
+            }
+            else if(SVFUtil::isa<RetICFGNode>(n))
+            {
+                rawstr <<  "color=blue";
+            }
+            else if(SVFUtil::isa<GlobalICFGNode>(n))
+            {
+                rawstr <<  "color=purple";
+            }
+            else
+                assert(false && "no such kind of node!!");
+        }
+        else
+        {
+            rawstr << "color=black";
+        }
+        rawstr <<  "";
         return rawstr.str();
     }
 
     template<class EdgeIter>
     static std::string getEdgeAttributes(NodeType *, EdgeIter EI, SVF::CFBasicBlockGraph *)
     {
-        return "style=solid";
+        CFBasicBlockEdge* edge = *(EI.getCurrent());
+        assert(edge && "No edge found!!");
+        if (SVFUtil::isa<CallCFGEdge>(edge->getICFGEdge()))
+            return "style=solid,color=red";
+        else if (SVFUtil::isa<RetCFGEdge>(edge->getICFGEdge()))
+            return "style=solid,color=blue";
+        else
+            return "style=solid";
+        return "";
     }
 
     template<class EdgeIter>
     static std::string getEdgeSourceLabel(NodeType *, EdgeIter EI)
     {
-        return "";
+        CFBasicBlockEdge* edge = *(EI.getCurrent());
+        assert(edge && "No edge found!!");
+
+        std::string str;
+        std::stringstream rawstr(str);
+        if (const CallCFGEdge* dirCall = SVFUtil::dyn_cast<CallCFGEdge>(edge->getICFGEdge()))
+            rawstr << dirCall->getCallSite();
+        else if (const RetCFGEdge* dirRet = SVFUtil::dyn_cast<RetCFGEdge>(edge->getICFGEdge()))
+            rawstr << dirRet->getCallSite();
+
+        return rawstr.str();
     }
 };
-
-} // End namespace SVF
+}
 #endif //SVF_CFBASICBLOCKG_H

package/SVF-linux/svf/include/Util/CFBasicBlockGBuilder.h

@@ -0,0 +1,59 @@
+//===- CFBasicBlockGBuilder.h ----------------------------------------------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013->  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * CFBasicBlockGBuilder.h
+ *
+ *  Created on: 17 Oct. 2023
+ *      Author: Xiao, Jiawei
+ */
+
+#include "Graphs/CFBasicBlockG.h"
+
+namespace SVF
+{
+
+class CFBasicBlockGBuilder
+{
+
+private:
+    CFBasicBlockGraph* _CFBasicBlockG;
+
+public:
+    CFBasicBlockGBuilder() : _CFBasicBlockG() {}
+
+    virtual void build(ICFG* icfg);
+
+    inline CFBasicBlockGraph* getCFBasicBlockGraph()
+    {
+        return _CFBasicBlockG;
+    }
+private:
+    void initCFBasicBlockGNodes(ICFG *icfg, Map<const SVFBasicBlock *, std::vector<CFBasicBlockNode *>> &bbToNodes);
+
+    void addInterBBEdge(ICFG *icfg, Map<const SVFBasicBlock *, std::vector<CFBasicBlockNode *>> &bbToNodes);
+
+    void addIntraBBEdge(ICFG *icfg, Map<const SVFBasicBlock *, std::vector<CFBasicBlockNode *>> &bbToNodes);
+
+    void addInterProceduralEdge(ICFG *icfg, Map<const SVFBasicBlock *, std::vector<CFBasicBlockNode *>> &bbToNodes);
+};
+}

package/SVF-osx/svf/include/Graphs/CFBasicBlockG.h

@@ -84,7 +84,10 @@ public:
 
     virtual const std::string toString() const
     {
-        return _icfgEdge->toString();
+        std::string str;
+        std::stringstream rawstr(str);
+        rawstr << "CFBBGEdge: [CFBBGNode" << getDstID() << " <-- CFBBGNode" << getSrcID() << "]\t";
+        return rawstr.str();
     }
 
     inline const ICFGEdge *getICFGEdge() const
@@ -575,13 +578,21 @@ struct DOTGraphTraits<SVF::CFBasicBlockGraph *> : public DOTGraphTraits<SVF::SVF
     {
         CFBasicBlockEdge* edge = *(EI.getCurrent());
         assert(edge && "No edge found!!");
-        if (SVFUtil::isa<CallCFGEdge>(edge->getICFGEdge()))
-            return "style=solid,color=red";
-        else if (SVFUtil::isa<RetCFGEdge>(edge->getICFGEdge()))
-            return "style=solid,color=blue";
+        if (edge->getICFGEdge())
+        {
+            if (SVFUtil::isa<CallCFGEdge>(edge->getICFGEdge()))
+            {
+                return "style=solid,color=red";
+            }
+            else if (SVFUtil::isa<RetCFGEdge>(edge->getICFGEdge()))
+                return "style=solid,color=blue";
+            else
+                return "style=solid";
+        }
         else
+        {
             return "style=solid";
-        return "";
+        }
     }
 
     template<class EdgeIter>
@@ -592,11 +603,13 @@ struct DOTGraphTraits<SVF::CFBasicBlockGraph *> : public DOTGraphTraits<SVF::SVF
 
         std::string str;
         std::stringstream rawstr(str);
-        if (const CallCFGEdge* dirCall = SVFUtil::dyn_cast<CallCFGEdge>(edge->getICFGEdge()))
-            rawstr << dirCall->getCallSite();
-        else if (const RetCFGEdge* dirRet = SVFUtil::dyn_cast<RetCFGEdge>(edge->getICFGEdge()))
-            rawstr << dirRet->getCallSite();
-
+        if (edge->getICFGEdge())
+        {
+            if (const CallCFGEdge* dirCall = SVFUtil::dyn_cast<CallCFGEdge>(edge->getICFGEdge()))
+                rawstr << dirCall->getCallSite();
+            else if (const RetCFGEdge* dirRet = SVFUtil::dyn_cast<RetCFGEdge>(edge->getICFGEdge()))
+                rawstr << dirRet->getCallSite();
+        }
         return rawstr.str();
     }
 };

package/package.json

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