1 files changed, 75 insertions, 15 deletions
@@ -4019,21 +4019,18 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 niobj = niobj->next;
 /*
- * Eliminate array and hash allocation for f(*a, kw: 1)
 *
 * splatarray true
 * duphash
 * send ARGS_SPLAT|KW_SPLAT|KW_SPLAT_MUT and not ARGS_BLOCKARG
 * =>
 * splatarray false
- * putobject
- * send ARGS_SPLAT|KW_SPLAT
 */
 if (optimize_args_splat_no_copy(iseq, iobj, niobj,
- VM_CALL_ARGS_SPLAT|VM_CALL_KW_SPLAT|VM_CALL_KW_SPLAT_MUT, VM_CALL_ARGS_BLOCKARG, VM_CALL_KW_SPLAT_MUT)) {
-
- ((INSN*)niobj)->insn_id = BIN(putobject);
- OPERAND_AT(niobj, 0) = rb_hash_freeze(rb_hash_resurrect(OPERAND_AT(niobj, 0)));
 goto optimized_splat;
 }
@@ -4041,7 +4038,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 if (IS_NEXT_INSN_ID(niobj, getlocal) || IS_NEXT_INSN_ID(niobj, getinstancevariable) ||
 IS_NEXT_INSN_ID(niobj, getblockparamproxy)) {
 /*
- * Eliminate array and hash allocation for f(*a, kw: 1, &{arg,lvar,@iv})
 *
 * splatarray true
 * duphash
@@ -4049,20 +4046,73 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 * send ARGS_SPLAT|KW_SPLAT|KW_SPLAT_MUT|ARGS_BLOCKARG
 * =>
 * splatarray false
- * putobject
 * getlocal / getinstancevariable / getblockparamproxy
- * send ARGS_SPLAT|KW_SPLAT|ARGS_BLOCKARG
 */
- if (optimize_args_splat_no_copy(iseq, iobj, niobj->next,
- VM_CALL_ARGS_SPLAT|VM_CALL_KW_SPLAT|VM_CALL_KW_SPLAT_MUT|VM_CALL_ARGS_BLOCKARG, 0, VM_CALL_KW_SPLAT_MUT)) {
 ((INSN*)niobj)->insn_id = BIN(putobject);
 OPERAND_AT(niobj, 0) = rb_hash_freeze(rb_hash_resurrect(OPERAND_AT(niobj, 0)));
 }
 }
 }
 }
- optimized_splat:
 return COMPILE_OK;
 }
@@ -6323,8 +6373,18 @@ setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
 return argc;
 }
 case NODE_ARGSPUSH: {
- if (flag_ptr) *flag_ptr |= VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_SPLAT_MUT;
- int argc = setup_args_core(iseq, args, RNODE_ARGSPUSH(argn)->nd_head, 1, NULL, NULL);
 if (nd_type_p(RNODE_ARGSPUSH(argn)->nd_body, NODE_LIST)) {
 int rest_len = compile_args(iseq, args, RNODE_ARGSPUSH(argn)->nd_body, &kwnode);