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

Fix forwarding for optimized send

Browse Source 
Always treat forwarding as a complex call.
This commit is contained in:
eileencodes 2024-07-02 13:54:23 -04:00 committed by Aaron Patterson
parent cc8c4a60b7
commit b2b8306b46
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bootstraptest/test_method.rb
View File

@ -1359,3 +1359,18 @@ assert_equal 'ok', %q{
foo(*["bar"]) foo(*["bar"])
foo("baz") foo("baz")
} }
assert_equal 'ok', %q{
class C
def foo(b:)
b
end
end
def foo(...)
C.new.send(...)
end
foo(:foo, b: :ok)
foo(*["foo"], b: :ok)
}

4
vm_insnhelper.c
View File

@ -4363,10 +4363,10 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct
const struct rb_callinfo *ci = calling->cd->ci; const struct rb_callinfo *ci = calling->cd->ci;
int flags = vm_ci_flag(ci); int flags = vm_ci_flag(ci);
if (UNLIKELY(!(flags & VM_CALL_ARGS_SIMPLE) && if (UNLIKELY((flags & VM_CALL_FORWARDING) || (!(flags & VM_CALL_ARGS_SIMPLE) &&
((calling->argc == 1 && (flags & (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT))) || ((calling->argc == 1 && (flags & (VM_CALL_ARGS_SPLAT | VM_CALL_KW_SPLAT))) ||
(calling->argc == 2 && (flags & VM_CALL_ARGS_SPLAT) && (flags & VM_CALL_KW_SPLAT)) || (calling->argc == 2 && (flags & VM_CALL_ARGS_SPLAT) && (flags & VM_CALL_KW_SPLAT)) ||
((flags & VM_CALL_KWARG) && (vm_ci_kwarg(ci)->keyword_len == calling->argc))))) { ((flags & VM_CALL_KWARG) && (vm_ci_kwarg(ci)->keyword_len == calling->argc)))))) {
CC_SET_FASTPATH(calling->cc, vm_call_opt_send_complex, TRUE); CC_SET_FASTPATH(calling->cc, vm_call_opt_send_complex, TRUE);
return vm_call_opt_send_complex(ec, reg_cfp, calling); return vm_call_opt_send_complex(ec, reg_cfp, calling);
} }