usa	2016-06-10 16:01:10 +0900 (Fri, 10 Jun 2016)

  New Revision: 55353

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55353

  Log:
    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.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/thread.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/thread.c
===================================================================
--- ruby_2_2/thread.c	(revision 55352)
+++ ruby_2_2/thread.c	(revision 55353)
@@ -4714,7 +4714,7 @@ recursive_list_access(VALUE sym) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/thread.c#L4714
 	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;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55352)
+++ ruby_2_2/version.h	(revision 55353)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55352)
+++ ruby_2_2/ChangeLog	(revision 55353)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Jun 10 16:00:27 2016  NAKAMURA Usaku  <usa@r...>
+
+	* 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  <nobu@r...>
 
 	* string.c (rb_str_modify_expand): check integer overflow.

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55063


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/