Merge pull request ruby#59 from wks/tidy-up-mutator-scan-api

wks · web-flow · commit c5538b2b53f7 · 2023-08-09T16:01:24.000+08:00
Remove unused upcalls.
diff --git a/internal/mmtk.h b/internal/mmtk.h
@@ -64,8 +64,8 @@ typedef struct MMTk_RubyUpcalls {
     size_t (*number_of_mutators)(void);
     void (*get_mutators)(void (*visit_mutator)(MMTk_Mutator*, void*), void *data);
     void (*scan_vm_specific_roots)(void);
-    void (*scan_thread_roots)(void);
-    void (*scan_thread_root)(MMTk_VMMutatorThread mutator_tls, MMTk_VMWorkerThread worker_tls);
+    void (*scan_roots_in_mutator_thread)(MMTk_VMMutatorThread mutator_tls,
+                                         MMTk_VMWorkerThread worker_tls);
     void (*scan_object_ruby_style)(MMTk_ObjectReference object);
     void (*call_gc_mark_children)(MMTk_ObjectReference object);
     void (*call_obj_free)(MMTk_ObjectReference object);
diff --git a/mmtk_support.c b/mmtk_support.c
@@ -1512,15 +1512,8 @@ rb_mmtk_scan_vm_specific_roots(void)
     rb_mmtk_mark_roots();
 }
 
-RBIMPL_ATTR_NORETURN()
 static void
-rb_mmtk_scan_thread_roots(void)
-{
-    abort(); // We are not using this function at this time.
-}
-
-static void
-rb_mmtk_scan_thread_root(MMTk_VMMutatorThread mutator, MMTk_VMWorkerThread worker)
+rb_mmtk_scan_roots_in_mutator_thread(MMTk_VMMutatorThread mutator, MMTk_VMWorkerThread worker)
 {
     rb_mmtk_assert_mmtk_worker();
 
@@ -1571,8 +1564,7 @@ MMTk_RubyUpcalls ruby_upcalls = {
     rb_mmtk_number_of_mutators,
     rb_mmtk_get_mutators,
     rb_mmtk_scan_vm_specific_roots,
-    rb_mmtk_scan_thread_roots,
-    rb_mmtk_scan_thread_root,
+    rb_mmtk_scan_roots_in_mutator_thread,
     rb_mmtk_scan_object_ruby_style,
     rb_mmtk_call_gc_mark_children,
     rb_mmtk_call_obj_free,
