diff options
author | Koichi Sasada <ko1@atdot.net> | 2019-11-15 17:49:49 +0900 |
---|---|---|
committer | Koichi Sasada <ko1@atdot.net> | 2019-11-18 10:16:11 +0900 |
commit | 71fee9bc720ba7a117062bf3f78b6086527b656c (patch) | |
tree | 85443e3fbe9cfc0676a807a327e12b814fb20bf5 /vm_insnhelper.c | |
parent | 93ce4f1cd7c96f0fdbeebc87a9fa64d07cede729 (diff) |
vm_invoke_builtin_delegate with start index.
opt_invokebuiltin_delegate and opt_invokebuiltin_delegate_leave
invokes builtin functions with same parameters of the method.
This technique eliminate stack push operations. However, delegation
parameters should be completely same as given parameters.
(e.g. `def foo(a, b, c) __builtin_foo(a, b, c)` is okay, but
__builtin_foo(b, c) is not allowed)
This patch relaxes this restriction. ISeq has a local variables
table which includes parameters. For example, the method defined
as `def foo(a, b, c) x=y=nil`, then local variables table contains
[a, b, c, x, y]. If calling builtin-function with arguments which
are sub-array of the lvar table, use opt_invokebuiltin_delegate
instruction with start index. For example, `__builtin_foo(b, c)`,
`__builtin_bar(c, x, y)` is okay, and so on.
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index e5a7c77e91..a4d2fbcf41 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -4989,10 +4989,18 @@ vm_invoke_builtin(rb_execution_context_t *ec, rb_control_frame_t *cfp, const str } static VALUE -vm_invoke_builtin_delegate(rb_execution_context_t *ec, rb_control_frame_t *cfp, const struct rb_builtin_function *bf) +vm_invoke_builtin_delegate(rb_execution_context_t *ec, rb_control_frame_t *cfp, const struct rb_builtin_function *bf, int start_index) { - const VALUE *argv = cfp->ep - cfp->iseq->body->local_table_size - VM_ENV_DATA_SIZE + 1; - // fprintf(stderr, "%s %s(%d):%p\n", __func__, bf->name, bf->argc, bf->func_ptr); + if (0) { // debug print + fprintf(stderr, "vm_invoke_builtin_delegate: passing -> "); + for (int i=0; i<bf->argc; i++) { + fprintf(stderr, ":%s ", rb_id2name(cfp->iseq->body->local_table[i+start_index])); + } + fprintf(stderr, "\n"); + fprintf(stderr, "%s %s(%d):%p\n", __func__, bf->name, bf->argc, bf->func_ptr); + } + + const VALUE *argv = cfp->ep - cfp->iseq->body->local_table_size - VM_ENV_DATA_SIZE + 1 + start_index; return invoke_bf(ec, cfp, bf, argv); } |