T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x: Fix integer overflow during negation (#5866)

Browse Source 
Use wrapping_neg in i{64,32,16}_from_negated_value to avoid Rust
aborts due to integer overflow.  The resulting INT_MIN is already
handled correctly in subsequent operations.

Fixes https://github.com/bytecodealliance/wasmtime/issues/5863.
This commit is contained in:
Ulrich Weigand
2023-02-23 17:32:10 +01:00
committed by GitHub
parent 761e44bd36
commit 9719147f91
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cranelift/codegen/src/isa/s390x/lower/isle.rs
View File

@@ -628,21 +628,21 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {
#[inline] #[inline]
fn i64_from_negated_value(&mut self, val: Value) -> Option<i64> { fn i64_from_negated_value(&mut self, val: Value) -> Option<i64> {
let constant = self.u64_from_signed_value(val)? as i64; let constant = self.u64_from_signed_value(val)? as i64;
let imm = -constant; let imm = constant.wrapping_neg();
Some(imm) Some(imm)
} }
#[inline] #[inline]
fn i32_from_negated_value(&mut self, val: Value) -> Option<i32> { fn i32_from_negated_value(&mut self, val: Value) -> Option<i32> {
let constant = self.u64_from_signed_value(val)? as i64; let constant = self.u64_from_signed_value(val)? as i64;
let imm = i32::try_from(-constant).ok()?; let imm = i32::try_from(constant.wrapping_neg()).ok()?;
Some(imm) Some(imm)
} }
#[inline] #[inline]
fn i16_from_negated_value(&mut self, val: Value) -> Option<i16> { fn i16_from_negated_value(&mut self, val: Value) -> Option<i16> {
let constant = self.u64_from_signed_value(val)? as i64; let constant = self.u64_from_signed_value(val)? as i64;
let imm = i16::try_from(-constant).ok()?; let imm = i16::try_from(constant.wrapping_neg()).ok()?;
Some(imm) Some(imm)
} }