1 files changed, 6 insertions, 5 deletions

diff --git a/gc.c b/gc.c
index 7d2a56f008..e4d8c1c9e1 100644
--- a/gc.c
+++ b/gc.c
@@ -535,7 +535,6 @@ VALUE *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
 
 int ruby_gc_debug_indent = 0;
 VALUE rb_mGC;
-extern st_table *rb_class_tbl;
 int ruby_disable_gc_stress = 0;
 
 void rb_gcdebug_print_obj_condition(VALUE obj);
@@ -3574,13 +3573,18 @@ gc_marks_body(rb_objspace_t *objspace, int full_mark)
     th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
 
     MARK_CHECKPOINT;
-    mark_tbl(objspace, finalizer_table);
+    rb_gc_mark(rb_cObject);
 
     MARK_CHECKPOINT;
     mark_current_machine_context(objspace, th);
 
     MARK_CHECKPOINT;
+    mark_tbl(objspace, finalizer_table);
+
+    MARK_CHECKPOINT;
+    objspace->rgengc.parent_object_is_promoted = TRUE;
     rb_gc_mark_symbols(full_mark);
+    objspace->rgengc.parent_object_is_promoted = FALSE;
 
     MARK_CHECKPOINT;
     rb_gc_mark_encodings();
@@ -3597,9 +3601,6 @@ gc_marks_body(rb_objspace_t *objspace, int full_mark)
     MARK_CHECKPOINT;
     rb_gc_mark_global_tbl();
 
-    MARK_CHECKPOINT;
-    mark_tbl(objspace, rb_class_tbl);
-
     /* mark generic instance variables for special constants */
     MARK_CHECKPOINT;
     rb_mark_generic_ivar_tbl();