svf-tools 1.0.697 → 1.0.698

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.697",
+  "version": "1.0.698",
   "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

@@ -140,11 +140,11 @@ public:
 
     VAddrs &getVAddrs(u32_t id) override
     {
-        auto it = globalES._varToVAddrs.find(id);
-        if (it != globalES._varToVAddrs.end())
+        auto it = _varToVAddrs.find(id);
+        if (it != _varToVAddrs.end())
             return it->second;
         else
-            return _varToVAddrs[id];
+            return globalES._varToVAddrs[id];
     }
 
     inline bool inVarToIValTable(u32_t id) const
@@ -201,14 +201,24 @@ public:
     ///  [], call getValueExpr()
     inline IntervalValue &operator[](u32_t varId)
     {
-        auto it = globalES._varToItvVal.find(varId);
-        if (it != globalES._varToItvVal.end())
+        auto localIt = _varToItvVal.find(varId);
+        if(localIt != _varToItvVal.end())
+            return localIt->second;
+        else
         {
-            return it->second;
+            return globalES._varToItvVal[varId];
         }
-        else
+    }
+
+    inline void cpyItvToLocal(u32_t varId)
+    {
+        auto localIt = _varToItvVal.find(varId);
+        // local already have varId
+        if (localIt != _varToItvVal.end()) return;
+        auto globIt = globalES._varToItvVal.find(varId);
+        if (globIt != globalES._varToItvVal.end())
         {
-            return _varToItvVal[varId];
+            _varToItvVal[varId] = globIt->second;
         }
     }
 
@@ -370,16 +380,29 @@ public:
 
     static bool lessThanVarToValMap(const VarToValMap &lhs, const VarToValMap &rhs)
     {
+        if (lhs.empty()) return !rhs.empty();
         for (const auto &item: lhs)
         {
             auto it = rhs.find(item.first);
+            if (it == rhs.end()) return false;
             // judge from expr id
-            if (!item.second.equals(it->second))
-            {
-                return !item.second.geq(it->second);
-            }
+            if (item.second.geq(it->second)) return false;
         }
-        return false;
+        return true;
+    }
+
+    // lhs >= rhs
+    static bool geqVarToValMap(const VarToValMap &lhs, const VarToValMap &rhs)
+    {
+        if (rhs.empty()) return true;
+        for (const auto &item: rhs)
+        {
+            auto it = lhs.find(item.first);
+            if (it == lhs.end()) return false;
+            // judge from expr id
+            if (!it->second.geq(item.second)) return false;
+        }
+        return true;
     }
 
     bool operator==(const IntervalExeState &rhs) const
@@ -395,15 +418,13 @@ public:
 
     bool operator<(const IntervalExeState &rhs) const
     {
-        // judge from path constraint
-        return (lessThanVarToValMap(_varToItvVal, rhs.getVarToVal()) ||
-                lessThanVarToValMap(_locToItvVal, rhs.getLocToVal()));
+        return !(*this >= rhs);
     }
 
 
     bool operator>=(const IntervalExeState &rhs) const
     {
-        return !(*this < rhs);
+        return geqVarToValMap(_varToItvVal, rhs.getVarToVal()) && geqVarToValMap(_locToItvVal, rhs.getLocToVal());
     }
 
     void clear()

package/svf/include/AbstractExecution/IntervalValue.h

@@ -438,9 +438,19 @@ public:
         }
     }
 
-    std::string toString() const
+    const std::string toString() const
     {
-        return "[" + lb().to_string() + ", " + ub().to_string() + "]";
+        std::string str;
+        std::stringstream rawStr(str);
+        if (this->isBottom())
+        {
+            rawStr << "⊥";
+        }
+        else
+        {
+            rawStr << "[" << lb().to_string() << ", " << ub().to_string() << "]";
+        }
+        return rawStr.str();
     }
 
 }; // end class IntervalValue

package/svf/lib/AbstractExecution/SVFIR2ItvExeState.cpp

@@ -600,7 +600,7 @@ void SVFIR2ItvExeState::translateLoad(const LoadStmt *load)
             if (inLocToIValTable(objId))
                 _es[lhs] = IntervalValue::bottom();
             else if (inLocToAddrsTable(objId))
-                getVAddrs(lhs).setBottom();
+                _es.getVAddrs(lhs).setBottom();
             break;
         }
         for (const auto &addr: addrs)
@@ -621,11 +621,11 @@ void SVFIR2ItvExeState::translateLoad(const LoadStmt *load)
             {
                 if (!inVarToAddrsTable(lhs))
                 {
-                    getEs().getVAddrs(lhs) = _es.loadVAddrs(addr);
+                    _es.getVAddrs(lhs) = _es.loadVAddrs(addr);
                 }
                 else
                 {
-                    getVAddrs(lhs).join_with(_es.loadVAddrs(addr));
+                    _es.getVAddrs(lhs).join_with(_es.loadVAddrs(addr));
                 }
             }
         }
@@ -678,7 +678,7 @@ void SVFIR2ItvExeState::translateCopy(const CopyStmt *copy)
         else if (inVarToAddrsTable(rhs))
         {
             assert(!getVAddrs(rhs).empty());
-            getEs().getVAddrs(lhs) = getVAddrs(rhs);
+            _es.getVAddrs(lhs) = getVAddrs(rhs);
         }
     }
 }
@@ -738,7 +738,7 @@ void SVFIR2ItvExeState::translateSelect(const SelectStmt *select)
         {
             assert(!getVAddrs(fval).empty());
             assert(!getVAddrs(tval).empty());
-            getEs().getVAddrs(res) = _es[cond].is_zero() ? getVAddrs(fval) : getVAddrs(tval);
+            _es.getVAddrs(res) = _es[cond].is_zero() ? getVAddrs(fval) : getVAddrs(tval);
         }
     }
 }
@@ -767,11 +767,11 @@ void SVFIR2ItvExeState::translatePhi(const PhiStmt *phi)
             const VAddrs &cur = getVAddrs(curId);
             if (!inVarToAddrsTable(res))
             {
-                getEs().getVAddrs(res) = cur;
+                _es.getVAddrs(res) = cur;
             }
             else
             {
-                getVAddrs(res).join_with(cur);
+                _es.getVAddrs(res).join_with(cur);
             }
         }
     }
@@ -789,7 +789,7 @@ void SVFIR2ItvExeState::translateCall(const CallPE *callPE)
     else if (inVarToAddrsTable(rhs))
     {
         assert(!getVAddrs(rhs).empty());
-        getEs().getVAddrs(lhs) = getVAddrs(rhs);
+        _es.getVAddrs(lhs) = getVAddrs(rhs);
     }
 }
 
@@ -804,6 +804,6 @@ void SVFIR2ItvExeState::translateRet(const RetPE *retPE)
     else if (inVarToAddrsTable(rhs))
     {
         assert(!getVAddrs(rhs).empty());
-        getEs().getVAddrs(lhs) = getVAddrs(rhs);
+        _es.getVAddrs(lhs) = getVAddrs(rhs);
     }
 }