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

fix return in toplevel ensure

Browse source 
* compile.c (iseq_compile_each0): adjust stack after return in
  toplevel ensure, when the value is used.
  [ruby-core:81777] [Bug #13682]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-06-27 14:09:08 +00:00
parent 1474acff3c
commit 5cfda37971
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
compile.c
View file

@ -4824,8 +4824,6 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp
CHECK(COMPILE_POPPED(ensr, "ensure ensr", node->nd_ensr));
last = ensr->last;
last_leave = last && IS_INSN(last) && IS_INSN_ID(last, leave);
if (!popped && last_leave)
popped = 1;
er.begin = lstart;
er.end = lend;
@ -4833,13 +4831,16 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp
push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
ADD_LABEL(ret, lstart);
CHECK(COMPILE_(ret, "ensure head", node->nd_head, popped));
CHECK(COMPILE_(ret, "ensure head", node->nd_head, (popped | last_leave)));
ADD_LABEL(ret, lend);
if (ensr->anchor.next == NULL) {
ADD_INSN(ret, line, nop);
}
else {
ADD_SEQ(ret, ensr);
if (!popped && last_leave) {
ADD_INSN(ret, line, putnil);
}
}
ADD_LABEL(ret, lcont);
if (last_leave) ADD_INSN(ret, line, pop);

1
test/ruby/test_syntax.rb
View file

@ -977,6 +977,7 @@ eom
"#{return}"
raise((return; "should not raise"))
begin raise; ensure return; end; self
begin raise; ensure return; end and self
end;
all_assertions(feature4840) do |a|
code.each_line do |s|