diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2019-09-05 16:27:26 +0900 |
|---|---|---|
| committer | Jeremy Evans <code@jeremyevans.net> | 2019-09-05 17:47:12 -0700 |
| commit | c5555e2eb8631e649cc9377f0bd75ebc2788cc7d (patch) | |
| tree | 695cab1eadab4892af702bcba161f3f56bdf055f /vm_insnhelper.c | |
| parent | a23ddf7ff58ec77548d2ecd7f9f202aa3eff9fc7 (diff) | |
CALLER_SETUP_ARG removes an empty keyword hash from argv
...only when a "remove_empty_keyword_hash" flag is specified.
After CALLER_SETUP_ARG is called, `ci->flag & VM_CALL_KW_SPLAT` must not
be used. Instead. use `calling->kw_splat`. This is because
CALLER_SETUP_ARG may modify argv and update `calling->kw_splat`, and
`ci->flag & VM_CALL_KW_SPLAT` may be inconsistent with the result.
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 577b08a341..f8d68ccae6 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1740,7 +1740,7 @@ rb_iseq_only_kwparam_p(const rb_iseq_t *iseq) static inline void CALLER_SETUP_ARG(struct rb_control_frame_struct *restrict cfp, struct rb_calling_info *restrict calling, - const struct rb_call_info *restrict ci, int cfunc) + const struct rb_call_info *restrict ci, int remove_empty_keyword_hash) { if (UNLIKELY(IS_ARGS_SPLAT(ci))) { vm_caller_setup_arg_splat(cfp, calling); @@ -1748,6 +1748,13 @@ CALLER_SETUP_ARG(struct rb_control_frame_struct *restrict cfp, if (UNLIKELY(IS_ARGS_KEYWORD(ci))) { vm_caller_setup_arg_kw(cfp, calling, ci); } + if (UNLIKELY(calling->kw_splat && remove_empty_keyword_hash)) { + if (RHASH_EMPTY_P(cfp->sp[-1])) { + cfp->sp--; + calling->argc--; + calling->kw_splat = 0; + } + } } #define USE_OPT_HIST 0 @@ -2189,12 +2196,6 @@ vm_call_cfunc_with_frame(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp int argc = calling->argc; int orig_argc = argc; - if (UNLIKELY(calling->kw_splat)) { - if (RHASH_EMPTY_P(*(GET_SP()-1))) { - argc--; - calling->kw_splat = 0; - } - } if (UNLIKELY(IS_ARGS_KW_OR_KW_SPLAT(ci))) { frame_type |= VM_FRAME_FLAG_CFRAME_KW; } @@ -2315,12 +2316,6 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct ci = &ci_entry.ci; ci_entry.ci = *orig_ci; } - unsigned int kw_splat = ci->flag & VM_CALL_KW_SPLAT; - if (!kw_splat && (ci->flag & VM_CALL_KWARG)) { - /* TODO: delegate kw_arg without making a Hash object */ - ci->flag = ci->flag & ~VM_CALL_KWARG; - kw_splat = VM_CALL_KW_SPLAT; - } /* setup new cc */ cc_entry = *orig_cc; @@ -2350,7 +2345,7 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct } cc->me = rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), ci->mid, NULL); - ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | kw_splat; + ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0); return vm_call_method(ec, reg_cfp, calling, ci, cc); } @@ -2924,13 +2919,6 @@ vm_callee_setup_block_arg(rb_execution_context_t *ec, struct rb_calling_info *ca CALLER_SETUP_ARG(cfp, calling, ci, 1); /* splat arg */ - if (UNLIKELY(calling->kw_splat)) { - if (RHASH_EMPTY_P(argv[calling->argc-1])) { - calling->argc--; - calling->kw_splat = 0; - } - } - if (arg_setup_type == arg_setup_block && calling->argc == 1 && iseq->body->param.flags.has_lead && |