diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-07 19:18:49 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-07 19:18:49 +0000 |
commit | 7fd11834676eb4df34f7160aed1cdf798e60d0b9 (patch) | |
tree | a9d327ea998ac6a9e97211a9df0f101b9cb8a5e8 /vm.c | |
parent | bb8f6ac0feafa2d7045e05151346d0f16279c435 (diff) | |
download | ruby-7fd11834676eb4df34f7160aed1cdf798e60d0b9.tar.gz |
Speedup `block.call` [Feature #14330]
* insns.def (getblockparamproxy): introduce new instruction to return
the `rb_block_param_proxy` object if possible. This object responds
to `call` method and invoke given block (completely similar to `yield`).
* method.h (OPTIMIZED_METHOD_TYPE_BLOCK_CALL): add new optimized call type
which is for `rb_block_param_proxy.cal`.
* vm_insnhelper.c (vm_call_method_each_type): ditto.
* vm_insnhelper.c (vm_call_opt_block_call): ditto.
* vm_core.h (BOP_CALL, PROC_REDEFINED_OP_FLAG): add check for `Proc#call`
redefinition.
* compile.c (iseq_compile_each0): compile to use new insn
`getblockparamproxy` for method call.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -295,6 +295,8 @@ static VALUE vm_make_env_object(const rb_execution_context_t *ec, rb_control_fra static VALUE vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, VALUE block_handler); static VALUE vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, VALUE block_handler); +static VALUE rb_block_param_proxy; + #include "vm_insnhelper.h" #include "vm_exec.h" #include "vm_insnhelper.c" @@ -1494,6 +1496,7 @@ vm_redefinition_check_flag(VALUE klass) if (klass == rb_cNilClass) return NIL_REDEFINED_OP_FLAG; if (klass == rb_cTrueClass) return TRUE_REDEFINED_OP_FLAG; if (klass == rb_cFalseClass) return FALSE_REDEFINED_OP_FLAG; + if (klass == rb_cProc) return PROC_REDEFINED_OP_FLAG; return 0; } @@ -1537,7 +1540,9 @@ add_opt_method(VALUE klass, ID mid, VALUE bop) { const rb_method_entry_t *me = rb_method_entry_at(klass, mid); - if (me && me->def->type == VM_METHOD_TYPE_CFUNC) { + if (me && + (me->def->type == VM_METHOD_TYPE_CFUNC || + me->def->type == VM_METHOD_TYPE_OPTIMIZED)) { st_insert(vm_opt_method_table, (st_data_t)me, (st_data_t)bop); } else { @@ -3054,6 +3059,12 @@ Init_VM(void) } vm_init_redefined_flag(); + rb_block_param_proxy = rb_obj_alloc(rb_cObject); + rb_add_method(rb_singleton_class(rb_block_param_proxy), rb_intern("call"), VM_METHOD_TYPE_OPTIMIZED, + (void *)OPTIMIZED_METHOD_TYPE_BLOCK_CALL, METHOD_VISI_PUBLIC); + rb_obj_freeze(rb_block_param_proxy); + rb_gc_register_mark_object(rb_block_param_proxy); + /* vm_backtrace.c */ Init_vm_backtrace(); VM_PROFILE_ATEXIT(); |