svf-lib 1.0.1393 → 1.0.1395

package/SVF-linux/svf/include/CFL/CFLSolver.h

@@ -38,173 +38,7 @@ using namespace std;
 
 namespace SVF
 {
-
 typedef GrammarBase::Symbol Label;
-/*!
- * Adjacency-list graph representation
- */
-class CFLData
-{
-public:
-    typedef std::map<const Label, NodeBS> TypeMap;                  // Label with SparseBitVector of NodeID
-    typedef std::unordered_map<NodeID, TypeMap> DataMap;            // Each Node has a TypeMap
-    typedef typename DataMap::iterator iterator;                    // iterator for each node
-    typedef typename DataMap::const_iterator const_iterator;        // const iterator
-
-protected:
-    DataMap succMap;                                                // succ map for nodes contains Label: Edgeset
-    DataMap predMap;                                                // pred map for nodes contains Label: edgeset
-    const NodeBS emptyData;                                         // ??
-    NodeBS diff;                                                    // ??
-
-    // union/add data
-    //@{
-    inline bool addPred(const NodeID key, const NodeID src, const Label ty)
-    {
-        return predMap[key][ty].test_and_set(src);
-    };
-
-    inline bool addSucc(const NodeID key, const NodeID dst, const Label ty)
-    {
-        return succMap[key][ty].test_and_set(dst);
-    };
-
-    inline bool addPreds(const NodeID key, const NodeBS& data, const Label ty)
-    {
-        if (data.empty())
-            return false;
-        return predMap[key][ty] |= data;                            // union of sparsebitvector (add to LHS)
-    }
-
-    inline bool addSuccs(const NodeID key, const NodeBS& data, const Label ty)
-    {
-        if (data.empty())
-            return false;
-        return succMap[key][ty] |= data;                            // // union of sparsebitvector (add to LHS)
-    }
-    //@}
-
-public:
-    // Constructor
-    CFLData()
-    {}
-
-    // Destructor
-    virtual ~CFLData()
-    {}
-
-    virtual void clear()
-    {
-        succMap.clear();
-        predMap.clear();
-    }
-
-    inline const_iterator begin() const
-    {
-        return succMap.begin();
-    }
-
-    inline const_iterator end() const
-    {
-        return succMap.end();
-    }
-
-    inline iterator begin()
-    {
-        return succMap.begin();
-    }
-
-    inline iterator end()
-    {
-        return succMap.end();
-    }
-
-    inline DataMap& getSuccMap()
-    {
-        return succMap;
-    }
-
-    inline DataMap& getPredMap()
-    {
-        return predMap;
-    }
-
-    inline TypeMap& getSuccMap(const NodeID key)
-    {
-        return succMap[key];
-    }
-
-    inline TypeMap& getPredMap(const NodeID key)
-    {
-        return predMap[key];
-    }
-
-    inline NodeBS& getSuccs(const NodeID key, const Label ty)
-    {
-        return succMap[key][ty];
-    }
-
-    inline NodeBS& getPreds(const NodeID key, const Label ty)
-    {
-        return predMap[key][ty];
-    }
-
-    // Alias data operations
-    //@{
-    inline bool addEdge(const NodeID src, const NodeID dst, const Label ty)
-    {
-        addSucc(src, dst, ty);
-        return addPred(dst, src, ty);
-    }
-
-    /// add edges and return the set of added edges (dst) for src
-    inline NodeBS addEdges(const NodeID src, const NodeBS& dstData, const Label ty)
-    {
-        NodeBS newDsts;
-        if (addSuccs(src, dstData, ty))
-        {
-            for (const NodeID datum: dstData)
-                if (addPred(datum, src, ty))
-                    newDsts.set(datum);
-        }
-        return newDsts;
-    }
-
-    /// add edges and return the set of added edges (src) for dst
-    inline NodeBS addEdges(const NodeBS& srcData, const NodeID dst, const Label ty)
-    {
-        NodeBS newSrcs;
-        if (addPreds(dst, srcData, ty))
-        {
-            for (const NodeID datum: srcData)
-                if (addSucc(datum, dst, ty))
-                    newSrcs.set(datum);
-        }
-        return newSrcs;
-    }
-
-    /// find src -> find src[ty] -> find dst in set
-    inline bool hasEdge(const NodeID src, const NodeID dst, const Label ty)
-    {
-        const_iterator iter1 = succMap.find(src);
-        if (iter1 == succMap.end())
-            return false;
-
-        auto iter2 = iter1->second.find(ty);
-        if (iter2 == iter1->second.end())
-            return false;
-
-        return iter2->second.test(dst);
-    }
-
-    /* This is a dataset version, to be modified to a cflData version */
-    inline void clearEdges(const NodeID key)
-    {
-        succMap[key].clear();
-        predMap[key].clear();
-    }
-    //@}
-};
 
 /*!
  * Hybrid graph representation for transitive relations
@@ -388,51 +222,172 @@ protected:
 class POCRSolver : public CFLSolver
 {
 public:
-    POCRSolver(CFLGraph* _graph, CFLGrammar* _grammar) : CFLSolver(_graph, _grammar), cflData(NULL)
+    typedef std::map<const Label, NodeBS> TypeMap;                  // Label with SparseBitVector of NodeID
+    typedef std::unordered_map<NodeID, TypeMap> DataMap;            // Each Node has a TypeMap
+    typedef typename DataMap::iterator iterator;                    // iterator for each node
+    typedef typename DataMap::const_iterator const_iterator;
+
+protected:
+    DataMap succMap;                                                // succ map for nodes contains Label: Edgeset
+    DataMap predMap;                                                // pred map for nodes contains Label: edgeset
+    const NodeBS emptyData;                                         // ??
+    NodeBS diff;
+    // union/add data
+    //@{
+    inline bool addPred(const NodeID key, const NodeID src, const Label ty)
     {
-        if (!cflData)
-        {
-            cflData = new CFLData();
-            // Build CFL Data
-            buildCFLData();
-        }
+        return predMap[key][ty].test_and_set(src);
+    };
+
+    inline bool addSucc(const NodeID key, const NodeID dst, const Label ty)
+    {
+        return succMap[key][ty].test_and_set(dst);
+    };
+
+    inline bool addPreds(const NodeID key, const NodeBS& data, const Label ty)
+    {
+        if (data.empty())
+            return false;
+        return predMap[key][ty] |= data;                            // union of sparsebitvector (add to LHS)
     }
-    /// Destructor
-    virtual ~POCRSolver()
+
+    inline bool addSuccs(const NodeID key, const NodeBS& data, const Label ty)
     {
-        delete cflData;
+        if (data.empty())
+            return false;
+        return succMap[key][ty] |= data;                            // // union of sparsebitvector (add to LHS)
     }
+    //@}
+public:
 
-    /// Process CFLEdge
-    virtual void processCFLEdge(const CFLEdge* Y_edge);
+    virtual void clear()
+    {
+        succMap.clear();
+        predMap.clear();
+    }
 
-    /// Init CFLData
-    virtual void buildCFLData();
+    inline const_iterator begin() const
+    {
+        return succMap.begin();
+    }
 
-    virtual bool addEdge(const CFLNode* src, const CFLNode* dst, const Label ty)
+    inline const_iterator end() const
     {
-        return cflData->addEdge(src->getId(), dst->getId(), ty);
+        return succMap.end();
     }
 
-    virtual bool addEdge(const NodeID srcId, const NodeID dstId, const Label ty)
+    inline iterator begin()
     {
-        return cflData->addEdge(srcId, dstId, ty);
+        return succMap.begin();
     }
 
-    virtual void initialize();
+    inline iterator end()
+    {
+        return succMap.end();
+    }
+
+    inline DataMap& getSuccMap()
+    {
+        return succMap;
+    }
+
+    inline DataMap& getPredMap()
+    {
+        return predMap;
+    }
+
+    inline TypeMap& getSuccMap(const NodeID key)
+    {
+        return succMap[key];
+    }
+
+    inline TypeMap& getPredMap(const NodeID key)
+    {
+        return predMap[key];
+    }
 
-    virtual NodeBS addEdges(const NodeID srcId, const NodeBS& dstData, const Label ty)
+    inline NodeBS& getSuccs(const NodeID key, const Label ty)
     {
-        return cflData->addEdges(srcId, dstData, ty);
+        return succMap[key][ty];
     }
 
+    inline NodeBS& getPreds(const NodeID key, const Label ty)
+    {
+        return predMap[key][ty];
+    }
 
-    virtual NodeBS addEdges(const NodeBS& srcData, const NodeID dstId, const Label ty)
+    // Alias data operations
+    //@{
+    inline bool addEdge(const NodeID src, const NodeID dst, const Label ty)
     {
-        return cflData->addEdges(srcData, dstId, ty);
+        addSucc(src, dst, ty);
+        return addPred(dst, src, ty);
     }
-private:
-    CFLData* cflData;
+
+    /// add edges and return the set of added edges (dst) for src
+    inline NodeBS addEdges(const NodeID src, const NodeBS& dstData, const Label ty)
+    {
+        NodeBS newDsts;
+        if (addSuccs(src, dstData, ty))
+        {
+            for (const NodeID datum: dstData)
+                if (addPred(datum, src, ty))
+                    newDsts.set(datum);
+        }
+        return newDsts;
+    }
+
+    /// add edges and return the set of added edges (src) for dst
+    inline NodeBS addEdges(const NodeBS& srcData, const NodeID dst, const Label ty)
+    {
+        NodeBS newSrcs;
+        if (addPreds(dst, srcData, ty))
+        {
+            for (const NodeID datum: srcData)
+                if (addSucc(datum, dst, ty))
+                    newSrcs.set(datum);
+        }
+        return newSrcs;
+    }
+
+    /// find src -> find src[ty] -> find dst in set
+    inline bool hasEdge(const NodeID src, const NodeID dst, const Label ty)
+    {
+        const_iterator iter1 = succMap.find(src);
+        if (iter1 == succMap.end())
+            return false;
+
+        auto iter2 = iter1->second.find(ty);
+        if (iter2 == iter1->second.end())
+            return false;
+
+        return iter2->second.test(dst);
+    }
+
+    /* This is a dataset version, to be modified to a cflData version */
+    inline void clearEdges(const NodeID key)
+    {
+        succMap[key].clear();
+        predMap[key].clear();
+    }
+    //@}
+
+    POCRSolver(CFLGraph* _graph, CFLGrammar* _grammar) : CFLSolver(_graph, _grammar)
+    {
+        buildCFLData();
+    }
+    /// Destructor
+    virtual ~POCRSolver()
+    {
+    }
+
+    /// Process CFLEdge
+    virtual void processCFLEdge(const CFLEdge* Y_edge);
+
+    /// Init CFLData
+    virtual void buildCFLData();
+
+    virtual void initialize();
 };
 }
 

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

@@ -0,0 +1,246 @@
+//===- CFBasicBlockG.h ----------------------------------------------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2018>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * CFBasicBlockG.h
+ *
+ *  Created on: 24 Dec. 2022
+ *      Author: Xiao, Jiawei
+ */
+
+#ifndef SVF_CFBASICBLOCKG_H
+#define SVF_CFBASICBLOCKG_H
+#include "Util/SVFUtil.h"
+#include "Graphs/ICFGNode.h"
+#include "Graphs/GenericGraph.h"
+
+namespace SVF
+{
+class CFBasicBlockNode;
+class SVFIR;
+
+typedef GenericEdge<CFBasicBlockNode> GenericCFBasicBlockEdgeTy;
+
+class CFBasicBlockEdge : public GenericCFBasicBlockEdgeTy
+{
+public:
+    CFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst) : GenericCFBasicBlockEdgeTy(src, dst, 0) {}
+
+
+    friend std::ostream &operator<<(std::ostream &o, const CFBasicBlockEdge &edge)
+    {
+        o << edge.toString();
+        return o;
+    }
+
+    virtual const std::string toString() const
+    {
+        return std::to_string(getSrcID()) + " --> " + std::to_string(getDstID());
+    }
+};
+
+typedef GenericNode<CFBasicBlockNode, CFBasicBlockEdge> GenericCFBasicBlockNodeTy;
+
+class CFBasicBlockNode : public GenericCFBasicBlockNodeTy
+{
+private:
+    const SVFBasicBlock *_svfBasicBlock; /// Every CFBasicBlockNode holds a SVFBasicBlock
+    std::vector<const ICFGNode *> _icfgNodes; /// Every CBFGNode holds a vector of ICFGNodes
+
+public:
+    CFBasicBlockNode(u32_t id, const SVFBasicBlock *svfBasicBlock);
+
+    friend std::ostream &operator<<(std::ostream &o, const CFBasicBlockNode &node)
+    {
+        o << node.toString();
+        return o;
+    }
+
+    virtual const std::string toString() const;
+
+    inline std::string getName() const;
+
+    inline const SVFBasicBlock *getSVFBasicBlock() const;
+
+    inline const SVFFunction *getFunction() const;
+
+    inline std::vector<const ICFGNode *>::const_iterator begin() const
+    {
+        return _icfgNodes.cbegin();
+    }
+
+    inline std::vector<const ICFGNode *>::const_iterator end() const
+    {
+        return _icfgNodes.cend();
+    }
+};
+
+typedef GenericGraph<CFBasicBlockNode, CFBasicBlockEdge> GenericCFBasicBlockGTy;
+
+class CFBasicBlockGraph : public GenericCFBasicBlockGTy
+{
+    friend class CFBasicBlockGBuilder;
+
+public:
+    typedef Map<const SVFBasicBlock *, CFBasicBlockNode *> SVFBasicBlockToCFBasicBlockNodeMap;
+
+private:
+    SVFBasicBlockToCFBasicBlockNodeMap _bbToNode;
+    const SVFFunction *_svfFunction;
+    u32_t _totalCFBasicBlockNode{0};
+    u32_t _totalCFBasicBlockEdge{0};
+
+public:
+
+    CFBasicBlockGraph(const SVFFunction *svfFunction) : _svfFunction(svfFunction)
+    {
+
+    }
+
+    ~CFBasicBlockGraph() override = default;
+
+    /// Dump graph into dot file
+    void dump(const std::string &filename)
+    {
+        GraphPrinter::WriteGraphToFile(SVFUtil::outs(), filename, this);
+    }
+
+    inline CFBasicBlockNode *getCFBasicBlockNode(u32_t id) const;
+
+    inline CFBasicBlockNode *getCFBasicBlockNode(const SVFBasicBlock *bb) const;
+
+    inline bool hasCFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst);
+
+    CFBasicBlockEdge* getCFBasicBlockEdge(const CFBasicBlockNode *src, const CFBasicBlockNode *dst);
+
+    CFBasicBlockEdge* getCFBasicBlockEdge(const SVFBasicBlock *src, const SVFBasicBlock *dst);
+
+private:
+
+    /// Add a CFBasicBlockNode
+    inline const CFBasicBlockNode* getOrAddCFBasicBlockNode(const SVFBasicBlock *bb);
+
+    inline const CFBasicBlockEdge *getOrAddCFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst);
+
+};
+
+class CFBasicBlockGBuilder
+{
+
+private:
+    CFBasicBlockGraph* _CFBasicBlockG;
+
+public:
+    CFBasicBlockGBuilder(const SVFFunction *func) : _CFBasicBlockG(new CFBasicBlockGraph(func)) {}
+
+    void build();
+
+    inline CFBasicBlockGraph* getCFBasicBlockGraph()
+    {
+        return _CFBasicBlockG;
+    }
+};
+}
+
+
+namespace SVF
+{
+/* !
+ * GenericGraphTraits specializations for generic graph algorithms.
+ * Provide graph traits for traversing from a constraint node using standard graph ICFGTraversals.
+ */
+template<>
+struct GenericGraphTraits<SVF::CFBasicBlockNode *>
+    : public GenericGraphTraits<SVF::GenericNode<SVF::CFBasicBlockNode, SVF::CFBasicBlockEdge> *>
+{
+};
+
+/// Inverse GenericGraphTraits specializations for call graph node, it is used for inverse ICFGTraversal.
+template<>
+struct GenericGraphTraits<Inverse< SVF::CFBasicBlockNode *> > : public GenericGraphTraits<
+    Inverse<SVF::GenericNode<SVF::CFBasicBlockNode, SVF::CFBasicBlockEdge> *> >
+{
+};
+
+template<>
+struct GenericGraphTraits<SVF::CFBasicBlockGraph *>
+    : public GenericGraphTraits<SVF::GenericGraph<SVF::CFBasicBlockNode, SVF::CFBasicBlockEdge> *>
+{
+    typedef SVF::CFBasicBlockNode *NodeRef;
+};
+
+template<>
+struct DOTGraphTraits<SVF::CFBasicBlockGraph *> : public DOTGraphTraits<SVF::SVFIR *>
+{
+
+    typedef SVF::CFBasicBlockNode NodeType;
+
+    DOTGraphTraits(bool isSimple = false) :
+        DOTGraphTraits<SVF::SVFIR *>(isSimple)
+    {
+    }
+
+    /// Return name of the graph
+    static std::string getGraphName(SVF::CFBasicBlockGraph *)
+    {
+        return "CFBasicBlockGraph";
+    }
+
+    std::string getNodeLabel(NodeType *node, SVF::CFBasicBlockGraph *graph)
+    {
+        return getSimpleNodeLabel(node, graph);
+    }
+
+    /// Return the label of an ICFG node
+    static std::string getSimpleNodeLabel(NodeType *node, SVF::CFBasicBlockGraph *)
+    {
+        std::string str;
+        std::stringstream rawstr(str);
+        rawstr << "NodeID: " << node->getId() << "\n";
+        rawstr << node->toString();
+
+        return rawstr.str();
+    }
+
+    static std::string getNodeAttributes(NodeType *node, SVF::CFBasicBlockGraph *)
+    {
+        std::string str;
+        std::stringstream rawstr(str);
+        rawstr << "color=black";
+        return rawstr.str();
+    }
+
+    template<class EdgeIter>
+    static std::string getEdgeAttributes(NodeType *, EdgeIter EI, SVF::CFBasicBlockGraph *)
+    {
+        return "style=solid";
+    }
+
+    template<class EdgeIter>
+    static std::string getEdgeSourceLabel(NodeType *, EdgeIter EI)
+    {
+        return "";
+    }
+};
+
+} // End namespace SVF
+#endif //SVF_CFBASICBLOCKG_H

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

@@ -30,7 +30,7 @@
 #ifndef GENERICGRAPH_H_
 #define GENERICGRAPH_H_
 
-#include "SVFIR/SVFValue.h"
+#include "SVFIR/SVFType.h"
 #include "Util/iterator.h"
 #include "Graphs/GraphTraits.h"
 

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

@@ -36,6 +36,7 @@
 #include "Util/NodeIDAllocator.h"
 #include "Util/SVFUtil.h"
 #include "Graphs/ICFG.h"
+#include "Graphs/CFBasicBlockG.h"
 
 namespace SVF
 {

package/package.json

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