Update ObjectModel::copy() (#128)

Author: qinsoon

mmtk/Cargo.toml

@@ -20,7 +20,7 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "5c4e9eae2c72651137ab0b51c9365256314901d2" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ad95d7797f020eaab1e608dc03b7db6a3d79839a" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/src/object_model.rs

@@ -3,11 +3,10 @@ use std::sync::atomic::Ordering;
 use super::UPCALLS;
 use crate::{vm_metadata, OpenJDK};
 use mmtk::util::alloc::fill_alignment_gap;
+use mmtk::util::copy::*;
 use mmtk::util::metadata::header_metadata::HeaderMetadataSpec;
 use mmtk::util::{Address, ObjectReference};
 use mmtk::vm::*;
-use mmtk::AllocationSemantics;
-use mmtk::CopyContext;
 
 pub struct VMObjectModel {}
 
@@ -87,19 +86,18 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
     #[inline]
     fn copy(
         from: ObjectReference,
-        allocator: AllocationSemantics,
-        copy_context: &mut impl CopyContext,
+        copy: CopySemantics,
+        copy_context: &mut GCWorkerCopyContext<OpenJDK>,
     ) -> ObjectReference {
         let bytes = unsafe { ((*UPCALLS).get_object_size)(from) };
-        let dst =
-            copy_context.alloc_copy(from, bytes, ::std::mem::size_of::<usize>(), 0, allocator);
+        let dst = copy_context.alloc_copy(from, bytes, ::std::mem::size_of::<usize>(), 0, copy);
         // Copy
         let src = from.to_address();
         for i in 0..bytes {
             unsafe { (dst + i).store((src + i).load::<u8>()) };
         }
         let to_obj = unsafe { dst.to_object_reference() };
-        copy_context.post_copy(to_obj, unsafe { Address::zero() }, bytes, allocator);
+        copy_context.post_copy(to_obj, bytes, copy);
         to_obj
     }