diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 19:23:02 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 19:23:02 +0000 |
commit | 71208c0284c3162185a8fd141d67e8ead855f3da (patch) | |
tree | b7b1c50c78bdcc5f78f0490a9d3d91ad86dea051 | |
parent | 1392882f35730480d7c89d6ac9193e9e48ae0f79 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | marshal.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Fri Apr 12 04:16:30 2013 Naohisa Goto <ngotogenome@gmail.com> + + * 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@ruby-lang.org> * string.c (rb_str_conv_enc_opts): convert with one converter, instead @@ -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); @@ -1909,7 +1909,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); @@ -1,6 +1,6 @@ #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 |