1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile.c: ensure after toplevel return

Browse Source 
* compile.c (iseq_compile_each0): toplevel returns should fire
  ensures.  [ruby-core:82492] [Bug #13844]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-01 00:43:00 +00:00
parent 3541e36557
commit d6347a467d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile.c
View File

@ -5771,7 +5771,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp
const rb_iseq_t *parent_iseq = is->body->parent_iseq; const rb_iseq_t *parent_iseq = is->body->parent_iseq;
enum iseq_type parent_type; enum iseq_type parent_type;
if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN) { if (type == ISEQ_TYPE_TOP) {
LABEL *splabel = NEW_LABEL(line); LABEL *splabel = NEW_LABEL(line);
ADD_LABEL(ret, splabel); ADD_LABEL(ret, splabel);
ADD_ADJUST(ret, line, 0); ADD_ADJUST(ret, line, 0);
@ -5779,7 +5779,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp
ADD_INSN(ret, line, leave); ADD_INSN(ret, line, leave);
ADD_ADJUST_RESTORE(ret, splabel); ADD_ADJUST_RESTORE(ret, splabel);
} }
else if ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) && else if ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE || type == ISEQ_TYPE_MAIN) &&
parent_iseq && parent_iseq &&
((parent_type = parent_iseq->body->type) == ISEQ_TYPE_TOP || ((parent_type = parent_iseq->body->type) == ISEQ_TYPE_TOP ||
parent_type == ISEQ_TYPE_MAIN)) { parent_type == ISEQ_TYPE_MAIN)) {

2
test/ruby/test_syntax.rb
View File

@ -986,7 +986,7 @@ eom
begin; begin;
return; raise return; raise
begin return; rescue SystemExit; exit false; end begin return; rescue SystemExit; exit false; end
begin return; ensure exit false; end begin return; ensure puts "ensured"; end #=> ensured
begin ensure return; end begin ensure return; end
begin raise; ensure; return; end begin raise; ensure; return; end
begin raise; rescue; return; end begin raise; rescue; return; end