diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-25 05:10:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-25 05:10:48 +0000 |
commit | 960b5d314f63121dea1adcb4fe1a8331646b9732 (patch) | |
tree | 66816d2eda2ae668f819f16e8a4b73d7683acfb2 | |
parent | d91d43dc36afbfea277f74e902a6617c56546d65 (diff) | |
download | ruby-960b5d314f63121dea1adcb4fe1a8331646b9732.tar.gz |
compile.c: toplevel return in argument
* compile.c (iseq_compile_each0): adjust the stack before return
in an evstr/argument (reported by Balazs <balazs@kutilovi.cz>)
to fix stack consistency error. [ruby-core:81761] [Bug #13678]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | compile.c | 1 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -5590,6 +5590,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp 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))) { + ADD_ADJUST(ret, line, 0); ADD_INSN(ret, line, putnil); ADD_INSN(ret, line, leave); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index d1ac396eab..243d381e7e 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -964,7 +964,7 @@ eom def test_return_toplevel feature4840 = '[ruby-core:36785] [Feature #4840]' - code = "#{<<~"begin;"}\n#{<<~"end;"}" + code = "#{<<~"begin;"}\n#{<<~'end;'}" begin; return; raise begin return; rescue SystemExit; exit false; end @@ -974,6 +974,8 @@ eom begin raise; rescue; return; end return false; raise return 1; raise + "#{return}" + raise((return; "should not raise")) end; all_assertions(feature4840) do |a| code.each_line do |s| |