A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Cranelift interpreter: fix `INT_MIN % -1` (zero, not trap). (#14680)
Chris Fallin61ee869f0cfc
diff --git a/cranelift/filetests/filetests/runtests/div-checks.clif b/cranelift/filetests/filetests/runtests/div-checks.clifindex fc1dc9b12c..6cf167b3bd 100644--- a/cranelift/filetests/filetests/runtests/div-checks.clif+++ b/cranelift/filetests/filetests/runtests/div-checks.clif@@ -1,3 +1,4 @@+test interprettest runtarget aarch64target s390x@@ -59,7 +60,7 @@ block0(v0: i64, v1: i64):v2 = srem.i64 v0, v1return v2}-; run: %i64(0x800000000000000, 0xffffffffffffffff) == 0+; run: %i64(0x8000000000000000, 0xffffffffffffffff) == 0function %i64_const(i64) -> i64 {block0(v0: i64):@@ -67,7 +68,7 @@ block0(v0: i64):v2 = srem.i64 v0, v1return v2}-; run: %i64_const(0x800000000000000) == 0+; run: %i64_const(0x8000000000000000) == 0function %i8_u(i8, i8) -> i8 {block0(v0: i8,v1: i8):@@ -119,7 +120,7 @@ block0(v0: i64, v1: i64):v2 = urem.i64 v0, v1return v2}-; run: %i64_u(0x800000000000000, 0xffffffffffffffff) == 0x800000000000000+; run: %i64_u(0x8000000000000000, 0xffffffffffffffff) == 0x8000000000000000function %i64_u_const(i64) -> i64 {block0(v0: i64):@@ -127,4 +128,4 @@ block0(v0: i64):v2 = urem.i64 v0, v1return v2}-; run: %i64_u_const(0x800000000000000) == 0x800000000000000+; run: %i64_u_const(0x8000000000000000) == 0x8000000000000000diff --git a/cranelift/filetests/filetests/runtests/i128-srem.clif b/cranelift/filetests/filetests/runtests/i128-srem.clifindex 1616d8643b..72cce1ffd1 100644--- a/cranelift/filetests/filetests/runtests/i128-srem.clif+++ b/cranelift/filetests/filetests/runtests/i128-srem.clif@@ -15,6 +15,7 @@ block0(v0: i128,v1: i128):; run: %srem_i128(0xC0FFEEEE_DECAFFFF_C0FFEEEE_DECAFFFF, 8) == -1; run: %srem_i128(0xC0FFEEEE_DECAFFFF_C0FFEEEE_DECAFFFF, -8) == -1; run: %srem_i128(0x80000000_00000000_00000000_00000000, -2) == 0+; run: %srem_i128(0x80000000_00000000_00000000_00000000, -1) == 0function %srem_imm_i128(i128) -> i128 {diff --git a/cranelift/filetests/filetests/runtests/srem.clif b/cranelift/filetests/filetests/runtests/srem.clifindex 0fb5fe5866..020f33f28f 100644--- a/cranelift/filetests/filetests/runtests/srem.clif+++ b/cranelift/filetests/filetests/runtests/srem.clif@@ -18,6 +18,7 @@ block0(v0: i64,v1: i64):; run: %srem_i64(0, 1) == 0; run: %srem_i64(2, 2) == 0; run: %srem_i64(1, -1) == 0+; run: %srem_i64(0x80000000_00000000, -1) == 0; run: %srem_i64(3, 2) == 1; run: %srem_i64(19, 7) == 5; run: %srem_i64(3, -2) == 1@@ -37,6 +38,7 @@ block0(v0: i32,v1: i32):; run: %srem_i32(0, 1) == 0; run: %srem_i32(2, 2) == 0; run: %srem_i32(1, -1) == 0+; run: %srem_i32(0x80000000, -1) == 0; run: %srem_i32(3, 2) == 1; run: %srem_i32(19, 7) == 5; run: %srem_i32(3, -2) == 1@@ -56,6 +58,7 @@ block0(v0: i16,v1: i16):; run: %srem_i16(0, 1) == 0; run: %srem_i16(2, 2) == 0; run: %srem_i16(1, -1) == 0+; run: %srem_i16(0x8000, -1) == 0; run: %srem_i16(3, 2) == 1; run: %srem_i16(19, 7) == 5; run: %srem_i16(3, -2) == 1@@ -75,6 +78,7 @@ block0(v0: i8,v1: i8):; run: %srem_i8(0, 1) == 0; run: %srem_i8(2, 2) == 0; run: %srem_i8(1, -1) == 0+; run: %srem_i8(0x80, -1) == 0; run: %srem_i8(2, 7) == 2; run: %srem_i8(3, 2) == 1; run: %srem_i8(19, 7) == 5diff --git a/cranelift/fuzzgen/src/passes/int_divz.rs b/cranelift/fuzzgen/src/passes/int_divz.rsindex 3154cafe6d..bb1c7c1efa 100644--- a/cranelift/fuzzgen/src/passes/int_divz.rs+++ b/cranelift/fuzzgen/src/passes/int_divz.rs@@ -49,8 +49,9 @@ fn insert_int_divz_sequence(pos: &mut FuncCursor, inst: Inst) {let one = pos.ins().iconst(ty, 1);let denominator_is_zero = pos.ins().icmp(IntCC::Equal, rhs, zero);- let replace_denominator = if matches!(opcode, Opcode::Srem | Opcode::Sdiv) {- // Srem and Sdiv can also trap on INT_MIN / -1. So we need to check for the second one+ let replace_denominator = if opcode == Opcode::Sdiv {+ // Sdiv can also trap on INT_MIN / -1. So we need to check for the second one.+ // (Srem does not trap in this case: its result is 0.)// 1 << (ty bits - 1) to get INT_MINlet int_min = pos.ins().ishl_imm_u(one, ty.lane_bits() as i64 - 1);diff --git a/cranelift/interpreter/src/interpreter.rs b/cranelift/interpreter/src/interpreter.rsindex 7252111949..c52d36045a 100644--- a/cranelift/interpreter/src/interpreter.rs+++ b/cranelift/interpreter/src/interpreter.rs@@ -943,7 +943,7 @@ mod tests {}#[test]- fn srem_trap() {+ fn srem_min_by_neg_one_is_zero() {let code = "function %test() -> i64 {block0:v0 = iconst.i64 0x8000_0000_0000_0000@@ -956,12 +956,9 @@ mod tests {let mut env = FunctionStore::default();env.add(func.name.to_string(), &func);let state = InterpreterState::default().with_function_store(env);- let trap = Interpreter::new(state).call_by_name("%test", &[]).unwrap();+ let result = Interpreter::new(state).call_by_name("%test", &[]).unwrap();- assert_eq!(- trap,- ControlFlow::Trap(CraneliftTrap::User(TrapCode::INTEGER_OVERFLOW))- );+ assert_eq!(result, ControlFlow::Return(smallvec![DataValue::I64(0)]));}#[test]diff --git a/cranelift/interpreter/src/value.rs b/cranelift/interpreter/src/value.rsindex c3c182f84d..f79d21fe33 100644--- a/cranelift/interpreter/src/value.rs+++ b/cranelift/interpreter/src/value.rs@@ -632,16 +632,17 @@ impl DataValueExt for DataValue {fn srem(self, other: Self) -> ValueResult<Self> {let denominator = other.clone().into_int_signed()?;- // Check if we are dividing INT_MIN / -1. This causes an integer overflow trap.- let min = DataValueExt::int(1i128 << (self.ty().bits() - 1), self.ty())?;- if self == min && denominator == -1 {- return Err(ValueError::IntegerOverflow);- }-if denominator == 0 {return Err(ValueError::IntegerDivisionByZero);}+ // The remainder of any value divided by -1 is 0. Unlike `sdiv`, this+ // does not trap on INT_MIN / -1; return early to avoid Rust's+ // overflow panic on `INT_MIN % -1`.+ if denominator == -1 {+ return DataValueExt::int(0, self.ty());+ }+binary_match!(%(&self, &other); [I8, I16, I32, I64, I128])}