svf-tools 1.0.652 → 1.0.653

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.652",
+  "version": "1.0.653",
   "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/lib/SABER/SaberCondAllocator.cpp

@@ -374,14 +374,22 @@ bool SaberCondAllocator::isTestNotNullExpr(const SVFValue* test) const
 /*!
  * Return true if:
  * (1) cmp contains a null value
- * (2) there is an indirect edge from cur evaluated SVFG node to cmp operand
+ * (2) there is an indirect/direct edge from cur evaluated SVFG node to cmp operand
  *
  * e.g.,
+ * indirect edge:
  *      cur svfg node -> 1. store i32* %0, i32** %p, align 8, !dbg !157
  *      cmp operand   -> 2. %1 = load i32*, i32** %p, align 8, !dbg !159
  *                       3. %tobool = icmp ne i32* %1, null, !dbg !159
  *                       4. br i1 %tobool, label %if.end, label %if.then, !dbg !161
  *     There is an indirect edge 1->2 with value %0
+ *
+ * direct edge:
+ *      cur svfg node -> 1. %3 = tail call i8* @malloc(i64 16), !dbg !22
+ *      (cmp operand)    2. %4 = icmp eq i8* %3, null, !dbg !28
+ *                       3. br i1 %4, label %7, label %5, !dbg !30
+ *     There is an direct edge 1->2 with value %3
+ *
  */
 bool SaberCondAllocator::isTestContainsNullAndTheValue(const CmpStmt *cmp) const
 {
@@ -391,29 +399,24 @@ bool SaberCondAllocator::isTestContainsNullAndTheValue(const CmpStmt *cmp) const
     if (SVFUtil::isa<SVFConstantNullPtr>(op1))
     {
         Set<const SVFValue* > inDirVal;
+        inDirVal.insert(getCurEvalSVFGNode()->getValue());
         for (const auto &it: getCurEvalSVFGNode()->getOutEdges())
         {
-            if (it->isIndirectVFGEdge())
-            {
-                inDirVal.insert(it->getDstNode()->getValue());
-            }
+            inDirVal.insert(it->getDstNode()->getValue());
         }
         return inDirVal.find(op0) != inDirVal.end();
     }
     else if (SVFUtil::isa<SVFConstantNullPtr>(op0))
     {
         Set<const SVFValue* > inDirVal;
+        inDirVal.insert(getCurEvalSVFGNode()->getValue());
         for (const auto &it: getCurEvalSVFGNode()->getOutEdges())
         {
-            if (it->isIndirectVFGEdge())
-            {
-                inDirVal.insert(it->getDstNode()->getValue());
-            }
+            inDirVal.insert(it->getDstNode()->getValue());
         }
         return inDirVal.find(op1) != inDirVal.end();
     }
     return false;
-
 }
 
 /*!