mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZJIT: Fix fixnum folding for negative values (#13942)

Browse Source 
Use `fixnum_from_isize` instead of `fixnum_from_usize` in
`fold_fixnum_bop` to properly handle negative values. Casting negative
`i64` to `usize` produces large unsigned values that exceed `RUBY_FIXNUM_MAX`.
This commit is contained in:
Stan Lo 2025-07-18 00:48:53 +01:00 committed by GitHub
parent 30b1368829
commit 81515aca67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/.excludes-zjit/TestTime.rb
View File

@ -1 +0,0 @@
exclude(/test_/, 'Tests make ZJIT panic')

1
test/.excludes-zjit/TestTimeTZ.rb
View File

@ -1 +0,0 @@
exclude(/test_/, 'Tests make ZJIT panic')

20
zjit/src/hir.rs
View File

@ -1703,7 +1703,7 @@ impl Function {
fn fold_fixnum_bop(&mut self, insn_id: InsnId, left: InsnId, right: InsnId, f: impl FnOnce(Option<i64>, Option<i64>) -> Option<i64>) -> InsnId {
f(self.type_of(left).fixnum_value(), self.type_of(right).fixnum_value())
.filter(|&n| n >= (RUBY_FIXNUM_MIN as i64) && n <= RUBY_FIXNUM_MAX as i64)
.map(|n| self.new_insn(Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(n as usize)) }))
.map(|n| self.new_insn(Insn::Const { val: Const::Value(VALUE::fixnum_from_isize(n as isize)) }))
.unwrap_or(insn_id)
}
@ -5191,6 +5191,24 @@ mod opt_tests {
"#]]);
}
#[test]
fn test_fold_fixnum_sub_large_negative_result() {
eval("
def test
0 - 1073741825
end
");
assert_optimized_method_hir("test", expect![[r#"
fn test@<compiled>:3:
bb0(v0:BasicObject):
v2:Fixnum[0] = Const Value(0)
v3:Fixnum[1073741825] = Const Value(1073741825)
PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_MINUS)
v9:Fixnum[-1073741825] = Const Value(-1073741825)
Return v9
"#]]);
}
#[test]
fn test_fold_fixnum_mult() {
eval("