mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
compile.c: fix stack consistency error
* compile.c (iseq_peephole_optimize): fix stack consistency error from return in loop, by adding extra `pop` when replacing `jump` with `leave`, which is never reached but needed to adjust sp calculation. [ruby-core:84589] [Bug #14273] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
665839ddda
commit
43c1eb440a
2 changed files with 14 additions and 0 deletions
|
@ -2476,6 +2476,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
|
|||
goto again;
|
||||
}
|
||||
else if (IS_INSN_ID(diobj, leave)) {
|
||||
INSN *pop;
|
||||
/*
|
||||
* jump LABEL
|
||||
* ...
|
||||
|
@ -2483,6 +2484,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
|
|||
* leave
|
||||
* =>
|
||||
* leave
|
||||
* pop
|
||||
* ...
|
||||
* LABEL:
|
||||
* leave
|
||||
|
@ -2492,6 +2494,9 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
|
|||
iobj->insn_id = BIN(leave);
|
||||
iobj->operand_size = 0;
|
||||
iobj->insn_info = diobj->insn_info;
|
||||
/* adjust stack depth */
|
||||
pop = new_insn_body(iseq, diobj->insn_info.line_no, BIN(pop), 0);
|
||||
ELEM_INSERT_NEXT(&iobj->link, &pop->link);
|
||||
goto again;
|
||||
}
|
||||
else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
|
||||
|
|
|
@ -1128,6 +1128,15 @@ eom
|
|||
assert_equal(:begin, result)
|
||||
end
|
||||
|
||||
def test_return_in_loop
|
||||
obj = Object.new
|
||||
def obj.test
|
||||
x = nil
|
||||
return until x unless x
|
||||
end
|
||||
assert_nil obj.test
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def not_label(x) @result = x; @not_label ||= nil end
|
||||
|
|
Loading…
Reference in a new issue