From 95615872e32156d9add8fd3afd136dd73fd6aa1a Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Mon, 6 Nov 2023 12:39:57 -0800 Subject: [PATCH] Eliminate array allocation for f(*a, **lvar, &lvar) and f(*a, **@iv, &@iv) The compiler already eliminates the array allocation for f(*a, &lvar) and f(*a, &@iv). If that is safe, then eliminating it for f(*a, **lvar) and f(*a, **@iv) as the last commit did is as safe, and eliminating it for f(*a, **lvar, &lvar) and f(*a, **@iv, &@iv) is also as safe. --- compile.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/compile.c b/compile.c index 4ba332ff1f..2a56579b98 100644 --- a/compile.c +++ b/compile.c @@ -3892,6 +3892,30 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal OPERAND_AT(iobj, 0) = Qfalse; } } + } else if (IS_NEXT_INSN_ID(niobj, getlocal) || IS_NEXT_INSN_ID(niobj, getinstancevariable)) { + niobj = niobj->next; + + /* + * Eliminate array allocation for f(*a, **lvar, &lvar) and f(*a, **@iv, &@iv) + * + * splatarray true + * getlocal / getinstancevariable + * getlocal / getinstancevariable + * send ARGS_SPLAT|KW_SPLAT|ARGS_BLOCKARG + * => + * splatarray false + * getlocal / getinstancevariable + * getlocal / getinstancevariable + * send + */ + if (IS_NEXT_INSN_ID(niobj, send)) { + niobj = niobj->next; + unsigned int flag = vm_ci_flag((const struct rb_callinfo *)OPERAND_AT(niobj, 0)); + + if ((flag & VM_CALL_ARGS_SPLAT) && (flag & VM_CALL_KW_SPLAT) && (flag & VM_CALL_ARGS_BLOCKARG)) { + OPERAND_AT(iobj, 0) = Qfalse; + } + } } } }