aboutsummaryrefslogtreecommitdiffstats
path: root/vm_args.c
diff options
context:
space:
mode:
Diffstat (limited to 'vm_args.c')
-rw-r--r--vm_args.c9
1 files changed, 4 insertions, 5 deletions
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)) {