diff --git a/compile.c b/compile.c index f38a320b76..9716f04374 100644 --- a/compile.c +++ b/compile.c @@ -3337,6 +3337,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal if (IS_INSN(next) && IS_INSN_ID(next, expandarray) && OPERAND_AT(iobj, 0) == OPERAND_AT(next, 0) && OPERAND_AT(next, 1) == INT2FIX(0)) { + ELEM_REMOVE(next); /* * newarray 2 * expandarray 2, 0 @@ -3344,10 +3345,18 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal * swap */ if (OPERAND_AT(iobj, 0) == INT2FIX(2)) { - ELEM_REMOVE(next); INSN_OF(iobj) = BIN(swap); iobj->operand_size = 0; } + /* + * newarray X + * expandarray X, 0 + * => + * opt_reverse X + */ + else { + INSN_OF(iobj) = BIN(opt_reverse); + } } } diff --git a/insns.def b/insns.def index ebdbed6237..15c4734b8b 100644 --- a/insns.def +++ b/insns.def @@ -599,7 +599,7 @@ swap /* reverse stack top N order. */ DEFINE_INSN -reverse +opt_reverse (rb_num_t n) (...) (...)