svf-tools 1.0.644 → 1.0.645

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.644",
+  "version": "1.0.645",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/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/lib/CFL/CFLSolver.cpp

@@ -163,8 +163,8 @@ void POCRSolver::processCFLEdge(const CFLEdge* Y_edge)
         for(const Production& prod : grammar->getProdsFromFirstRHS(Y))
         {
             Symbol X = grammar->getLHSSymbol(prod);
-            NodeBS diffDsts = addEdges(i->getId(), cflData->getSuccMap(j->getId())[grammar->getSecondRHSSymbol(prod)], X);
-            numOfChecks += cflData->getSuccMap(j->getId())[grammar->getSecondRHSSymbol(prod)].count();
+            NodeBS diffDsts = addEdges(i->getId(), getSuccMap(j->getId())[grammar->getSecondRHSSymbol(prod)], X);
+            numOfChecks += getSuccMap(j->getId())[grammar->getSecondRHSSymbol(prod)].count();
             for (NodeID diffDst: diffDsts)
             {
                 const CFLEdge* newEdge = graph->addCFLEdge(i, graph->getGNode(diffDst), X);
@@ -179,8 +179,8 @@ void POCRSolver::processCFLEdge(const CFLEdge* Y_edge)
         for(const Production& prod : grammar->getProdsFromSecondRHS(Y))
         {
             Symbol X = grammar->getLHSSymbol(prod);
-            NodeBS diffSrcs = addEdges(cflData->getPredMap(i->getId())[grammar->getFirstRHSSymbol(prod)], j->getId(), X);
-            numOfChecks += cflData->getPredMap(i->getId())[grammar->getFirstRHSSymbol(prod)].count();
+            NodeBS diffSrcs = addEdges(getPredMap(i->getId())[grammar->getFirstRHSSymbol(prod)], j->getId(), X);
+            numOfChecks += getPredMap(i->getId())[grammar->getFirstRHSSymbol(prod)].count();
             for (NodeID diffSrc: diffSrcs)
             {
                 const CFLEdge* newEdge = graph->addCFLEdge(graph->getGNode(diffSrc), j, X);
@@ -203,16 +203,15 @@ void POCRSolver::initialize()
     ///     add X(i,i) if not exist to E and to worklist
     for(const Production& prod : grammar->getEpsilonProds())
     {
-        for(auto IDMap : cflData->getSuccMap())
+        for(auto IDMap : getSuccMap())
         {
             Symbol X = grammar->getLHSSymbol(prod);
-            if (cflData->addEdge(IDMap.first, IDMap.first, X))
+            if (addEdge(IDMap.first, IDMap.first, X))
             {
                 CFLNode* i = graph->getGNode(IDMap.first);
                 const CFLEdge* newEdge = graph->addCFLEdge(i, i, X);
                 pushIntoWorklist(newEdge);
             }
-
         }
     }
 }