svf-tools 1.0.944 → 1.0.945

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.944",
+  "version": "1.0.945",
   "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/Core/ICFGWTO.h

@@ -41,8 +41,8 @@ namespace SVF
 {
 
 typedef WTOComponent<ICFG> ICFGWTOComp;
-typedef WTONode<ICFG> ICFGWTONode;
-typedef WTOCycle<ICFG> ICFGWTOCycle;
+typedef WTONode<ICFG> ICFGSingletonWTO;
+typedef WTOCycle<ICFG> ICFGCycleWTO;
 
 class ICFGWTO : public WTO<ICFG>
 {

package/svf/include/AE/Svfexe/AbstractInterpretation.h

@@ -157,11 +157,11 @@ protected:
     bool isBranchFeasible(const IntraCFGEdge* intraEdge, AbstractState& as);
 
     /**
-     * handle instructions in ICFGNode
+     * handle instructions in ICFGSingletonWTO
      *
-     * @param block basic block that has a series of instructions
+     * @param block basic block that has one instruction or a series of instructions
      */
-    virtual void handleWTONode(const ICFGNode* node);
+    virtual void handleWTONode(const ICFGSingletonWTO *icfgSingletonWto);
 
     /**
      * handle one instruction in ICFGNode
@@ -182,7 +182,7 @@ protected:
      *
      * @param cycle WTOCycle which has weak topo order of basic blocks and nested cycles
      */
-    virtual void handleCycle(const ICFGWTOCycle* cycle);
+    virtual void handleCycle(const ICFGCycleWTO* cycle);
 
     /**
      * handle user defined function, ext function is not included.

package/svf/include/Graphs/WTO.h

@@ -395,21 +395,21 @@ public:
 
 private:
     /// Head of the cycle
-    const NodeT* _head;
+    const WTONode<GraphT>* _head;
 
     /// List of components
     WTOComponentRefList _components;
 
 public:
     /// Constructor
-    WTOCycle(const NodeT* head, WTOComponentRefList components)
+    WTOCycle(const WTONode<GraphT>* head, WTOComponentRefList components)
         : WTOComponent<GraphT>(WTOComponent<GraphT>::Cycle), _head(head),
           _components(std::move(components))
     {
     }
 
     /// Return the head of the cycle
-    const NodeT* head() const
+    const WTONode<GraphT>* head() const
     {
         return _head;
     }
@@ -451,7 +451,7 @@ public:
         std::string str;
         std::stringstream rawstr(str);
         rawstr << "(";
-        rawstr << _head->getId() << ", ";
+        rawstr << _head->node()->getId() << ", ";
         for (auto it = begin(), et = end(); it != et;)
         {
             rawstr << (*it)->toString();
@@ -687,7 +687,7 @@ protected:
 
         void visit(const WTOCycleT& cycle) override
         {
-            const NodeT* head = cycle.head();
+            const NodeT* head = cycle.head()->node();
             WTOCycleDepthPtr previous_cycleDepth = _wtoCycleDepth;
             _nodeToWTOCycleDepth.insert(std::make_pair(head, _wtoCycleDepth));
             _wtoCycleDepth =
@@ -765,7 +765,7 @@ protected:
         return ptr;
     }
 
-    const WTOCycleT* newCycle(const NodeT* node,
+    const WTOCycleT* newCycle(const WTONodeT* node,
                               const WTOComponentRefList& partition)
     {
         const WTOCycleT* ptr = new WTOCycleT(node, std::move(partition));
@@ -784,7 +784,8 @@ protected:
                 visit(succ, partition);
             }
         });
-        const WTOCycleT* ptr = newCycle(node, partition);
+        const WTONodeT* head = newNode(node);
+        const WTOCycleT* ptr = newCycle(head, partition);
         headRefToCycle.emplace(node, ptr);
         return ptr;
     }

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

@@ -518,8 +518,9 @@ bool AbstractInterpretation::isBranchFeasible(const IntraCFGEdge* intraEdge,
     return true;
 }
 /// handle instructions in svf basic blocks
-void AbstractInterpretation::handleWTONode(const ICFGNode *node)
+void AbstractInterpretation::handleWTONode(const ICFGSingletonWTO *icfgSingletonWto)
 {
+    const ICFGNode* node = icfgSingletonWto->node();
     _stat->getBlockTrace()++;
     // Get execution states from in edges
     if (!propagateStateIfFeasible(node))
@@ -690,30 +691,28 @@ void AbstractInterpretation::handleICFGNode(const ICFGNode *curICFGNode)
 }
 
 /// handle wto cycle (loop)
-void AbstractInterpretation::handleCycle(const ICFGWTOCycle *cycle)
+void AbstractInterpretation::handleCycle(const ICFGCycleWTO*cycle)
 {
     // Get execution states from in edges
-    if (!propagateStateIfFeasible(cycle->head()))
+    if (!propagateStateIfFeasible(cycle->head()->node()))
     {
         // No ES on the in edges - Infeasible block
         return;
     }
-    AbstractState pre_es = _preAbsTrace[cycle->head()];
+    AbstractState pre_es = _preAbsTrace[cycle->head()->node()];
     // set -widen-delay
     s32_t widen_delay = Options::WidenDelay();
     bool incresing = true;
     for (int i = 0; ; i++)
     {
-        const ICFGNode* cycle_head = cycle->head();
-        // handle cycle head
-        handleWTONode(cycle_head);
+        handleWTONode(cycle->head());
         if (i < widen_delay)
         {
-            if (i> 0 && pre_es >= _postAbsTrace[cycle_head])
+            if (i> 0 && pre_es >= _postAbsTrace[cycle->head()->node()])
             {
                 break;
             }
-            pre_es = _postAbsTrace[cycle_head];
+            pre_es = _postAbsTrace[cycle->head()->node()];
         }
         else
         {
@@ -722,7 +721,7 @@ void AbstractInterpretation::handleCycle(const ICFGWTOCycle *cycle)
                 if (incresing)
                 {
                     bool is_fixpoint =
-                        isFixPointAfterWidening(cycle_head, pre_es);
+                        isFixPointAfterWidening(cycle->head()->node(), pre_es);
                     if (is_fixpoint)
                     {
                         incresing = false;
@@ -732,7 +731,7 @@ void AbstractInterpretation::handleCycle(const ICFGWTOCycle *cycle)
                 else if (!incresing)
                 {
                     bool is_fixpoint =
-                        isFixPointAfterNarrowing(cycle_head, pre_es);
+                        isFixPointAfterNarrowing(cycle->head()->node(), pre_es);
                     if (is_fixpoint)
                         break;
                 }
@@ -741,11 +740,11 @@ void AbstractInterpretation::handleCycle(const ICFGWTOCycle *cycle)
         for (auto it = cycle->begin(); it != cycle->end(); ++it)
         {
             const ICFGWTOComp* cur = *it;
-            if (const ICFGWTONode* vertex = SVFUtil::dyn_cast<ICFGWTONode>(cur))
+            if (const ICFGSingletonWTO* vertex = SVFUtil::dyn_cast<ICFGSingletonWTO>(cur))
             {
-                handleWTONode(vertex->node());
+                handleWTONode(vertex);
             }
-            else if (const ICFGWTOCycle* cycle2 = SVFUtil::dyn_cast<ICFGWTOCycle>(cur))
+            else if (const ICFGCycleWTO* cycle2 = SVFUtil::dyn_cast<ICFGCycleWTO>(cur))
             {
                 handleCycle(cycle2);
             }
@@ -813,11 +812,11 @@ void AbstractInterpretation::handleFunc(const SVFFunction *func)
     for (auto it = wto->begin(); it!= wto->end(); ++it)
     {
         const ICFGWTOComp* cur = *it;
-        if (const ICFGWTONode* vertex = SVFUtil::dyn_cast<ICFGWTONode>(cur))
+        if (const ICFGSingletonWTO* vertex = SVFUtil::dyn_cast<ICFGSingletonWTO>(cur))
         {
-            handleWTONode(vertex->node());
+            handleWTONode(vertex);
         }
-        else if (const ICFGWTOCycle* cycle = SVFUtil::dyn_cast<ICFGWTOCycle>(cur))
+        else if (const ICFGCycleWTO* cycle = SVFUtil::dyn_cast<ICFGCycleWTO>(cur))
         {
             handleCycle(cycle);
         }