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

Add a CC fastpath for forwardable methods

Browse Source
This commit is contained in:
Aaron Patterson 2024-04-24 15:42:40 -07:00 committed by Aaron Patterson
parent cdf33ed5f3
commit bd7a87e5bb
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vm_insnhelper.c
View File

@ -2916,6 +2916,26 @@ args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *cons
VALUE *const passed_values, const int passed_keyword_len, const VALUE *const passed_keywords, VALUE *const passed_values, const int passed_keyword_len, const VALUE *const passed_keywords,
VALUE *const locals); VALUE *const locals);
static VALUE
vm_call_iseq_forwardable(rb_execution_context_t *ec, rb_control_frame_t *cfp,
struct rb_calling_info *calling)
{
const struct rb_callcache *cc = calling->cc;
const rb_iseq_t *iseq = def_iseq_ptr(vm_cc_cme(cc)->def);
int param_size = ISEQ_BODY(iseq)->param.size;
int local_size = ISEQ_BODY(iseq)->local_table_size;
// Setting up local size and param size
VM_ASSERT(ISEQ_BODY(iseq)->param.flags.forwardable);
local_size = local_size + vm_ci_argc(calling->cd->ci);
param_size = param_size + vm_ci_argc(calling->cd->ci);
cfp->sp[0] = (VALUE)calling->cd->ci;
return vm_call_iseq_setup_normal(ec, cfp, calling, vm_cc_cme(cc), 0, param_size, local_size);
}
static VALUE static VALUE
vm_call_iseq_setup_kwparm_kwarg(rb_execution_context_t *ec, rb_control_frame_t *cfp, vm_call_iseq_setup_kwparm_kwarg(rb_execution_context_t *ec, rb_control_frame_t *cfp,
struct rb_calling_info *calling) struct rb_calling_info *calling)
@ -3171,6 +3191,8 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
// => type // => type
// //
if (ISEQ_BODY(iseq)->param.flags.forwardable) { if (ISEQ_BODY(iseq)->param.flags.forwardable) {
bool can_fastpath = true;
if ((vm_ci_flag(ci) & VM_CALL_FORWARDING)) { if ((vm_ci_flag(ci) & VM_CALL_FORWARDING)) {
struct rb_forwarding_call_data * forward_cd = (struct rb_forwarding_call_data *)calling->cd; struct rb_forwarding_call_data * forward_cd = (struct rb_forwarding_call_data *)calling->cd;
if (vm_ci_argc(ci) != vm_ci_argc(forward_cd->caller_ci)) { if (vm_ci_argc(ci) != vm_ci_argc(forward_cd->caller_ci)) {
@ -3182,6 +3204,7 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
} else { } else {
ci = forward_cd->caller_ci; ci = forward_cd->caller_ci;
} }
can_fastpath = false;
} }
// C functions calling iseqs will stack allocate a CI, // C functions calling iseqs will stack allocate a CI,
// so we need to convert it to heap allocated // so we need to convert it to heap allocated
@ -3191,8 +3214,10 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
vm_ci_flag(ci), vm_ci_flag(ci),
vm_ci_argc(ci), vm_ci_argc(ci),
vm_ci_kwarg(ci)); vm_ci_kwarg(ci));
can_fastpath = false;
} }
argv[param_size - 1] = (VALUE)ci; argv[param_size - 1] = (VALUE)ci;
CC_SET_FASTPATH(cc, vm_call_iseq_forwardable, can_fastpath);
return 0; return 0;
} }