Eliminate array allocation for f(*a, kw: 1, &lvar) and f(*a, kw: 1, &@iv)

Similar to the previous commit, but this handles the block pass
case.
This commit is contained in:
Jeremy Evans 2023-11-06 13:17:49 -08:00
parent 5e33f2b0e4
commit aa808204bb

View File

@ -3940,6 +3940,32 @@ 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, kw: 1, &lvar) and f(*a, kw: 1, &@iv)
*
* splatarray true
* duphash
* getlocal / getinstancevariable
* send ARGS_SPLAT|KW_SPLAT|KW_SPLAT_MUT|ARGS_BLOCKARG
* =>
* splatarray false
* duphash
* 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_KW_SPLAT_MUT) && (flag & VM_CALL_ARGS_BLOCKARG)) {
OPERAND_AT(iobj, 0) = Qfalse;
}
}
}
}
}