* vm_args.c (enum arg_setup_type): remove arg_setup_lambda because it is
  same as arg_setup_method.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-06-05 05:43:58 +00:00
Родитель 86ae6129cb
Коммит 1dc7906b17
3 изменённых файлов: 3 добавлений и 6 удалений

2
vm.c
Просмотреть файл

@ -1021,7 +1021,7 @@ invoke_iseq_block_from_c(rb_thread_t *th, const struct rb_captured_block *captur
} }
opt_pc = vm_yield_setup_args(th, iseq, argc, sp, passed_block_handler, opt_pc = vm_yield_setup_args(th, iseq, argc, sp, passed_block_handler,
(is_lambda ? (splattable ? arg_setup_lambda : arg_setup_method) : arg_setup_block)); (is_lambda ? arg_setup_method : arg_setup_block));
cfp->sp = sp; cfp->sp = sp;
if (me == NULL) { if (me == NULL) {

Просмотреть файл

@ -29,8 +29,7 @@ struct args_info {
enum arg_setup_type { enum arg_setup_type {
arg_setup_method, arg_setup_method,
arg_setup_block, arg_setup_block
arg_setup_lambda
}; };
static inline int static inline int
@ -595,8 +594,6 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq,
given_argc = RARRAY_LENINT(args->rest); given_argc = RARRAY_LENINT(args->rest);
} }
break; break;
case arg_setup_lambda:
break;
} }
/* argc check */ /* argc check */

Просмотреть файл

@ -2677,7 +2677,7 @@ vm_invoke_iseq_block(rb_thread_t *th, rb_control_frame_t *reg_cfp,
const rb_iseq_t *iseq = rb_iseq_check(captured->code.iseq); const rb_iseq_t *iseq = rb_iseq_check(captured->code.iseq);
const int arg_size = iseq->body->param.size; const int arg_size = iseq->body->param.size;
VALUE * const rsp = GET_SP() - calling->argc; VALUE * const rsp = GET_SP() - calling->argc;
int opt_pc = vm_callee_setup_block_arg(th, calling, ci, iseq, rsp, is_lambda ? arg_setup_lambda : arg_setup_block); int opt_pc = vm_callee_setup_block_arg(th, calling, ci, iseq, rsp, is_lambda ? arg_setup_method : arg_setup_block);
SET_SP(rsp); SET_SP(rsp);