From 8a83cd100bb932f47ecc7e214e9d89cb8ec3beae Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 8 Jan 2018 16:06:33 +0000 Subject: use `getblockparamproxy` to pass blocks. * compile.c (setup_args): use `getblockparamproxy` (`rb_block_param_proxy`) to represent a block parameter passing. * vm_args.c (vm_caller_setup_arg_block): check `rb_block_param_proxy` instead of using `VM_CALL_ARGS_BLOCKARG_BLOCKPARAM` call flag. * vm_core.h (VM_CALL_ARGS_BLOCKARG_BLOCKPARAM): removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_args.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'vm_args.c') diff --git a/vm_args.c b/vm_args.c index 997b0b2f48..c61f50d933 100644 --- a/vm_args.c +++ b/vm_args.c @@ -835,13 +835,12 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t * if (ci->flag & VM_CALL_ARGS_BLOCKARG) { VALUE block_code = *(--reg_cfp->sp); - if ((ci->flag & VM_CALL_ARGS_BLOCKARG_BLOCKPARAM) && - !VM_ENV_FLAGS(VM_CF_LEP(reg_cfp), VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM)) { - calling->block_handler = VM_CF_BLOCK_HANDLER(reg_cfp); - } - else if (NIL_P(block_code)) { + if (NIL_P(block_code)) { calling->block_handler = VM_BLOCK_HANDLER_NONE; } + else if (block_code == rb_block_param_proxy) { + calling->block_handler = VM_CF_BLOCK_HANDLER(reg_cfp); + } else if (SYMBOL_P(block_code) && rb_method_basic_definition_p(rb_cSymbol, idTo_proc)) { const rb_cref_t *cref = vm_env_cref(reg_cfp->ep); if (cref && !NIL_P(cref->refinements)) { -- cgit v1.2.1