From 2d414cb1acb6166643aa7b756ad8e525ef25ddd1 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 24 Mar 2018 16:00:27 +0000 Subject: merge revision(s) 61587,61617,61618: [Backport #14273] compile.c: next label * compile.c (compile_next): label for jump to the end of block is removable. compile.c: remove more unreachable chunk * compile.c (remove_unreachable_chunk): remove beyond labels to be removed. compile.c: fix stack consistency error * compile.c (iseq_peephole_optimize): fix stack consistency error from return in loop, by adding extra `pop` when replacing `jump` with `leave`, which is never reached but needed to adjust sp calculation. [ruby-core:84589] [Bug #14273] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'version.h') diff --git a/version.h b/version.h index 005c770ba5..c11322024d 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.1" -#define RUBY_RELEASE_DATE "2018-03-24" -#define RUBY_PATCHLEVEL 52 +#define RUBY_RELEASE_DATE "2018-03-25" +#define RUBY_PATCHLEVEL 53 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h" -- cgit v1.2.3