compile.c: fix peephole optimization

nobu · nobu · commit 71b0d20f7ea6 · 2018-10-24T10:38:39.000Z
* compile.c (iseq_peephole_optimize): should `pop` before jump
  instruction which succeeds to `newarray` of a literal object,
  not after.  [ruby-core:89536] [Bug #15245]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/compile.c b/compile.c
@@ -2913,7 +2913,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 		}
 		else if (!iseq_pop_newarray(iseq, pobj)) {
 		    pobj = new_insn_core(iseq, pobj->insn_info.line_no, BIN(pop), 0, NULL);
-		    ELEM_INSERT_NEXT(&iobj->link, &pobj->link);
+                    ELEM_INSERT_PREV(&iobj->link, &pobj->link);
 		}
 		if (cond) {
 		    if (prev_dup) {
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
@@ -794,4 +794,10 @@ def x.bug(obj)
     end
     assert_equal(:ok, x.bug(:ok))
   end
+
+  def test_peephole_jump_after_newarray
+    i = 0
+    %w(1) || 2 while (i += 1) < 100
+    assert_equal(100, i)
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -2913,7 +2913,7 @@ iseq_peephole_optimize(rb_iseq_t iseq, LINK_ELEMENT list, const int do_tailcal`
`2913`	`2913`	`}`
`2914`	`2914`	`else if (!iseq_pop_newarray(iseq, pobj)) {`
`2915`	`2915`	`pobj = new_insn_core(iseq, pobj->insn_info.line_no, BIN(pop), 0, NULL);`
`2916`		`- ELEM_INSERT_NEXT(&iobj->link, &pobj->link);`
	`2916`	`+ ELEM_INSERT_PREV(&iobj->link, &pobj->link);`
`2917`	`2917`	`}`
`2918`	`2918`	`if (cond) {`
`2919`	`2919`	`if (prev_dup) {`