fix perf regression introduced with last Pointer class refactoring

AliveToolkit · Aug 13, 2024 · 8404196 · 8404196
1 parent 081d296
commit 8404196
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ir/instr.cpp b/ir/instr.cpp
@@ -3858,7 +3858,7 @@ StateValue GEP::toSMT(State &s) const {
 
       // try to simplify the pointer
       if (all_zeros.isFalse())
-        ptr.inbounds();
+        ptr.inbounds(true);
     }
 
     return { std::move(ptr).release(), non_poison() };

diff --git a/ir/pointer.cpp b/ir/pointer.cpp
@@ -332,7 +332,10 @@ expr Pointer::isInbounds(bool strict) const {
   return (strict ? offset.ult(size) : offset.ule(size)) && !offset.isNegative();
 }
 
-expr Pointer::inbounds() {
+expr Pointer::inbounds(bool simplify_ptr) {
+  if (!simplify_ptr)
+    return isInbounds(false);
+
   DisjointExpr<expr> ret(expr(false)), all_ptrs;
   for (auto &[ptr_expr, domain] : DisjointExpr<expr>(p, 3)) {
     expr inb = Pointer(m, ptr_expr).isInbounds(false);

diff --git a/ir/pointer.h b/ir/pointer.h
@@ -95,7 +95,7 @@ class Pointer {
   smt::expr isInboundsOf(const Pointer &block, const smt::expr &bytes) const;
   smt::expr isInboundsOf(const Pointer &block, unsigned bytes) const;
   smt::expr isInbounds(bool strict) const;
-  smt::expr inbounds();
+  smt::expr inbounds(bool simplify_ptr = false);
 
   smt::expr blockAlignment() const; // log(bits)
   smt::expr isBlockAligned(uint64_t align, bool exact = false) const;