kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

compile.c: remove unreachable jump only

Browse source 
* compile.c (iseq_peephole_optimize): remove unreachable jump
  instruction only.  if it is labeled and referred from other
  instructions, it is reachable and must not be removed.
  [ruby-core:87830] [Bug #14897]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-07-06 08:01:58 +00:00
parent 79f01d3972
commit 5e7167f8fb
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
compile.c
View file

@ -2730,12 +2730,13 @@ 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 (IS_INSN(iobj->link.prev) &&
(piobj = (INSN *)iobj->link.prev) &&
else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
(IS_INSN_ID(piobj, branchif) ||
IS_INSN_ID(piobj, branchunless))) {
INSN *pdiobj = (INSN *)get_destination_insn(piobj);
if (niobj == pdiobj) {
int refcnt = IS_LABEL(piobj->link.next) ?
((LABEL *)piobj->link.next)->refcnt : 0;
/*
* useless jump elimination (if/unless destination):
* if L1
@ -2753,7 +2754,12 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
piobj->insn_id = (IS_INSN_ID(piobj, branchif))
? BIN(branchunless) : BIN(branchif);
replace_destination(piobj, iobj);
ELEM_REMOVE(&iobj->link);
if (refcnt <= 1) {
ELEM_REMOVE(&iobj->link);
}
else {
/* TODO: replace other branch destinations too */
}
return COMPILE_OK;
}
else if (diobj == pdiobj) {

13
test/ruby/test_optimization.rb
View file

@ -771,4 +771,17 @@ class TestRubyOptimization < Test::Unit::TestCase
tap {true || tap {}}
end;
end
def test_jump_elimination_with_optimized_out_block
x = Object.new
def x.bug(obj)
if obj || obj
obj = obj
else
raise "[ruby-core:87830] [Bug #14897]"
end
obj
end
assert_equal(:ok, x.bug(:ok))
end
end