nagachika	2016-06-12 02:35:34 +0900 (Sun, 12 Jun 2016)

  New Revision: 55383

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

  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_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/thread.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55382)
+++ ruby_2_3/ChangeLog	(revision 55383)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun Jun 12 02:27:07 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.
+
 Sun Jun 12 01:59:33 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (new_if_gen): set newline flag to NODE_IF to trace all
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55382)
+++ ruby_2_3/version.h	(revision 55383)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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
Index: ruby_2_3/thread.c
===================================================================
--- ruby_2_3/thread.c	(revision 55382)
+++ ruby_2_3/thread.c	(revision 55383)
@@ -4306,7 +4306,7 @@ recursive_list_access(VALUE sym) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread.c#L4306
 	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;

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


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