diff options
Diffstat (limited to 'compile.c')
-rw-r--r-- | compile.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -5657,15 +5657,23 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp if (is) { enum iseq_type type = is->body->type; const rb_iseq_t *parent_iseq = is->body->parent_iseq; - enum iseq_type parent_type = parent_iseq ? parent_iseq->body->type : type; + enum iseq_type parent_type; - if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN || - ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) && - (parent_type == ISEQ_TYPE_TOP || parent_type == ISEQ_TYPE_MAIN))) { + if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN) { ADD_ADJUST(ret, line, 0); ADD_INSN(ret, line, putnil); ADD_INSN(ret, line, leave); } + else if ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) && + parent_iseq && + ((parent_type = parent_iseq->body->type) == ISEQ_TYPE_TOP || + parent_type == ISEQ_TYPE_MAIN)) { + ADD_INSN(ret, line, putnil); + ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN)); + if (popped) { + ADD_INSN(ret, line, pop); + } + } else { LABEL *splabel = 0; |