Remove CollectRoots

Author: wks

src/plan/lxr/gc_work/mod.rs

@@ -1,9 +1,10 @@
 use super::global::LXR;
+use crate::plan::lxr::gc_work::rc::{ProcessIncs, EDGE_KIND_ROOT};
 use crate::plan::tracing::UnsupportedTrace;
 use crate::scheduler::gc_work::RootKind;
 use crate::util::ObjectReference;
 use crate::vm::{RootsWorkFactory, VMBinding};
-use crate::MMTK;
+use crate::{Plan, MMTK};
 use std::marker::PhantomData;
 
 pub mod mature_evac;
@@ -13,8 +14,6 @@ pub mod prepare;
 pub mod rc;
 pub mod tracing;
 
-use rc::CollectRoots;
-
 /// The [`crate::scheduler::GCWorkContext`] for LXR.
 ///
 /// LXR does not use the generic `Trace`-based closures. Instead it schedules its own custom work
@@ -55,8 +54,10 @@ impl<VM: VMBinding> LXRRootsWorkFactory<VM> {
 
 impl<VM: VMBinding> RootsWorkFactory<VM::VMSlot> for LXRRootsWorkFactory<VM> {
     fn create_process_roots_work_with_root_kind(&mut self, slots: Vec<VM::VMSlot>, kind: RootKind) {
-        let stage = self.mmtk.get_plan().root_scanning_stage();
-        let w = CollectRoots::new(slots, kind);
+        let lxr = self.mmtk.get_plan().downcast_ref::<LXR<VM>>().unwrap();
+        let stage = lxr.root_scanning_stage();
+        let mut w = ProcessIncs::<_, EDGE_KIND_ROOT>::new(slots, lxr);
+        w.root_kind = Some(kind);
         crate::memory_manager::add_work_packet(self.mmtk, stage, w);
     }
 

src/plan/lxr/gc_work/rc.rs

@@ -729,26 +729,3 @@ impl<VM: VMBinding> GCWork<VM> for ProcessDecs<VM> {
         self.flush(worker);
     }
 }
-
-pub struct CollectRoots<VM: VMBinding> {
-    slots: Vec<VM::VMSlot>,
-    root_kind: RootKind,
-}
-
-impl<VM: VMBinding> CollectRoots<VM> {
-    pub fn new(slots: Vec<VM::VMSlot>, root_kind: RootKind) -> Self {
-        Self { slots, root_kind }
-    }
-}
-
-impl<VM: VMBinding> GCWork<VM> for CollectRoots<VM> {
-    fn do_work(&mut self, worker: &mut GCWorker<VM>, mmtk: &'static MMTK<VM>) {
-        if !self.slots.is_empty() {
-            let lxr = mmtk.get_plan().downcast_ref::<LXR<VM>>().unwrap();
-            let roots = std::mem::take(&mut self.slots);
-            let mut w = ProcessIncs::<_, EDGE_KIND_ROOT>::new(roots, lxr);
-            w.root_kind = Some(self.root_kind);
-            GCWork::do_work(&mut w, worker, mmtk)
-        }
-    }
-}