svf-tools 1.0.640 → 1.0.641

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.640",
+  "version": "1.0.641",
   "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/AbstractExecution/IntervalExeState.h

@@ -212,6 +212,12 @@ public:
         }
     }
 
+    /// domain widen with other, and return the widened domain
+    IntervalExeState widening(const IntervalExeState &other);
+
+    /// domain narrow with other, and return the narrowed domain
+    IntervalExeState narrowing(const IntervalExeState &other);
+
     /// domain widen with other, important! other widen this.
     void widenWith(const IntervalExeState &other);
 
@@ -252,6 +258,13 @@ public:
                 return true;
             }
         }
+        for (auto it = _locToItvVal.begin(); it != _locToItvVal.end(); ++it)
+        {
+            if (it->second.isBottom())
+            {
+                return true;
+            }
+        }
         return false;
     }
 
@@ -357,13 +370,9 @@ public:
 
     static bool lessThanVarToValMap(const VarToValMap &lhs, const VarToValMap &rhs)
     {
-        if (lhs.size() != rhs.size()) return lhs.size() < rhs.size();
         for (const auto &item: lhs)
         {
             auto it = rhs.find(item.first);
-            // lhs > rhs if SVFVar not exists in rhs
-            if (it == rhs.end())
-                return false;
             // judge from expr id
             if (!item.second.equals(it->second))
             {

package/svf/include/AbstractExecution/IntervalValue.h

@@ -377,7 +377,7 @@ public:
         }
         else
         {
-            this->_lb = !lb().leq(other.lb()) ? minus_infinity() : this->lb();
+            this->_lb = !lb().geq(other.lb()) ? minus_infinity() : this->lb();
             this->_ub = !ub().geq(other.ub()) ? plus_infinity() : this->ub();
         }
     }
@@ -395,8 +395,8 @@ public:
         }
         else
         {
-            this->_lb = is_infinite(this->_lb) ? other._lb : this->_lb;
-            this->_ub = is_infinite(this->_ub) ? other._ub : this->_ub;
+            this->_lb = is_infinite(this->lb()) ? other._lb : this->_lb;
+            this->_ub = is_infinite(this->ub()) ? other._ub : this->_ub;
         }
     }
 

package/svf/lib/AbstractExecution/IntervalExeState.cpp

@@ -56,6 +56,43 @@ u32_t IntervalExeState::hash() const
     return pairH(std::make_pair(std::make_pair(h, h2), (u32_t) ExeState::hash()));
 }
 
+IntervalExeState IntervalExeState::widening(const IntervalExeState& other)
+{
+    IntervalExeState es = *this;
+    for (auto it = es._varToItvVal.begin(); it != es._varToItvVal.end(); ++it)
+    {
+        auto key = it->first;
+        if (other._varToItvVal.find(key) != other._varToItvVal.end())
+            it->second.widen_with(other._varToItvVal.at(key));
+    }
+    for (auto it = es._locToItvVal.begin(); it != es._locToItvVal.end(); ++it)
+    {
+        auto key = it->first;
+        if (other._locToItvVal.find(key) != other._locToItvVal.end())
+            it->second.widen_with(other._locToItvVal.at(key));
+    }
+    return es;
+}
+
+IntervalExeState IntervalExeState::narrowing(const IntervalExeState& other)
+{
+    IntervalExeState es = *this;
+    for (auto it = es._varToItvVal.begin(); it != es._varToItvVal.end(); ++it)
+    {
+        auto key = it->first;
+        if (other._varToItvVal.find(key) != other._varToItvVal.end())
+            it->second.narrow_with(other._varToItvVal.at(key));
+    }
+    for (auto it = es._locToItvVal.begin(); it != es._locToItvVal.end(); ++it)
+    {
+        auto key = it->first;
+        if (other._locToItvVal.find(key) != other._locToItvVal.end())
+            it->second.narrow_with(other._locToItvVal.at(key));
+    }
+    return es;
+
+}
+
 /// domain widen with other, important! other widen this.
 void IntervalExeState::widenWith(const IntervalExeState& other)
 {
@@ -63,21 +100,13 @@ void IntervalExeState::widenWith(const IntervalExeState& other)
     {
         auto key = it->first;
         if (other.getVarToVal().find(key) != other.getVarToVal().end())
-        {
-            auto lhs = other.getVarToVal().at(key);
-            lhs.widen_with(it->second);
-            it->second = lhs;
-        }
+            it->second.widen_with(other._varToItvVal.at(key));
     }
     for (auto it = _locToItvVal.begin(); it != _locToItvVal.end(); ++it)
     {
         auto key = it->first;
         if (other._locToItvVal.find(key) != other._locToItvVal.end())
-        {
-            auto lhs = other._locToItvVal.at(key);
-            lhs.widen_with(it->second);
-            it->second = lhs;
-        }
+            it->second.widen_with(other._locToItvVal.at(key));
     }
 }
 
@@ -89,7 +118,7 @@ void IntervalExeState::joinWith(const IntervalExeState& other)
     {
         auto key = it->first;
         auto oit = _varToItvVal.find(key);
-        if (oit != other._varToItvVal.end())
+        if (oit != _varToItvVal.end())
         {
             oit->second.join_with(it->second);
         }
@@ -102,7 +131,7 @@ void IntervalExeState::joinWith(const IntervalExeState& other)
     {
         auto key = it->first;
         auto oit = _locToItvVal.find(key);
-        if (oit != other._locToItvVal.end())
+        if (oit != _locToItvVal.end())
         {
             oit->second.join_with(it->second);
         }
@@ -121,18 +150,14 @@ void IntervalExeState::narrowWith(const IntervalExeState& other)
         auto key = it->first;
         auto oit = other.getVarToVal().find(key);
         if (oit != other.getVarToVal().end())
-        {
             it->second.narrow_with(oit->second);
-        }
     }
     for (auto it = _locToItvVal.begin(); it != _locToItvVal.end(); ++it)
     {
         auto key = it->first;
         auto oit = other._locToItvVal.find(key);
         if (oit != other._locToItvVal.end())
-        {
             it->second.narrow_with(oit->second);
-        }
     }
 }