From 82b8467e23757a01805698bf0e982fa3b93d9310 Mon Sep 17 00:00:00 2001 From: ngoto Date: Thu, 21 Mar 2013 13:50:20 +0000 Subject: [PATCH] * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ marshal.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6407da1ae1..f7a4e7c982 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 21 22:39:46 2013 Naohisa Goto + + * 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 * parse.y (simple_re_meta): escape all closing characters, not only diff --git a/marshal.c b/marshal.c index 9ec1f9400f..304e9d0a6b 100644 --- a/marshal.c +++ b/marshal.c @@ -925,7 +925,7 @@ marshal_dump(int argc, VALUE *argv) 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) 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);