svf-tools 1.0.682 → 1.0.684

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.682",
+  "version": "1.0.684",
   "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/BoundedZ3Expr.h

@@ -0,0 +1,353 @@
+//===- AddressValue.h ----Address Value Sets-------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2022>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+/*
+ * BoundedZ3Expr.h
+ *
+ *  Created on: Mar 20, 2023
+ *      Author: Xiao Cheng
+ *
+ */
+
+#ifndef SVF_BOUNDEDZ3EXPR_H
+#define SVF_BOUNDEDZ3EXPR_H
+
+#include "Util/Z3Expr.h"
+
+namespace SVF
+{
+
+/*!
+ * Atom Z3 expr for unlimited precision integers
+ */
+class BoundedZ3Expr : public Z3Expr
+{
+
+public:
+    BoundedZ3Expr() = default;
+
+    BoundedZ3Expr(const Z3Expr &z3Expr) : Z3Expr(z3Expr) {}
+
+    BoundedZ3Expr(const z3::expr &e) : Z3Expr(e) {}
+
+    BoundedZ3Expr(s32_t i) : Z3Expr(i) {}
+
+    BoundedZ3Expr(int64_t i) : Z3Expr(getContext().int_val(i)) {}
+
+    BoundedZ3Expr(const BoundedZ3Expr &z3Expr) : Z3Expr(z3Expr) {}
+
+
+    inline BoundedZ3Expr &operator=(const BoundedZ3Expr &rhs)
+    {
+        Z3Expr::operator=(rhs);
+        return *this;
+    }
+
+    BoundedZ3Expr(BoundedZ3Expr &&z3Expr) : Z3Expr(z3Expr) {}
+
+
+    inline BoundedZ3Expr &operator=(BoundedZ3Expr &&rhs)
+    {
+        Z3Expr::operator=(rhs);
+        return *this;
+    }
+
+    bool is_plus_infinite() const
+    {
+        return eq(*this, getContext().int_const("+oo"));
+    }
+
+    bool is_minus_infinite() const
+    {
+        return eq(*this, getContext().int_const("-oo"));
+    }
+
+    bool is_infinite() const
+    {
+        return is_plus_infinite() || is_minus_infinite();
+    }
+
+    void set_plus_infinite()
+    {
+        *this = plus_infinity();
+    }
+
+    void set_minus_infinite()
+    {
+        *this = minus_infinity();
+    }
+
+    static BoundedZ3Expr plus_infinity()
+    {
+        return getContext().int_const("+oo");
+    }
+
+    static BoundedZ3Expr minus_infinity()
+    {
+        return getContext().int_const("-oo");
+    }
+
+    static z3::context &getContext()
+    {
+        return Z3Expr::getContext();
+    }
+
+    bool is_zero() const
+    {
+        return getExpr().is_numeral() && getExpr().get_numeral_int64() == 0;
+    }
+
+    static bool isZero(const BoundedZ3Expr &expr)
+    {
+        return expr.is_numeral() && expr.get_numeral_int64() == 0;
+    }
+
+    BoundedZ3Expr equal(const BoundedZ3Expr &rhs) const
+    {
+        return getExpr() == rhs.getExpr();
+    }
+
+    BoundedZ3Expr leq(const BoundedZ3Expr &rhs) const
+    {
+        return getExpr() <= rhs.getExpr();
+    }
+
+    BoundedZ3Expr geq(const BoundedZ3Expr &rhs) const
+    {
+        return getExpr() >= rhs.getExpr();
+    }
+
+    /// Reload operator
+    //{%
+    friend BoundedZ3Expr operator==(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return lhs.equal(rhs);
+    }
+
+    friend BoundedZ3Expr operator!=(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return !lhs.equal(rhs);
+    }
+
+    friend BoundedZ3Expr operator>(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return !lhs.leq(rhs);
+    }
+
+    friend BoundedZ3Expr operator<(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return !lhs.geq(rhs);
+    }
+
+    friend BoundedZ3Expr operator<=(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return lhs.leq(rhs);
+    }
+
+    friend BoundedZ3Expr operator>=(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return lhs.geq(rhs);
+    }
+
+    friend BoundedZ3Expr operator+(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        if (!lhs.is_infinite() && !rhs.is_infinite())
+            return lhs.getExpr() + rhs.getExpr();
+        else if (!lhs.is_infinite() && rhs.is_infinite())
+            return rhs;
+        else if (lhs.is_infinite() && !rhs.is_infinite())
+            return lhs;
+        else if (eq(lhs, rhs))
+            return lhs;
+        else
+            assert(false && "undefined operation +oo + -oo");
+    }
+
+    friend BoundedZ3Expr operator-(const BoundedZ3Expr &lhs)
+    {
+        return -lhs.getExpr();
+    }
+
+    friend BoundedZ3Expr operator-(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        if (!lhs.is_infinite() && !rhs.is_infinite())
+            return lhs.getExpr() - rhs.getExpr();
+        else if (!lhs.is_infinite() && rhs.is_infinite())
+            return -rhs;
+        else if (lhs.is_infinite() && !rhs.is_infinite())
+            return lhs;
+        else if (!eq(lhs, rhs))
+            return lhs;
+        else
+            assert(false && "undefined operation +oo - +oo");
+    }
+
+    friend BoundedZ3Expr operator*(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        if (lhs.is_zero() || rhs.is_zero()) return 0;
+        else if (lhs.is_infinite() && rhs.is_infinite())
+            return eq(lhs, rhs) ? plus_infinity() : minus_infinity();
+        else if (lhs.is_infinite())
+            return ite(rhs.getExpr() > 0, lhs, -lhs);
+        else if (rhs.is_infinite())
+            return ite(lhs.getExpr() > 0, rhs, -rhs);
+        else
+            return lhs.getExpr() * rhs.getExpr();
+    }
+
+    friend BoundedZ3Expr operator/(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        if (rhs.is_zero()) assert(false && "divide by zero");
+        else if (!lhs.is_infinite() && !rhs.is_infinite())
+            return lhs.getExpr() / rhs.getExpr();
+        else if (!lhs.is_infinite() && rhs.is_infinite())
+            return 0;
+        else if (lhs.is_infinite() && !rhs.is_infinite())
+            return ite(rhs.getExpr() > 0, lhs, -lhs);
+        else
+            // TODO: +oo/-oo L'Hôpital's rule?
+            return eq(lhs, rhs) ? plus_infinity() : minus_infinity();
+
+    }
+
+    friend BoundedZ3Expr operator%(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        if (rhs.is_zero()) assert(false && "divide by zero");
+        else if (!lhs.is_infinite() && !rhs.is_infinite())
+            return lhs.getExpr() % rhs.getExpr();
+        else if (!lhs.is_infinite() && rhs.is_infinite())
+            return 0;
+        // TODO: not sure
+        else if (lhs.is_infinite() && !rhs.is_infinite())
+            return ite(rhs.getExpr() > 0, lhs, -lhs);
+        else
+            // TODO: +oo/-oo L'Hôpital's rule?
+            return eq(lhs, rhs) ? plus_infinity() : minus_infinity();
+    }
+
+    friend BoundedZ3Expr operator^(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return bv2int(int2bv(64, lhs.getExpr()) ^ int2bv(64, rhs.getExpr()), true);
+    }
+
+    friend BoundedZ3Expr operator&(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return bv2int(int2bv(64, lhs.getExpr()) & int2bv(64, rhs.getExpr()), true);
+    }
+
+    friend BoundedZ3Expr operator|(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return bv2int(int2bv(64, lhs.getExpr()) | int2bv(64, rhs.getExpr()), true);
+    }
+
+    friend BoundedZ3Expr ashr(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        if (lhs.is_zero())
+            return lhs;
+        else if (lhs.is_infinite())
+            return lhs;
+        else if (rhs.is_infinite())
+            return ite(lhs.getExpr() >= 0, BoundedZ3Expr(0), BoundedZ3Expr(-1));
+        else
+            return ashr(lhs.getExpr(), rhs.getExpr());
+    }
+
+    friend BoundedZ3Expr shl(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        if (lhs.is_zero())
+            return lhs;
+        else if (lhs.is_infinite())
+            return lhs;
+        else if (rhs.is_infinite())
+            return ite(lhs.getExpr() >= 0, plus_infinity(), minus_infinity());
+        else
+            return shl(lhs.getExpr(), rhs.getExpr());
+    }
+
+    friend BoundedZ3Expr lshr(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return lshr(lhs.getExpr(), rhs.getExpr());
+    }
+
+    friend BoundedZ3Expr int2bv(u32_t n, const BoundedZ3Expr &e)
+    {
+        return int2bv(n, e.getExpr());
+    }
+
+    friend BoundedZ3Expr bv2int(const BoundedZ3Expr &e, bool isSigned)
+    {
+        return bv2int(e.getExpr(), isSigned);
+    }
+
+    friend BoundedZ3Expr operator&&(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return lhs.getExpr() && rhs.getExpr();
+    }
+
+    friend BoundedZ3Expr operator||(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return lhs.getExpr() || rhs.getExpr();
+    }
+
+    friend BoundedZ3Expr operator!(const BoundedZ3Expr &lhs)
+    {
+        return !lhs.getExpr();
+    }
+
+    friend BoundedZ3Expr ite(const BoundedZ3Expr &cond, const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return ite(cond.getExpr(), lhs.getExpr(), rhs.getExpr());
+    }
+
+    friend std::ostream &operator<<(std::ostream &out, const BoundedZ3Expr &expr)
+    {
+        out << expr.getExpr();
+        return out;
+    }
+
+    friend bool eq(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
+    {
+        return eq(lhs.getExpr(), rhs.getExpr());
+    }
+
+    inline BoundedZ3Expr simplify() const
+    {
+        return getExpr().simplify();
+    }
+
+    inline bool is_true() const
+    {
+        return getExpr().is_true();
+    }
+    //%}
+}; // end class ConZ3Expr
+} // end namespace SVF
+
+/// Specialise hash for ConZ3Expr
+template<>
+struct std::hash<SVF::BoundedZ3Expr>
+{
+    size_t operator()(const SVF::BoundedZ3Expr &z3Expr) const
+    {
+        return z3Expr.hash();
+    }
+};
+#endif //SVF_BOUNDEDZ3EXPR_H

package/svf/include/AbstractExecution/IntervalValue.h

@@ -82,7 +82,7 @@ public:
     /// Create the IntervalValue [-oo, +oo]
     static IntervalValue top()
     {
-        return IntervalValue(INT_MIN, INT_MAX);
+        return IntervalValue(minus_infinity(), plus_infinity());
     }
 
     /// Create the bottom IntervalValue
@@ -92,37 +92,41 @@ public:
     }
 
     /// Create default IntervalValue
-    explicit IntervalValue() : AbstractValue(AbstractValue::IntervalK), _lb(INT_MIN), _ub(INT_MAX) {}
+    explicit IntervalValue() : AbstractValue(AbstractValue::IntervalK), _lb(minus_infinity()), _ub(plus_infinity()) {}
 
     /// Create the IntervalValue [n, n]
-    explicit IntervalValue(double n) : AbstractValue(AbstractValue::IntervalK), _lb(n), _ub(n) {}
+    explicit IntervalValue(int64_t n) : AbstractValue(AbstractValue::IntervalK), _lb(n), _ub(n) {}
 
-    explicit IntervalValue(s32_t n) : IntervalValue((double) n) {}
+    explicit IntervalValue(s32_t n) : IntervalValue((int64_t) n) {}
 
-    explicit IntervalValue(u32_t n) : IntervalValue((double) n) {}
+    explicit IntervalValue(u32_t n) : IntervalValue((int64_t) n) {}
+
+    explicit IntervalValue(double n) : IntervalValue((int64_t) n) {}
+
+    explicit IntervalValue(NumericLiteral n) : IntervalValue(n, n) {}
 
     /// Create the IntervalValue [lb, ub]
     explicit IntervalValue(NumericLiteral lb, NumericLiteral ub) : AbstractValue(AbstractValue::IntervalK),
         _lb(std::move(lb)), _ub(std::move(ub)) {}
 
-    explicit IntervalValue(double lb, double ub) : IntervalValue(NumericLiteral(lb), NumericLiteral(ub)) {}
+    explicit IntervalValue(int64_t lb, int64_t ub) : IntervalValue(NumericLiteral(lb), NumericLiteral(ub)) {}
 
-    explicit IntervalValue(s32_t lb, s32_t ub) : IntervalValue((double) lb, (double) ub) {}
+    explicit IntervalValue(double lb, double ub) : IntervalValue(NumericLiteral((int64_t) lb), NumericLiteral((int64_t) ub)) {}
 
-    explicit IntervalValue(u32_t lb, u32_t ub) : IntervalValue((double) lb, (double) ub) {}
+    explicit IntervalValue(s32_t lb, s32_t ub) : IntervalValue((int64_t) lb, (int64_t) ub) {}
 
-    explicit IntervalValue(s64_t lb, s64_t ub) : IntervalValue((double) lb, (double) ub) {}
+    explicit IntervalValue(u32_t lb, u32_t ub) : IntervalValue((int64_t) lb, (int64_t) ub) {}
 
-    explicit IntervalValue(u64_t lb, u64_t ub) : IntervalValue((double) lb, (double) ub) {}
+    explicit IntervalValue(u64_t lb, u64_t ub) : IntervalValue((int64_t) lb, (int64_t) ub) {}
 
     /// Copy constructor
     IntervalValue(const IntervalValue &) = default;
 
     /// Move constructor
-    IntervalValue(IntervalValue &&) noexcept = default;
+    IntervalValue(IntervalValue &&) = default;
 
     /// Copy assignment operator
-    IntervalValue &operator=(const IntervalValue &a) noexcept = default;
+    IntervalValue &operator=(const IntervalValue &a) = default;
 
     /// Move assignment operator
     IntervalValue &operator=(IntervalValue &&) = default;
@@ -256,7 +260,7 @@ public:
     }
 
     /// Return
-    double getNumeral() const
+    int64_t getNumeral() const
     {
         assert(is_numeral() && "this IntervalValue is not numeral");
         return _lb.getNumeral();
@@ -419,7 +423,7 @@ public:
     /// Return true if the IntervalValue contains n
     bool contains(int n) const
     {
-        return this->_lb.getNumeral() <= n && this->_ub.getNumeral() >= n;
+        return this->_lb.leq(n) && this->_ub.geq(n);
     }
 
     void dump(std::ostream &o) const
@@ -436,7 +440,7 @@ public:
 
     std::string toString() const
     {
-        return "[" + std::to_string(lb().getNumeral()) + ", " + std::to_string(ub().getNumeral()) + "]";
+        return "[" + lb().to_string() + ", " + ub().to_string() + "]";
     }
 
 }; // end class IntervalValue
@@ -491,8 +495,9 @@ inline IntervalValue operator*(const IntervalValue &lhs,
         NumericLiteral lu = lhs.lb() * rhs.ub();
         NumericLiteral ul = lhs.ub() * rhs.lb();
         NumericLiteral uu = lhs.ub() * rhs.ub();
-        return IntervalValue(std::min({ll.getNumeral(), lu.getNumeral(), ul.getNumeral(), uu.getNumeral()}),
-                             std::max({ll.getNumeral(), lu.getNumeral(), ul.getNumeral(), uu.getNumeral()}));
+        std::vector<NumericLiteral> vec{ll, lu, ul, uu};
+        return IntervalValue(NumericLiteral::min(vec),
+                             NumericLiteral::max(vec));
     }
 }
 
@@ -515,8 +520,10 @@ inline IntervalValue operator/(const IntervalValue &lhs,
         NumericLiteral lu = lhs.lb() / rhs.ub();
         NumericLiteral ul = lhs.ub() / rhs.lb();
         NumericLiteral uu = lhs.ub() / rhs.ub();
-        return IntervalValue(std::min({ll.getNumeral(), lu.getNumeral(), ul.getNumeral(), uu.getNumeral()}),
-                             std::max({ll.getNumeral(), lu.getNumeral(), ul.getNumeral(), uu.getNumeral()}));
+        std::vector<NumericLiteral> vec{ll, lu, ul, uu};
+
+        return IntervalValue(NumericLiteral::min(vec),
+                             NumericLiteral::max(vec));
     }
 }
 
@@ -538,9 +545,9 @@ inline IntervalValue operator%(const IntervalValue &lhs,
     }
     else
     {
-        double n_ub = std::max(std::abs(lhs.lb().getNumeral()), std::abs(lhs.ub().getNumeral()));
-        double d_ub = std::max(std::abs(rhs.lb().getNumeral()), std::abs(rhs.ub().getNumeral())) - 1;
-        double ub = std::min(n_ub, d_ub);
+        NumericLiteral n_ub = max(abs(lhs.lb()), abs(lhs.ub()));
+        NumericLiteral d_ub = max(abs(rhs.lb()), rhs.ub() - 1);
+        NumericLiteral ub = min(n_ub, d_ub);
 
         if (lhs.lb().getNumeral() < 0)
         {
@@ -550,12 +557,12 @@ inline IntervalValue operator%(const IntervalValue &lhs,
             }
             else
             {
-                return IntervalValue(-ub, double(0));
+                return IntervalValue(-ub, 0);
             }
         }
         else
         {
-            return IntervalValue(double(0), ub);
+            return IntervalValue(0, ub);
         }
     }
 }
@@ -580,12 +587,12 @@ inline IntervalValue operator>(const IntervalValue &lhs, const IntervalValue &rh
         else
         {
             // lhs[3,4] rhs[1,2]
-            if (lhs.lb().getNumeral() > rhs.ub().getNumeral())
+            if (!lhs.lb().leq(rhs.ub()))
             {
                 return IntervalValue(1, 1);
                 // lhs[1,2] rhs[3,4]
             }
-            else if (lhs.ub().getNumeral() < rhs.lb().getNumeral())
+            else if (lhs.ub().geq(rhs.lb()))
             {
                 return IntervalValue(0, 0);
             }
@@ -618,12 +625,12 @@ inline IntervalValue operator<(const IntervalValue &lhs, const IntervalValue &rh
         else
         {
             // lhs [1,2] rhs [3,4]
-            if (lhs.ub().getNumeral() < rhs.lb().getNumeral())
+            if (!lhs.ub().geq(rhs.lb()))
             {
                 return IntervalValue(1, 1);
                 // lhs [3,4] rhs [1,2]
             }
-            else if (lhs.lb().getNumeral() > rhs.ub().getNumeral())
+            else if (!lhs.lb().leq(rhs.ub()))
             {
                 return IntervalValue(0, 0);
                 // lhs [1,3] rhs [2,4]
@@ -657,12 +664,12 @@ inline IntervalValue operator>=(const IntervalValue &lhs, const IntervalValue &r
         else
         {
             // lhs [2,3] rhs [1,2]
-            if (lhs.lb().getNumeral() >= rhs.ub().getNumeral())
+            if (lhs.lb().geq(rhs.ub()))
             {
                 return IntervalValue(1, 1);
                 // lhs [1,2] rhs[3,4]
             }
-            else if (lhs.ub().getNumeral() < rhs.lb().getNumeral())
+            else if (!lhs.ub().geq(rhs.lb()))
             {
                 return IntervalValue(0, 0);
                 // lhs [1,3] rhs [2,4]
@@ -696,12 +703,12 @@ inline IntervalValue operator<=(const IntervalValue &lhs, const IntervalValue &r
         else
         {
             // lhs [1,2] rhs [2,3]
-            if (lhs.ub().getNumeral() <= rhs.lb().getNumeral())
+            if (lhs.ub().leq(rhs.lb()))
             {
                 return IntervalValue(1, 1);
                 // lhs [3,4] rhs[1,2]
             }
-            else if (lhs.lb().getNumeral() > rhs.ub().getNumeral())
+            else if (!lhs.lb().leq(rhs.ub()))
             {
                 return IntervalValue(0, 0);
                 // lhs [1,3] rhs [2,4]
@@ -765,8 +772,9 @@ inline IntervalValue operator>>(const IntervalValue &lhs, const IntervalValue &r
             NumericLiteral lu = lhs.lb() >> shift.ub();
             NumericLiteral ul = lhs.ub() >> shift.lb();
             NumericLiteral uu = lhs.ub() >> shift.ub();
-            return IntervalValue(std::min({ll.getNumeral(), lu.getNumeral(), ul.getNumeral(), uu.getNumeral()}),
-                                 std::max({ll.getNumeral(), lu.getNumeral(), ul.getNumeral(), uu.getNumeral()}));
+            std::vector<NumericLiteral> vec{ll, lu, ul, uu};
+            return IntervalValue(NumericLiteral::min(vec),
+                                 NumericLiteral::max(vec));
         }
     }
 }
@@ -778,19 +786,19 @@ inline IntervalValue operator&(const IntervalValue &lhs, const IntervalValue &rh
         return IntervalValue::bottom();
     else if (lhs.is_numeral() && rhs.is_numeral())
     {
-        return IntervalValue((s32_t)lhs.getNumeral() & (s32_t)rhs.getNumeral());
+        return IntervalValue(lhs.lb() & rhs.lb());
     }
     else if (lhs.lb().getNumeral() >= 0 && rhs.lb().getNumeral() >= 0)
     {
-        return IntervalValue(0.0, std::min(lhs.ub().getNumeral(), rhs.ub().getNumeral()));
+        return IntervalValue((int64_t) 0, min(lhs.ub(), rhs.ub()));
     }
     else if (lhs.lb().getNumeral() >= 0)
     {
-        return IntervalValue(0.0, lhs.ub().getNumeral());
+        return IntervalValue((int64_t) 0, lhs.ub());
     }
     else if (rhs.lb().getNumeral() >= 0)
     {
-        return IntervalValue(0.0, rhs.ub().getNumeral());
+        return IntervalValue((int64_t) 0, rhs.ub());
     }
     else
     {
@@ -813,13 +821,13 @@ inline IntervalValue operator|(const IntervalValue &lhs, const IntervalValue &rh
     if (lhs.isBottom() || rhs.isBottom())
         return IntervalValue::bottom();
     else if (lhs.is_numeral() && rhs.is_numeral())
-        return IntervalValue((s32_t)lhs.getNumeral() | (s32_t)rhs.getNumeral());
+        return IntervalValue(lhs.lb() | rhs.lb());
     else if (lhs.lb().getNumeral() >= 0 && !lhs.ub().is_infinity() &&
              rhs.lb().getNumeral() >= 0 && !rhs.ub().is_infinity())
     {
-        double m = std::max(lhs.ub().getNumeral(), rhs.ub().getNumeral());
-        double ub = next_power_of_2(s64_t(m+1));
-        return IntervalValue(0.0, ub);
+        int64_t m = std::max(lhs.ub().getNumeral(), rhs.ub().getNumeral());
+        int64_t ub = next_power_of_2(s64_t(m+1));
+        return IntervalValue((int64_t) 0, (int64_t) ub);
     }
     else
     {
@@ -842,13 +850,13 @@ inline IntervalValue operator^(const IntervalValue &lhs, const IntervalValue &rh
     if (lhs.isBottom() || rhs.isBottom())
         return IntervalValue::bottom();
     else if (lhs.is_numeral() && rhs.is_numeral())
-        return IntervalValue((s32_t)lhs.getNumeral() ^ (s32_t)rhs.getNumeral());
+        return IntervalValue(lhs.lb() ^ rhs.lb());
     else if (lhs.lb().getNumeral() >= 0 && !lhs.ub().is_infinity() &&
              rhs.lb().getNumeral() >= 0 && !rhs.ub().is_infinity())
     {
-        double m = std::max(lhs.ub().getNumeral(), rhs.ub().getNumeral());
-        double ub = next_power_of_2(s64_t(m+1));
-        return IntervalValue(0.0, ub);
+        int64_t m = std::max(lhs.ub().getNumeral(), rhs.ub().getNumeral());
+        int64_t ub = next_power_of_2(s64_t(m+1));
+        return IntervalValue((int64_t) 0, (int64_t) ub);
     }
     else
     {