From d6347a467d2b2f5628f45da473fa9e159bbc5c13 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 1 Sep 2017 00:43:00 +0000 Subject: compile.c: ensure after toplevel return * 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 --- compile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compile.c') diff --git a/compile.c b/compile.c index b2770c3221..e09e828c6f 100644 --- a/compile.c +++ b/compile.c @@ -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; enum iseq_type parent_type; - if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN) { + if (type == ISEQ_TYPE_TOP) { LABEL *splabel = NEW_LABEL(line); ADD_LABEL(ret, splabel); 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_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_type = parent_iseq->body->type) == ISEQ_TYPE_TOP || parent_type == ISEQ_TYPE_MAIN)) { -- cgit v1.2.3