Include yjit roots

Yjit roots are recently added.  We add a new function for MMTk, too.

Also reordered the root scanning functions in the upcall table.

Author: wks

Diff for: gc.c

@@ -2516,6 +2516,18 @@ rb_mmtk_scan_global_tbl_roots(void)
 {
     rb_gc_mark_global_tbl();
 }
+
+void
+rb_mmtk_scan_yjit_roots(void)
+{
+#if USE_YJIT
+    void rb_yjit_root_mark(void); // in Rust
+
+    if (rb_yjit_enabled_p) {
+        rb_yjit_root_mark();
+    }
+#endif
+}
 #endif
 
 void

Diff for: gc/default.c

@@ -3701,26 +3701,6 @@ rb_gc_impl_shutdown_call_finalizer(void *objspace_ptr)
     RUBY_ATOMIC_SET(finalizing, 0);
 }
 
-#if USE_MMTK
-/* Mark all final jobs. */
-static void
-rb_mmtk_mark_final_jobs(void)
-{
-    rb_vm_t *vm = GET_VM();
-
-    struct MMTk_FinalJob *cur_job = (struct MMTk_FinalJob*)vm->objspace->heap_pages.deferred_final;
-    while (cur_job != NULL) {
-        if (cur_job->kind == MMTK_FJOB_FINALIZE) {
-            // The finalizer array is a proper MMTk heap object, and needs to be kept alive.
-            // We treat it as a root.  Currently we pin all roots.
-            rb_gc_mark(cur_job->as.finalize.finalizer_array);
-        }
-
-        cur_job = cur_job->next;
-    }
-}
-#endif
-
 void
 rb_gc_impl_each_object(void *objspace_ptr, void (*func)(VALUE obj, void *data), void *data)
 {
@@ -5330,6 +5310,26 @@ rb_mmtk_scan_misc_roots(void)
 
     if (stress_to_class) rb_gc_mark(stress_to_class);
 }
+
+// When using MMTk, final jobs are roots, too.
+// Specifically, finalizer jobs contain pointers to finalizer arrays
+// which are allocated in the heap.
+void
+rb_mmtk_scan_final_jobs_roots(void)
+{
+    rb_vm_t *vm = GET_VM();
+
+    struct MMTk_FinalJob *cur_job = (struct MMTk_FinalJob*)vm->objspace->heap_pages.deferred_final;
+    while (cur_job != NULL) {
+        if (cur_job->kind == MMTK_FJOB_FINALIZE) {
+            // The finalizer array is a proper MMTk heap object, and needs to be kept alive.
+            // We treat it as a root.  Currently we pin all roots.
+            rb_gc_mark(cur_job->as.finalize.finalizer_array);
+        }
+
+        cur_job = cur_job->next;
+    }
+}
 #endif
 
 static inline void
@@ -10576,12 +10576,6 @@ rb_mmtk_get_ci_table(void)
 /////////////// END: Global table updating ////////////////
 
 // Workaround private functions
-void
-rb_mmtk_scan_final_jobs_roots(void)
-{
-    rb_mmtk_mark_final_jobs();
-}
-
 void
 rb_mmtk_mark_children(VALUE obj)
 {

Diff for: internal/gc.h

@@ -221,9 +221,10 @@ void rb_gc_initial_stress_set(VALUE flag);
 
 #if USE_MMTK
 void rb_mmtk_scan_vm_roots(void);
-void rb_mmtk_scan_finalizer_tbl_roots(void);
 void rb_mmtk_scan_end_proc_roots(void);
 void rb_mmtk_scan_global_tbl_roots(void);
+void rb_mmtk_scan_yjit_roots(void);
+void rb_mmtk_scan_finalizer_tbl_roots(void);
 void rb_mmtk_scan_obj_to_id_tbl_roots(void);
 void rb_mmtk_scan_misc_roots(void);
 void rb_mmtk_scan_final_jobs_roots(void);

Diff for: internal/mmtk.h

@@ -65,9 +65,10 @@ typedef struct MMTk_RubyUpcalls {
     size_t (*number_of_mutators)(void);
     void (*get_mutators)(void (*visit_mutator)(MMTk_Mutator*, void*), void *data);
     void (*scan_vm_roots)(void);
-    void (*scan_finalizer_tbl_roots)(void);
     void (*scan_end_proc_roots)(void);
     void (*scan_global_tbl_roots)(void);
+    void (*scan_yjit_roots)(void);
+    void (*scan_finalizer_tbl_roots)(void);
     void (*scan_obj_to_id_tbl_roots)(void);
     void (*scan_misc_roots)(void);
     void (*scan_final_jobs_roots)(void);

Diff for: mmtk_support.c

@@ -1624,9 +1624,10 @@ MMTk_RubyUpcalls ruby_upcalls = {
     rb_mmtk_number_of_mutators,
     rb_mmtk_get_mutators,
     rb_mmtk_scan_vm_roots,
-    rb_mmtk_scan_finalizer_tbl_roots,
     rb_mmtk_scan_end_proc_roots,
     rb_mmtk_scan_global_tbl_roots,
+    rb_mmtk_scan_yjit_roots,
+    rb_mmtk_scan_finalizer_tbl_roots,
     rb_mmtk_scan_obj_to_id_tbl_roots,
     rb_mmtk_scan_misc_roots,
     rb_mmtk_scan_final_jobs_roots,