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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b38226f92..4412e72e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jun 30 19:35:31 2017  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): fix for nested
diff --git a/class.c b/class.c
index 31b83137d4..cb69ffe2b3 100644
--- a/class.c
+++ b/class.c
@@ -549,6 +549,7 @@ Init_class_hierarchy(void)
 {
     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);
 
diff --git a/version.h b/version.h
index 459ba402f1..9e525d30b4 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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