svf-lib 1.0.1556 → 1.0.1558

package/SVF-linux/svf/include/AbstractExecution/AddressValue.h

@@ -136,13 +136,22 @@ public:
     }
 
     /// Current AddressValue joins with another AddressValue
-    void join_with(const AddressValue &other)
+    bool join_with(const AddressValue &other)
     {
-        _addrs.insert(other.begin(), other.end());
+        bool changed = false;
+        for (const auto &addr: other)
+        {
+            if (!_addrs.count(addr))
+            {
+                if (insert(addr).second)
+                    changed = true;
+            }
+        }
+        return changed;
     }
 
     /// Return a intersected AddressValue
-    void meet_with(const AddressValue &other)
+    bool meet_with(const AddressValue &other)
     {
         AddrSet s;
         for (const auto &id: other._addrs)
@@ -152,7 +161,9 @@ public:
                 s.insert(id);
             }
         }
+        bool changed = (_addrs != s);
         _addrs = std::move(s);
+        return changed;
     }
 
     /// Return true if the AddressValue contains n

package/SVF-linux/svf/include/AbstractExecution/BoundedZ3Expr.h

@@ -1,4 +1,4 @@
-//===- AddressValue.h ----Address Value Sets-------------------------//
+//===- BoundedZ3Expr.h ----Address Value Sets-------------------------//
 //
 //                     SVF: Static Value-Flow Analysis
 //
@@ -248,17 +248,20 @@ public:
 
     friend BoundedZ3Expr operator^(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(int2bv(64, lhs.getExpr()) ^ int2bv(64, rhs.getExpr()), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(int2bv(maxBvLen, lhs.getExpr()) ^ int2bv(maxBvLen, rhs.getExpr()), true);
     }
 
     friend BoundedZ3Expr operator&(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(int2bv(64, lhs.getExpr()) & int2bv(64, rhs.getExpr()), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(int2bv(maxBvLen, lhs.getExpr()) & int2bv(maxBvLen, rhs.getExpr()), true);
     }
 
     friend BoundedZ3Expr operator|(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(int2bv(64, lhs.getExpr()) | int2bv(64, rhs.getExpr()), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(int2bv(maxBvLen, lhs.getExpr()) | int2bv(maxBvLen, rhs.getExpr()), true);
     }
 
     friend BoundedZ3Expr ashr(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
@@ -270,7 +273,10 @@ public:
         else if (rhs.is_infinite())
             return ite(lhs.getExpr() >= 0, BoundedZ3Expr(0), BoundedZ3Expr(-1));
         else
-            return bv2int(ashr(int2bv(64, lhs.getExpr()), int2bv(64, rhs.getExpr())), true);
+        {
+            const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+            return bv2int(ashr(int2bv(maxBvLen, lhs.getExpr()), int2bv(maxBvLen, rhs.getExpr())), true);
+        }
     }
 
     friend BoundedZ3Expr shl(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
@@ -282,12 +288,16 @@ public:
         else if (rhs.is_infinite())
             return ite(lhs.getExpr() >= 0, plus_infinity(), minus_infinity());
         else
-            return bv2int(shl(int2bv(64, lhs.getExpr()), int2bv(64, rhs.getExpr())), true);
+        {
+            const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+            return bv2int(shl(int2bv(maxBvLen, lhs.getExpr()), int2bv(maxBvLen, rhs.getExpr())), true);
+        }
     }
 
     friend BoundedZ3Expr lshr(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(lshr(int2bv(64, lhs.getExpr()), int2bv(64, rhs.getExpr())), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(lshr(int2bv(maxBvLen, lhs.getExpr()), int2bv(maxBvLen, rhs.getExpr())), true);
     }
 
     friend BoundedZ3Expr int2bv(u32_t n, const BoundedZ3Expr &e)
@@ -340,6 +350,36 @@ public:
     {
         return getExpr().is_true();
     }
+
+    /// Return Numeral
+    inline int64_t getNumeral() const
+    {
+        if (is_numeral())
+        {
+            int64_t i;
+            if (getExpr().is_numeral_i64(i))
+                return get_numeral_int64();
+            else
+            {
+                return (getExpr() < 0).simplify().is_true() ? INT64_MIN : INT64_MAX;
+            }
+        }
+        if (is_minus_infinite())
+        {
+            return INT64_MIN;
+        }
+        else if (is_plus_infinite())
+        {
+            return INT64_MAX;
+        }
+        else
+        {
+            assert(false && "other literal?");
+            abort();
+        }
+    }
+
+    int64_t bvLen() const;
     //%}
 }; // end class ConZ3Expr
 } // end namespace SVF

package/SVF-linux/svf/include/AbstractExecution/NumericLiteral.h

@@ -119,29 +119,7 @@ public:
     /// Return Numeral
     inline int64_t getNumeral() const
     {
-        if (_n.is_numeral())
-        {
-            int64_t i;
-            if(_n.getExpr().is_numeral_i64(i))
-                return _n.get_numeral_int64();
-            else
-            {
-                return leq(0) ? INT64_MIN : INT64_MAX;
-            }
-        }
-        if (is_minus_infinity())
-        {
-            return INT64_MIN;
-        }
-        else if (is_plus_infinity())
-        {
-            return INT64_MAX;
-        }
-        else
-        {
-            assert(false && "other literal?");
-            abort();
-        }
+        return _n.getNumeral();
     }
 
     /// Check two object is equal

package/SVF-linux/svf/include/Util/Options.h

@@ -223,6 +223,9 @@ public:
     // Conditions.cpp
     static const Option<u32_t> MaxZ3Size;
 
+    // BoundedZ3Expr.cpp
+    static const Option<u32_t> MaxBVLen;
+
     // SaberCondAllocator.cpp
     static const Option<bool> PrintPathCond;
 

package/SVF-osx/svf/include/AbstractExecution/AddressValue.h

@@ -136,13 +136,22 @@ public:
     }
 
     /// Current AddressValue joins with another AddressValue
-    void join_with(const AddressValue &other)
+    bool join_with(const AddressValue &other)
     {
-        _addrs.insert(other.begin(), other.end());
+        bool changed = false;
+        for (const auto &addr: other)
+        {
+            if (!_addrs.count(addr))
+            {
+                if (insert(addr).second)
+                    changed = true;
+            }
+        }
+        return changed;
     }
 
     /// Return a intersected AddressValue
-    void meet_with(const AddressValue &other)
+    bool meet_with(const AddressValue &other)
     {
         AddrSet s;
         for (const auto &id: other._addrs)
@@ -152,7 +161,9 @@ public:
                 s.insert(id);
             }
         }
+        bool changed = (_addrs != s);
         _addrs = std::move(s);
+        return changed;
     }
 
     /// Return true if the AddressValue contains n

package/SVF-osx/svf/include/AbstractExecution/BoundedZ3Expr.h

@@ -1,4 +1,4 @@
-//===- AddressValue.h ----Address Value Sets-------------------------//
+//===- BoundedZ3Expr.h ----Address Value Sets-------------------------//
 //
 //                     SVF: Static Value-Flow Analysis
 //
@@ -248,17 +248,20 @@ public:
 
     friend BoundedZ3Expr operator^(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(int2bv(64, lhs.getExpr()) ^ int2bv(64, rhs.getExpr()), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(int2bv(maxBvLen, lhs.getExpr()) ^ int2bv(maxBvLen, rhs.getExpr()), true);
     }
 
     friend BoundedZ3Expr operator&(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(int2bv(64, lhs.getExpr()) & int2bv(64, rhs.getExpr()), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(int2bv(maxBvLen, lhs.getExpr()) & int2bv(maxBvLen, rhs.getExpr()), true);
     }
 
     friend BoundedZ3Expr operator|(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(int2bv(64, lhs.getExpr()) | int2bv(64, rhs.getExpr()), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(int2bv(maxBvLen, lhs.getExpr()) | int2bv(maxBvLen, rhs.getExpr()), true);
     }
 
     friend BoundedZ3Expr ashr(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
@@ -270,7 +273,10 @@ public:
         else if (rhs.is_infinite())
             return ite(lhs.getExpr() >= 0, BoundedZ3Expr(0), BoundedZ3Expr(-1));
         else
-            return bv2int(ashr(int2bv(64, lhs.getExpr()), int2bv(64, rhs.getExpr())), true);
+        {
+            const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+            return bv2int(ashr(int2bv(maxBvLen, lhs.getExpr()), int2bv(maxBvLen, rhs.getExpr())), true);
+        }
     }
 
     friend BoundedZ3Expr shl(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
@@ -282,12 +288,16 @@ public:
         else if (rhs.is_infinite())
             return ite(lhs.getExpr() >= 0, plus_infinity(), minus_infinity());
         else
-            return bv2int(shl(int2bv(64, lhs.getExpr()), int2bv(64, rhs.getExpr())), true);
+        {
+            const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+            return bv2int(shl(int2bv(maxBvLen, lhs.getExpr()), int2bv(maxBvLen, rhs.getExpr())), true);
+        }
     }
 
     friend BoundedZ3Expr lshr(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
     {
-        return bv2int(lshr(int2bv(64, lhs.getExpr()), int2bv(64, rhs.getExpr())), true);
+        const auto &maxBvLen = std::max(lhs.bvLen(), rhs.bvLen());
+        return bv2int(lshr(int2bv(maxBvLen, lhs.getExpr()), int2bv(maxBvLen, rhs.getExpr())), true);
     }
 
     friend BoundedZ3Expr int2bv(u32_t n, const BoundedZ3Expr &e)
@@ -340,6 +350,36 @@ public:
     {
         return getExpr().is_true();
     }
+
+    /// Return Numeral
+    inline int64_t getNumeral() const
+    {
+        if (is_numeral())
+        {
+            int64_t i;
+            if (getExpr().is_numeral_i64(i))
+                return get_numeral_int64();
+            else
+            {
+                return (getExpr() < 0).simplify().is_true() ? INT64_MIN : INT64_MAX;
+            }
+        }
+        if (is_minus_infinite())
+        {
+            return INT64_MIN;
+        }
+        else if (is_plus_infinite())
+        {
+            return INT64_MAX;
+        }
+        else
+        {
+            assert(false && "other literal?");
+            abort();
+        }
+    }
+
+    int64_t bvLen() const;
     //%}
 }; // end class ConZ3Expr
 } // end namespace SVF

package/SVF-osx/svf/include/AbstractExecution/NumericLiteral.h

@@ -119,29 +119,7 @@ public:
     /// Return Numeral
     inline int64_t getNumeral() const
     {
-        if (_n.is_numeral())
-        {
-            int64_t i;
-            if(_n.getExpr().is_numeral_i64(i))
-                return _n.get_numeral_int64();
-            else
-            {
-                return leq(0) ? INT64_MIN : INT64_MAX;
-            }
-        }
-        if (is_minus_infinity())
-        {
-            return INT64_MIN;
-        }
-        else if (is_plus_infinity())
-        {
-            return INT64_MAX;
-        }
-        else
-        {
-            assert(false && "other literal?");
-            abort();
-        }
+        return _n.getNumeral();
     }
 
     /// Check two object is equal

package/SVF-osx/svf/include/Util/Options.h

@@ -223,6 +223,9 @@ public:
     // Conditions.cpp
     static const Option<u32_t> MaxZ3Size;
 
+    // BoundedZ3Expr.cpp
+    static const Option<u32_t> MaxBVLen;
+
     // SaberCondAllocator.cpp
     static const Option<bool> PrintPathCond;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.1556",
+  "version": "1.0.1558",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {