From 5ee9513a7104078d9d2f51aecc354ae67f1ba002 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 24 Oct 2017 11:13:49 +0000 Subject: Lazy Proc allocation for block parameters [Feature #14045] * insns.def (getblockparam, setblockparam): add special access instructions for block parameters. getblockparam checks VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM and if it is not set this instruction creates a Proc object from a given blcok and set VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM. setblockparam is similar to setlocal, but set VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM. * compile.c: use get/setblockparm instead get/setlocal instructions. Note that they are used for method local block parameters (def m(&b)), not for block local method parameters (iter{|&b|). * proc.c (get_local_variable_ptr): creates Proc object for Binding#local_variable_get/set. * safe.c (safe_setter): we need to create Proc objects for postponed block parameters when $SAFE is changed. * vm_args.c (args_setup_block_parameter): used only for block local blcok parameters. * vm_args.c (vm_caller_setup_arg_block): if called with VM_CALL_ARGS_BLOCKARG_BLOCKPARAM flag then passed block values should be a block handler. * test/ruby/test_optimization.rb: add tests. * benchmark/bm_vm1_blockparam*: added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- proc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'proc.c') diff --git a/proc.c b/proc.c index 021442ad93..0eba245dee 100644 --- a/proc.c +++ b/proc.c @@ -384,6 +384,8 @@ bind_eval(int argc, VALUE *argv, VALUE bindval) return rb_f_eval(argc+1, args, Qnil /* self will be searched in eval */); } +VALUE rb_vm_bh_to_procval(rb_thread_t *th, VALUE block_handler); + static const VALUE * get_local_variable_ptr(const rb_env_t **envp, ID lid) { @@ -397,6 +399,16 @@ get_local_variable_ptr(const rb_env_t **envp, ID lid) for (i=0; ibody->local_table_size; i++) { if (iseq->body->local_table[i] == lid) { + if (iseq->body->local_iseq == iseq && + iseq->body->param.flags.has_block && + (unsigned int)iseq->body->param.block_start == i) { + const VALUE *ep = env->ep; + if (!VM_ENV_FLAGS(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM)) { + RB_OBJ_WRITE(env, &env->env[i], rb_vm_bh_to_procval(GET_THREAD(), VM_ENV_BLOCK_HANDLER(ep))); + VM_ENV_FLAGS_SET(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM); + } + } + *envp = env; return &env->env[i]; } -- cgit v1.2.3