From e206da0ab874eb76c2f4c6fc2f7874d05d518aed Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 11 Jun 2016 17:35:34 +0000 Subject: 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_3@55383 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 17fd4f6f77..84e93545d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 12 02:27:07 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. + Sun Jun 12 01:59:33 2016 Nobuyoshi Nakada * parse.y (new_if_gen): set newline flag to NODE_IF to trace all diff --git a/thread.c b/thread.c index 4e0340d801..a0e31c5326 100644 --- a/thread.c +++ b/thread.c @@ -4306,7 +4306,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 1236ccdc61..ce44dd3ff7 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.2" #define RUBY_RELEASE_DATE "2016-06-12" -#define RUBY_PATCHLEVEL 121 +#define RUBY_PATCHLEVEL 122 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 6 -- cgit v1.2.3