merge revision(s) 62621: [Backport #15396]

	compile.c: do not truncate VALUE to long

	* compile.c (ibf_dump_object_regexp): do not truncate VALUE to
	  long.  it makes invalid VALUE on IL32LLP64 platforms where long
	  is shorter than VALUE.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 5 deletions

diff --git a/compile.c b/compile.c
index 9405e11057..27f4a9c21c 100644
--- a/compile.c
+++ b/compile.c
@@ -8922,9 +8922,9 @@ static void
 ibf_dump_object_regexp(struct ibf_dump *dump, VALUE obj)
 {
     struct ibf_object_regexp regexp;
-    regexp.srcstr = RREGEXP_SRC(obj);
+    VALUE srcstr = RREGEXP_SRC(obj);
     regexp.option = (char)rb_reg_options(obj);
-    regexp.srcstr = (long)ibf_dump_object(dump, regexp.srcstr);
+    regexp.srcstr = (long)ibf_dump_object(dump, srcstr);
     IBF_WV(regexp);
 }
 
diff --git a/version.h b/version.h
index 07a5e8738c..6fc52ec74c 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2018-12-09"
-#define RUBY_PATCHLEVEL 122
+#define RUBY_RELEASE_DATE "2018-12-10"
+#define RUBY_PATCHLEVEL 123
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"