summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-24 10:38:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-24 10:38:39 +0000
commit71b0d20f7ea6b04aa3ae3fe6e624305a3ac294e6 (patch)
tree8a1ed2bfd160bc288b899ea9de1f142b358b80bd
parentcd0181dd68788b2159d9c740168f16e1f510fbe4 (diff)
compile.c: fix peephole optimization
* 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
-rw-r--r--compile.c2
-rw-r--r--test/ruby/test_optimization.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/compile.c b/compile.c
index 7a013b893c..3d3e16e638 100644
--- 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
index c425254661..46bce922b9 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -794,4 +794,10 @@ class TestRubyOptimization < Test::Unit::TestCase
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