Create separate work packet types for object tracing from mod buf

src/plan/generational/barrier.rs

@@ -10,9 +10,7 @@ use crate::vm::edge_shape::MemorySlice;
 use crate::vm::VMBinding;
 use crate::MMTK;
 
-use super::gc_work::GenNurseryProcessEdges;
-use super::gc_work::ProcessModBuf;
-use super::gc_work::ProcessRegionModBuf;
+use super::gc_work::*;
 use super::global::GenerationalPlanExt;
 
 pub struct GenObjectBarrierSemantics<
@@ -45,7 +43,7 @@ impl<VM: VMBinding, P: GenerationalPlanExt<VM> + PlanTraceObject<VM>>
         let buf = self.modbuf.take();
         if !buf.is_empty() {
             self.mmtk.scheduler.work_buckets[WorkBucketStage::Closure]
-                .add(ProcessModBuf::<GenNurseryProcessEdges<VM, P>>::new(buf));
+                .add(ProcessModBuf::<GenNurseryProcessEdgesFromModBuf<VM, P>>::new(buf));
         }
     }
 
@@ -54,7 +52,7 @@ impl<VM: VMBinding, P: GenerationalPlanExt<VM> + PlanTraceObject<VM>>
         if !buf.is_empty() {
             debug_assert!(!buf.is_empty());
             self.mmtk.scheduler.work_buckets[WorkBucketStage::Closure].add(ProcessRegionModBuf::<
-                GenNurseryProcessEdges<VM, P>,
+                GenNurseryProcessEdgesFromRegionModBuf<VM, P>,
             >::new(buf));
         }
     }

src/plan/generational/gc_work.rs

@@ -79,6 +79,57 @@ impl<VM: VMBinding, P: GenerationalPlanExt<VM> + PlanTraceObject<VM>> DerefMut
     }
 }
 
+macro_rules! wrap_nursery_process_edges_as_new_type {
+    ($ty_name: ident) => {
+        pub struct $ty_name<VM: VMBinding, P: GenerationalPlanExt<VM> + PlanTraceObject<VM>>(
+            GenNurseryProcessEdges<VM, P>,
+        );
+        impl<VM: VMBinding, P: GenerationalPlanExt<VM> + PlanTraceObject<VM>> ProcessEdgesWork
+            for $ty_name<VM, P>
+        {
+            type VM = <GenNurseryProcessEdges<VM, P> as ProcessEdgesWork>::VM;
+            type ScanObjectsWorkType =
+                <GenNurseryProcessEdges<VM, P> as ProcessEdgesWork>::ScanObjectsWorkType;
+            fn new(
+                edges: Vec<EdgeOf<Self>>,
+                roots: bool,
+                mmtk: &'static MMTK<VM>,
+                bucket: WorkBucketStage,
+            ) -> Self {
+                Self(GenNurseryProcessEdges::new(edges, roots, mmtk, bucket))
+            }
+            fn trace_object(&mut self, object: ObjectReference) -> ObjectReference {
+                self.0.trace_object(object)
+            }
+            fn process_edge(&mut self, slot: EdgeOf<Self>) {
+                self.0.process_edge(slot)
+            }
+
+            fn create_scan_work(&self, nodes: Vec<ObjectReference>) -> Self::ScanObjectsWorkType {
+                self.0.create_scan_work(nodes)
+            }
+        }
+        impl<VM: VMBinding, P: GenerationalPlanExt<VM> + PlanTraceObject<VM>> Deref
+            for $ty_name<VM, P>
+        {
+            type Target = ProcessEdgesBase<VM>;
+            fn deref(&self) -> &Self::Target {
+                self.0.deref()
+            }
+        }
+        impl<VM: VMBinding, P: GenerationalPlanExt<VM> + PlanTraceObject<VM>> DerefMut
+            for $ty_name<VM, P>
+        {
+            fn deref_mut(&mut self) -> &mut Self::Target {
+                self.0.deref_mut()
+            }
+        }
+    };
+}
+
+wrap_nursery_process_edges_as_new_type!(GenNurseryProcessEdgesFromModBuf);
+wrap_nursery_process_edges_as_new_type!(GenNurseryProcessEdgesFromRegionModBuf);
+
 /// The modbuf contains a list of objects in mature space(s) that
 /// may contain pointers to the nursery space.
 /// This work packet scans the recorded objects and forwards pointers if necessary.