svf-tools 1.0.1132 → 1.0.1133

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1132",
+  "version": "1.0.1133",
   "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/AE/Svfexe/AbstractInterpretation.h

@@ -164,15 +164,14 @@ public:
      */
     AbstractState& getAbsStateFromTrace(const ICFGNode* node)
     {
-        const ICFGNode* repNode = icfg->getRepNode(node);
-        if (abstractTrace.count(repNode) == 0)
+        if (abstractTrace.count(node) == 0)
         {
             assert(false && "No preAbsTrace for this node");
             abort();
         }
         else
         {
-            return abstractTrace[repNode];
+            return abstractTrace[node];
         }
     }
 
@@ -303,8 +302,7 @@ private:
 
     bool hasAbsStateFromTrace(const ICFGNode* node)
     {
-        const ICFGNode* repNode = icfg->getRepNode(node);
-        return abstractTrace.count(repNode) != 0;
+        return abstractTrace.count(node) != 0;
     }
 
     AbsExtAPI* getUtils()

package/svf/include/Graphs/ICFG.h

@@ -71,10 +71,6 @@ private:
     GlobalICFGNode* globalBlockNode; ///< unique basic block for all globals
     ICFGNodeToSVFLoopVec icfgNodeToSVFLoopVec; ///< map ICFG node to the SVF loops where it resides
 
-    Map<const ICFGNode*, std::vector<const ICFGNode*>> _subNodes; ///<map a node(1st node of basicblock) to its subnodes
-    Map<const ICFGNode*, const ICFGNode*> _repNode; ///<map a subnode to its representative node(1st node of basicblock)
-
-
 public:
     /// Constructor
     ICFG();
@@ -219,8 +215,6 @@ protected:
     virtual inline void addICFGNode(ICFGNode* node)
     {
         addGNode(node->getId(),node);
-        _repNode[node] = node;
-        _subNodes[node].push_back(node);
     }
 
 public:
@@ -237,42 +231,9 @@ public:
     {
         return globalBlockNode;
     }
-
-    const std::vector<const ICFGNode*>& getSubNodes(const ICFGNode* node) const
-    {
-        return _subNodes.at(node);
-    }
-
-    const ICFGNode* getRepNode(const ICFGNode* node) const
-    {
-        return _repNode.at(node);
-    }
-
-
-    void updateSubAndRep(const ICFGNode* rep, const ICFGNode* sub)
-    {
-        addSubNode(rep, sub);
-        updateRepNode(rep, sub);
-    }
     //@}
 
 private:
-    /// when ICFG is simplified, SubNode would merge repNode, then update the map
-    void addSubNode(const ICFGNode* rep, const ICFGNode* sub)
-    {
-        std::vector<const ICFGNode*>& subNodes = _subNodes[sub];
-        if(std::find(subNodes.begin(), subNodes.end(), rep) == subNodes.end())
-        {
-            subNodes.push_back(rep);
-        }
-    }
-
-    /// when ICFG is simplified, some node would be removed, this map records the removed node to its rep node
-    void updateRepNode(const ICFGNode* rep, const ICFGNode* sub)
-    {
-        _repNode[rep] = sub;
-    }
-
     /// Add ICFG edge, only used by addIntraEdge, addCallEdge, addRetEdge etc.
     inline bool addICFGEdge(ICFGEdge* edge)
     {

package/svf/lib/AE/Svfexe/AbsExtAPI.cpp

@@ -376,15 +376,14 @@ void AbsExtAPI::initExtFunMap()
 
 AbstractState& AbsExtAPI::getAbsStateFromTrace(const SVF::ICFGNode* node)
 {
-    const ICFGNode* repNode = icfg->getRepNode(node);
-    if (abstractTrace.count(repNode) == 0)
+    if (abstractTrace.count(node) == 0)
     {
         assert(0 && "No preAbsTrace for this node");
         abort();
     }
     else
     {
-        return abstractTrace[repNode];
+        return abstractTrace[node];
     }
 }
 

package/svf/lib/AE/Svfexe/AbstractInterpretation.cpp

@@ -570,25 +570,20 @@ void AbstractInterpretation::handleSingletonWTO(const ICFGSingletonWTO *icfgSing
 
     std::deque<const ICFGNode*> worklist;
 
-    const std::vector<const ICFGNode*>& worklist_vec = icfg->getSubNodes(node);
-    for (auto it = worklist_vec.begin(); it != worklist_vec.end(); ++it)
+    stat->getICFGNodeTrace()++;
+    // handle SVF Stmt
+    for (const SVFStmt *stmt: node->getSVFStmts())
     {
-        const ICFGNode* curNode = *it;
-        stat->getICFGNodeTrace()++;
-        // handle SVF Stmt
-        for (const SVFStmt *stmt: curNode->getSVFStmts())
-        {
-            handleSVFStatement(stmt);
-        }
-        // inlining the callee by calling handleFunc for the callee function
-        if (const CallICFGNode* callnode = SVFUtil::dyn_cast<CallICFGNode>(curNode))
-        {
-            handleCallSite(callnode);
-        }
-        for (auto& detector: detectors)
-            detector->detect(getAbsStateFromTrace(node), node);
-        stat->countStateSize();
+        handleSVFStatement(stmt);
+    }
+    // inlining the callee by calling handleFunc for the callee function
+    if (const CallICFGNode* callnode = SVFUtil::dyn_cast<CallICFGNode>(node))
+    {
+        handleCallSite(callnode);
     }
+    for (auto& detector: detectors)
+        detector->detect(getAbsStateFromTrace(node), node);
+    stat->countStateSize();
 }
 
 /**