1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Fix return type of Integer#/ with T_FIXNUM inputs

Browse Source 
Issue found by running ruby/spec with `--yjit-verify-ctx`. Thanks!
This commit is contained in:
Alan Wu 2023-08-18 11:30:52 -04:00
parent c8d6419985
commit 4524aeba2f
Notes: git 2023-08-18 16:17:57 +00:00 
Merged: https://github.com/ruby/ruby/pull/8250
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootstraptest/test_yjit.rb
View File

@ -1,3 +1,13 @@
# regression test for return type of Integer#/
# It can return a T_BIGNUM when inputs are T_FIXNUM.
assert_equal 0x3fffffffffffffff.to_s, %q{
def call(fixnum_min)
(fixnum_min / -1) - 1
end
call(-(2**62))
}
# regression test for return type of String#<<
assert_equal 'Sub', %q{
def call(sub) = (sub << sub).itself

5
yjit/src/codegen.rs
View File

@ -4531,6 +4531,9 @@ fn jit_rb_int_div(
}
guard_two_fixnums(jit, asm, ocb);
// rb_fix_div_fix may GC-allocate for Bignum
jit_prepare_routine_call(jit, asm);
asm.comment("Integer#/");
let obj = asm.stack_pop(1);
let recv = asm.stack_pop(1);
@ -4541,7 +4544,7 @@ fn jit_rb_int_div(
let ret = asm.ccall(rb_fix_div_fix as *const u8, vec![recv, obj]);
let ret_opnd = asm.stack_push(Type::Fixnum);
let ret_opnd = asm.stack_push(Type::Unknown);
asm.mov(ret_opnd, ret);
true
}