diff options
-rw-r--r-- | compile.c | 1 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -5479,6 +5479,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe 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 4b9101bc7b..4f17f453a4 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| @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-08-03" -#define RUBY_PATCHLEVEL 163 +#define RUBY_PATCHLEVEL 164 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 8 |