ngoto	2013-03-21 22:50:20 +0900 (Thu, 21 Mar 2013)

  New Revision: 39860

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

  Log:
    * 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 files:
    trunk/ChangeLog
    trunk/marshal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39859)
+++ ChangeLog	(revision 39860)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Mar 21 22:39:46 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]
+
 Thu Mar 21 16:48:06 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (simple_re_meta): escape all closing characters, not only
Index: marshal.c
===================================================================
--- marshal.c	(revision 39859)
+++ marshal.c	(revision 39860)
@@ -925,7 +925,7 @@ marshal_dump(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/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);
@@ -1929,7 +1929,7 @@ marshal_load(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/marshal.c#L1929
     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);

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