From f7bd8a08ec161a5a6cb079313559fb3b4fc5861d Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 4 Aug 2017 16:13:13 +0000 Subject: merge revision(s) 59374: [Backport #13755] compile.c: restore stack at return * compile.c (iseq_compile_each0): restore the stack depth after return to the previous depth, to fix the stack depth at returning from rescue iseq. [ruby-core:82108] [Bug #13755] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'compile.c') diff --git a/compile.c b/compile.c index 56d885aa27..20466d01f9 100644 --- a/compile.c +++ b/compile.c @@ -5480,9 +5480,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe enum iseq_type parent_type; if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN) { + LABEL *splabel = NEW_LABEL(line); + ADD_LABEL(ret, splabel); ADD_ADJUST(ret, line, 0); ADD_INSN(ret, line, putnil); ADD_INSN(ret, line, leave); + ADD_ADJUST_RESTORE(ret, splabel); } else if ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) && parent_iseq && -- cgit v1.2.3