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

YJIT: Fix calling leaf builtins with empty splat and kw_splat

Browse Source 
These don't pass anything and just need to be popped off the stack.

https://github.com/ruby/ruby/actions/runs/7977363890/job/21780095289#step:13:104
This commit is contained in:
Alan Wu 2024-02-20 16:20:02 -05:00
parent 9216a2ac43
commit 8e1090487e
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstraptest/test_yjit.rb
View File

@ -4586,3 +4586,9 @@ assert_equal 'ok', %q{
splat_nil_kw_splat([:ok])
}
# empty splat and kwsplat into leaf builtins
assert_equal '[1, 1, 1]', %q{
empty = []
[1.abs(*empty), 1.abs(**nil), 1.bit_length(*empty, **nil)]
}

13
yjit/src/codegen.rs
View File

@ -6734,7 +6734,8 @@ fn gen_send_iseq(
let builtin_func_raw = unsafe { rb_yjit_builtin_function(iseq) };
let builtin_func = if builtin_func_raw.is_null() { None } else { Some(builtin_func_raw) };
let opt_send_call = flags & VM_CALL_OPT_SEND != 0; // .send call is not currently supported for builtins
if let (None, Some(builtin_info), true, false) = (block, builtin_func, builtin_attrs & BUILTIN_ATTR_LEAF != 0, opt_send_call) {
if let (None, Some(builtin_info), true, false, None | Some(0)) =
(block, builtin_func, builtin_attrs & BUILTIN_ATTR_LEAF != 0, opt_send_call, splat_array_length) {
let builtin_argc = unsafe { (*builtin_info).argc };
if builtin_argc + 1 < (C_ARG_OPNDS.len() as i32) {
// We pop the block arg without using it because:
@ -6749,6 +6750,16 @@ fn gen_send_iseq(
asm.stack_pop(1);
}
// Pop empty kw_splat hash which passes nothing (exit_if_kwsplat_non_nil())
if kw_splat {
asm.stack_pop(1);
}
// Pop empty splat array which passes nothing
if let Some(0) = splat_array_length {
asm.stack_pop(1);
}
asm_comment!(asm, "inlined leaf builtin");
gen_counter_incr(asm, Counter::num_send_iseq_leaf);