diff options
| -rw-r--r-- | compile.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_optimization.rb | 15 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 18 insertions, 2 deletions
@@ -2775,7 +2775,8 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal ELEM_INSERT_NEXT(&dniobj->link, &pop->link); goto again; } - else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 && + else if (IS_INSN(iobj->link.prev) && + (piobj = (INSN *)iobj->link.prev) && (IS_INSN_ID(piobj, branchif) || IS_INSN_ID(piobj, branchunless))) { INSN *pdiobj = (INSN *)get_destination_insn(piobj); diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb index 5609602c1a..bc3eacce52 100644 --- a/test/ruby/test_optimization.rb +++ b/test/ruby/test_optimization.rb @@ -795,6 +795,21 @@ class TestRubyOptimization < Test::Unit::TestCase assert_equal(:ok, x.bug(:ok)) end + def test_jump_elimination_with_optimized_out_block_2 + x = Object.new + def x.bug + a = "aaa" + ok = :NG + if a == "bbb" || a == "ccc" then + a = a + else + ok = :ok + end + ok + end + assert_equal(:ok, x.bug) + end + def test_peephole_jump_after_newarray i = 0 %w(1) || 2 while (i += 1) < 100 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.3" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 68 +#define RUBY_PATCHLEVEL 69 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 7 |