From f1cae09ec42bebfaedd6d65131a43163a3225f1f Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 10 Jun 2016 07:01:10 +0000 Subject: [PATCH] merge revision(s) 55063: [Backport #12391] * thread.c (recursive_list_access): a object id may be a Bignum. so, the list must be a objhash, instead of a identhash. this fixes many test errors on mswin64 CI. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ thread.c | 2 +- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9480d041a4..6544e6bd8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jun 10 16:00:27 2016 NAKAMURA Usaku + + * thread.c (recursive_list_access): a object id may be a Bignum. so, + the list must be a objhash, instead of a identhash. + this fixes many test errors on mswin64 CI. + Fri Jun 10 15:56:24 2016 Nobuyoshi Nakada * string.c (rb_str_modify_expand): check integer overflow. diff --git a/thread.c b/thread.c index f9869d5d1e..0b89918eea 100644 --- a/thread.c +++ b/thread.c @@ -4714,7 +4714,7 @@ recursive_list_access(VALUE sym) list = rb_hash_aref(hash, sym); } if (NIL_P(list) || !RB_TYPE_P(list, T_HASH)) { - list = rb_ident_hash_new(); + list = rb_hash_new(); rb_hash_aset(hash, sym, list); } return list; diff --git a/version.h b/version.h index 3d3a71cae9..ab21fce89e 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-06-10" -#define RUBY_PATCHLEVEL 328 +#define RUBY_PATCHLEVEL 329 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 6