kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

compile.c: toplevel return in argument

Browse source 
* 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
This commit is contained in:
nobu 2017-06-25 05:10:48 +00:00
parent d389625a1e
commit 8f1c93f409
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compile.c
View file

@ -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 || if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN ||
((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) && ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) &&
(parent_type == ISEQ_TYPE_TOP || parent_type == ISEQ_TYPE_MAIN))) { (parent_type == ISEQ_TYPE_TOP || parent_type == ISEQ_TYPE_MAIN))) {
ADD_ADJUST(ret, line, 0);
ADD_INSN(ret, line, putnil); ADD_INSN(ret, line, putnil);
ADD_INSN(ret, line, leave); ADD_INSN(ret, line, leave);
} }

4
test/ruby/test_syntax.rb
View file

@ -964,7 +964,7 @@ eom
def test_return_toplevel def test_return_toplevel
feature4840 = '[ruby-core:36785] [Feature #4840]' feature4840 = '[ruby-core:36785] [Feature #4840]'
code = "#{<<~"begin;"}\n#{<<~"end;"}" code = "#{<<~"begin;"}\n#{<<~'end;'}"
begin; begin;
return; raise return; raise
begin return; rescue SystemExit; exit false; end begin return; rescue SystemExit; exit false; end
@ -974,6 +974,8 @@ eom
begin raise; rescue; return; end begin raise; rescue; return; end
return false; raise return false; raise
return 1; raise return 1; raise
"#{return}"
raise((return; "should not raise"))
end; end;
all_assertions(feature4840) do |a| all_assertions(feature4840) do |a|
code.each_line do |s| code.each_line do |s|