diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-04 16:13:13 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-04 16:13:13 +0000 |
| commit | f7bd8a08ec161a5a6cb079313559fb3b4fc5861d (patch) | |
| tree | 47436ce96b3389604edeac324f80d5b0148144bc /compile.c | |
| parent | 2badceae641d795adddd048e4f9f8686d9768ae2 (diff) | |
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
Diffstat (limited to 'compile.c')
| -rw-r--r-- | compile.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 && |