diff options
Diffstat (limited to 'insns.def')
| -rw-r--r-- | insns.def | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -1155,7 +1155,7 @@ send NODE *mn; VALUE recv, klass; rb_block_t *blockptr = 0; - rb_num_t num = caller_setup_args(th, GET_CFP(), op_flag, op_argc, blockiseq, &blockptr, 1); + rb_num_t num = caller_setup_args(th, GET_CFP(), op_flag, op_argc, blockiseq, &blockptr); rb_num_t flag = op_flag; ID id = op_id; @@ -1216,7 +1216,7 @@ invokesuper { rb_block_t *blockptr = 0; VALUE flag = op_flag; - int num = caller_setup_args(th, GET_CFP(), flag, op_argc, blockiseq, &blockptr, 1); + int num = caller_setup_args(th, GET_CFP(), flag, op_argc, blockiseq, &blockptr); rb_iseq_t *iseq = GET_ISEQ(); rb_iseq_t *ip = iseq; VALUE recv, klass; @@ -1292,18 +1292,21 @@ invokeblock iseq = block->iseq; if (BUILTIN_TYPE(iseq) != T_NODE) { - argc = caller_setup_args(th, GET_CFP(), flag, argc, 0, 0, 0); + int opt_pc; + + argc = caller_setup_args(th, GET_CFP(), flag, argc, 0, 0); CHECK_STACK_OVERFLOW(GET_CFP(), iseq->stack_max); DEC_SP(argc); - argc = vm_yield_setup_args(th, iseq, argc, GET_SP(), - block_proc_is_lambda(block->proc)); + opt_pc = vm_yield_setup_args(th, iseq, argc, GET_SP(), + block_proc_is_lambda(block->proc)); + argc = iseq->arg_size; INC_SP(argc); vm_push_frame(th, iseq, FRAME_MAGIC_BLOCK, block->self, (VALUE) block->dfp, - iseq->iseq_encoded, GET_SP(), block->lfp, + iseq->iseq_encoded + opt_pc, GET_SP(), block->lfp, iseq->local_size - argc); reg_cfp->sp -= argc; |