svf-tools 1.0.700 → 1.0.702

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.700",
+  "version": "1.0.702",
   "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/IntervalValue.h

@@ -299,7 +299,7 @@ public:
         }
         else
         {
-            return this->_lb.leq(other._lb) && this->_ub.leq(other._ub);
+            return other._lb.leq(this->_lb) && this->_ub.leq(other._ub);
         }
 
     }
@@ -317,7 +317,7 @@ public:
         }
         else
         {
-            return this->_lb.geq(other._lb) && this->_ub.geq(other._ub);
+            return other._lb.geq(this->_lb) && this->_ub.geq(other._ub);
         }
     }
 
@@ -381,7 +381,7 @@ public:
         }
         else
         {
-            this->_lb = !lb().geq(other.lb()) ? minus_infinity() : this->lb();
+            this->_lb = !lb().leq(other.lb()) ? minus_infinity() : this->lb();
             this->_ub = !ub().geq(other.ub()) ? plus_infinity() : this->ub();
         }
     }

package/svf/include/AbstractExecution/SVFIR2ItvExeState.h

@@ -66,6 +66,10 @@ public:
         return _relEs;
     }
 
+    void widenVAddrs(IntervalExeState &lhs, const IntervalExeState &rhs);
+
+    void narrowVAddrs(IntervalExeState &lhs, const IntervalExeState &rhs);
+
     /// Return the field address given a pointer points to a struct object and an offset
     VAddrs getGepObjAddress(u32_t pointer, u32_t offset);
 

package/svf/lib/AbstractExecution/SVFIR2ItvExeState.cpp

@@ -80,6 +80,78 @@ void SVFIR2ItvExeState::moveToGlobal()
     _es._locToVAddrs.clear();
 }
 
+void SVFIR2ItvExeState::widenVAddrs(IntervalExeState &lhs, const IntervalExeState &rhs)
+{
+    for (const auto &rhsItem: rhs._varToVAddrs)
+    {
+        auto lhsIter = lhs._varToVAddrs.find(rhsItem.first);
+        if (lhsIter != lhs._varToVAddrs.end())
+        {
+            for (const auto &addr: rhsItem.second)
+            {
+                if (!lhsIter->second.contains(addr))
+                {
+                    for (s32_t i = 0; i < (s32_t) Options::MaxFieldLimit(); i++)
+                    {
+                        lhsIter->second.join_with(getGepObjAddress(getInternalID(addr), i));
+                    }
+                }
+            }
+        }
+    }
+    for (const auto &rhsItem: rhs._locToVAddrs)
+    {
+        auto lhsIter = lhs._locToVAddrs.find(rhsItem.first);
+        if (lhsIter != lhs._locToVAddrs.end())
+        {
+            for (const auto &addr: rhsItem.second)
+            {
+                if (!lhsIter->second.contains(addr))
+                {
+                    for (s32_t i = 0; i < (s32_t) Options::MaxFieldLimit(); i++)
+                    {
+                        lhsIter->second.join_with(getGepObjAddress(getInternalID(addr), i));
+                    }
+                }
+            }
+        }
+    }
+}
+
+void SVFIR2ItvExeState::narrowVAddrs(IntervalExeState &lhs, const IntervalExeState &rhs)
+{
+    for (const auto &rhsItem: rhs._varToVAddrs)
+    {
+        auto lhsIter = lhs._varToVAddrs.find(rhsItem.first);
+        if (lhsIter != lhs._varToVAddrs.end())
+        {
+            for (const auto &addr: lhsIter->second)
+            {
+                if (!rhsItem.second.contains(addr))
+                {
+                    lhsIter->second = rhsItem.second;
+                    break;
+                }
+            }
+        }
+    }
+    for (const auto &rhsItem: rhs._locToVAddrs)
+    {
+        auto lhsIter = lhs._locToVAddrs.find(rhsItem.first);
+        if (lhsIter != lhs._locToVAddrs.end())
+        {
+            for (const auto &addr: lhsIter->second)
+            {
+                if (!rhsItem.second.contains(addr))
+                {
+                    lhsIter->second = rhsItem.second;
+                    break;
+                }
+            }
+        }
+    }
+}
+
 SVFIR2ItvExeState::VAddrs SVFIR2ItvExeState::getGepObjAddress(u32_t pointer, u32_t offset)
 {
     assert(!getVAddrs(pointer).empty());

package/svf/lib/Util/SVFBugReport.cpp

@@ -322,7 +322,7 @@ void SVFBugReport::dumpToJsonFile(const std::string& filePath)
 
     ofstream jsonFile(filePath, ios::out);
 
-    jsonFile << "{";
+    jsonFile << "[";
 
     size_t commaCounter = bugSet.size() - 1;  // comma num needed
     for(auto bugPtr : bugSet)
@@ -394,6 +394,6 @@ void SVFBugReport::dumpToJsonFile(const std::string& filePath)
         cJSON_Delete(singleBug);
     }
 
-    jsonFile << "}";
+    jsonFile << "]";
     jsonFile.close();
-}
+}