usa	2017-06-30 19:36:04 +0900 (Fri, 30 Jun 2017)

  New Revision: 59215

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

  Log:
    merge revision(s) 55429: [Backport #12492]
    
    * class.c (Init_class_hierarchy): prevent rb_cObject which is the
      class tree root, from GC.  [ruby-dev:49666] [Bug #12492]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/class.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 59214)
+++ ruby_2_3/version.h	(revision 59215)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 311
+#define RUBY_PATCHLEVEL 312
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_3/class.c
===================================================================
--- ruby_2_3/class.c	(revision 59214)
+++ ruby_2_3/class.c	(revision 59215)
@@ -549,6 +549,7 @@ Init_class_hierarchy(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/class.c#L549
 {
     rb_cBasicObject = boot_defclass("BasicObject", 0);
     rb_cObject = boot_defclass("Object", rb_cBasicObject);
+    rb_gc_register_mark_object(rb_cObject);
     rb_cModule = boot_defclass("Module", rb_cObject);
     rb_cClass =  boot_defclass("Class",  rb_cModule);
 
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 59214)
+++ ruby_2_3/ChangeLog	(revision 59215)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Jun 30 19:35:31 2017  Nobuyoshi Nakada  <nobu@r...>
+
+	* class.c (Init_class_hierarchy): prevent rb_cObject which is the class
+	  tree root, from GC. [Bug #12492]
+
+Fri Jun 30 19:32:52 2017  Nobuyoshi Nakada  <nobu@r...>
+
+	* class.c (Init_class_hierarchy): prevent rb_cObject which is the
+	  class tree root, from GC.  [ruby-dev:49666] [Bug #12492]
+
 Fri Jun 30 19:29:45 2017  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): fix for nested
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 59214)
+++ ruby_2_3	(revision 59215)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r55429

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