From 6e103e8412aff67cfbe877afb25d966ab6eaf09c Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 15 Oct 2014 07:19:49 +0000 Subject: [PATCH] merge revision(s) 47896: [Backport #10369] * array.c (ary_recycle_hash): add RB_GC_GUARD (rb_ary_diff): remove volatile [Bug #10369] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ array.c | 3 ++- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee7d69a04f..9ead0498ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Oct 15 16:19:39 2014 Eric Wong + + * array.c (ary_recycle_hash): add RB_GC_GUARD + (rb_ary_diff): remove volatile + [Bug #10369] + Wed Oct 15 16:13:28 2014 Nobuyoshi Nakada * dir.c (dir_s_aref): fix rdoc. `Dir.glob` allows an array but diff --git a/array.c b/array.c index 57999fbd97..54d3d763e0 100644 --- a/array.c +++ b/array.c @@ -3781,6 +3781,7 @@ ary_recycle_hash(VALUE hash) RHASH(hash)->ntbl = 0; st_free_table(tbl); } + RB_GC_GUARD(hash); } /* @@ -3804,7 +3805,7 @@ static VALUE rb_ary_diff(VALUE ary1, VALUE ary2) { VALUE ary3; - volatile VALUE hash; + VALUE hash; long i; hash = ary_make_hash(to_ary(ary2)); diff --git a/version.h b/version.h index 473eeb0ac4..b04f9832e3 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-10-15" -#define RUBY_PATCHLEVEL 583 +#define RUBY_PATCHLEVEL 584 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 10