diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 07:19:49 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 07:19:49 +0000 |
commit | 6e103e8412aff67cfbe877afb25d966ab6eaf09c (patch) | |
tree | 45cc251ed6f7fcef21d73b7fc63dc7c8b6ae9555 | |
parent | 468854406c57b319c0067c8582900d76fd514e28 (diff) |
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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | array.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Oct 15 16:19:39 2014 Eric Wong <e@80x24.org> + + * 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 <nobu@ruby-lang.org> * dir.c (dir_s_aref): fix rdoc. `Dir.glob` allows an array but @@ -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)); @@ -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 |