diff options
author | wanabe <s.wanabe@gmail.com> | 2020-08-08 08:37:52 +0900 |
---|---|---|
committer | wanabe <s.wanabe@gmail.com> | 2020-10-16 08:37:04 +0900 |
commit | ce7a053475cbebfb2f3e5ed6614e0ba631541917 (patch) | |
tree | b72b49eb34ca341c2cff023f205d80379e62c3a4 | |
parent | b68c22b3c6a80ebf96d446348bc8007b8a10f694 (diff) |
Adjust sp for `x = false; y = (return until x unless x)` [Bug #16695]
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3445
-rw-r--r-- | compile.c | 8 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 9 |
2 files changed, 12 insertions, 5 deletions
@@ -2855,7 +2855,6 @@ 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 * ... @@ -2863,7 +2862,6 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal * leave * => * leave - * pop * ... * LABEL: * leave @@ -2873,9 +2871,6 @@ 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 (IS_INSN(iobj->link.prev) && @@ -5382,6 +5377,9 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int branches); end_label = NEW_LABEL(line); ADD_INSNL(then_seq, line, jump, end_label); + if (!popped) { + ADD_INSN(then_seq, line, pop); + } } ADD_SEQ(ret, then_seq); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 0542d4f90d..ac2a0da9cd 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1388,6 +1388,15 @@ eom assert_nil obj.test end + def test_assignment_return_in_loop + obj = Object.new + def obj.test + x = nil + y = (return until x unless x) + end + assert_nil obj.test, "[Bug #16695]" + end + def test_method_call_location line = __LINE__+5 e = assert_raise(NoMethodError) do |