nagachika	2013-04-12 04:23:02 +0900 (Fri, 12 Apr 2013)

  New Revision: 40257

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40257

  Log:
    merge revision(s) 39860: [Backport #8150]
    
    * marshal.c (marshal_dump, marshal_load): workaround for segv on
      Intel Solaris compiled with Oracle SolarisStudio 12.3.
      Partly revert r38174. [ruby-core:52042] [Bug #7805]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/marshal.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40256)
+++ ruby_2_0_0/ChangeLog	(revision 40257)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Apr 12 04:16:30 2013  Naohisa Goto  <ngotogenome@g...>
+
+	* marshal.c (marshal_dump, marshal_load): workaround for segv on
+	  Intel Solaris compiled with Oracle SolarisStudio 12.3.
+	  Partly revert r38174. [ruby-core:52042] [Bug #7805]
+
 Fri Apr 12 04:12:42 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_conv_enc_opts): convert with one converter, instead
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40256)
+++ ruby_2_0_0/version.h	(revision 40257)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-12"
-#define RUBY_PATCHLEVEL 118
+#define RUBY_PATCHLEVEL 119
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_0_0/marshal.c
===================================================================
--- ruby_2_0_0/marshal.c	(revision 40256)
+++ ruby_2_0_0/marshal.c	(revision 40257)
@@ -925,7 +925,7 @@ marshal_dump(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/marshal.c#L925
     VALUE obj, port, a1, a2;
     int limit = -1;
     struct dump_arg *arg;
-    VALUE wrapper;
+    volatile VALUE wrapper;
 
     port = Qnil;
     rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
@@ -1909,7 +1909,7 @@ marshal_load(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/marshal.c#L1909
     VALUE port, proc;
     int major, minor, infection = 0;
     VALUE v;
-    VALUE wrapper;
+    volatile VALUE wrapper;
     struct load_arg *arg;
 
     rb_scan_args(argc, argv, "11", &port, &proc);

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39860


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