nagachika	2018-12-10 21:31:18 +0900 (Mon, 10 Dec 2018)

  New Revision: 66309

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66309

  Log:
    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.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/compile.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 66308)
+++ ruby_2_5/version.h	(revision 66309)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #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"
 
Index: ruby_2_5/compile.c
===================================================================
--- ruby_2_5/compile.c	(revision 66308)
+++ ruby_2_5/compile.c	(revision 66309)
@@ -8922,9 +8922,9 @@ static void https://github.com/ruby/ruby/blob/trunk/ruby_2_5/compile.c#L8922
 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);
 }
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 66308)
+++ ruby_2_5	(revision 66309)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r62621

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/