Update mmtk-core to PR #699 (#186)

Author: qinsoon

mmtk/Cargo.lock

@@ -29,7 +29,7 @@ once_cell = "1.10.0"
 # - 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 = "f82848847a6392537fec6b914d7ad95fbf28b0a2" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "69b4fe46ee4353a2fdeb4911ba914b63a7ffa29a" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/Cargo.toml

@@ -211,7 +211,7 @@ pub extern "C" fn handle_user_collection_request(tls: VMMutatorThread) {
 
 #[no_mangle]
 pub extern "C" fn is_in_mmtk_spaces(object: ObjectReference) -> bool {
-    memory_manager::is_in_mmtk_spaces(object)
+    memory_manager::is_in_mmtk_spaces::<OpenJDK>(object)
 }
 
 #[no_mangle]
@@ -386,7 +386,7 @@ pub extern "C" fn add_finalizer(object: ObjectReference) {
 pub extern "C" fn get_finalized_object() -> ObjectReference {
     match memory_manager::get_finalized_object(&SINGLETON) {
         Some(obj) => obj,
-        None => unsafe { Address::ZERO.to_object_reference() },
+        None => ObjectReference::NULL,
     }
 }
 

mmtk/src/api.rs

@@ -27,9 +27,9 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
         let bytes = unsafe { Oop::from(from).size() };
         let dst = copy_context.alloc_copy(from, bytes, ::std::mem::size_of::<usize>(), 0, copy);
         // Copy
-        let src = from.to_address();
+        let src = from.to_raw_address();
         unsafe { std::ptr::copy_nonoverlapping::<u8>(src.to_ptr(), dst.to_mut_ptr(), bytes) }
-        let to_obj = unsafe { dst.to_object_reference() };
+        let to_obj = ObjectReference::from_raw_address(dst);
         copy_context.post_copy(to_obj, bytes, copy);
         to_obj
     }
@@ -39,22 +39,22 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
         let bytes = unsafe { ((*UPCALLS).get_object_size)(from) };
         if need_copy {
             // copy obj to target
-            let dst = to.to_address();
+            let dst = to.to_raw_address();
             // Copy
-            let src = from.to_address();
+            let src = from.to_raw_address();
             for i in 0..bytes {
                 unsafe { (dst + i).store((src + i).load::<u8>()) };
             }
         }
-        let start = Self::object_start_ref(to);
+        let start = Self::ref_to_object_start(to);
         if region != Address::ZERO {
             fill_alignment_gap::<OpenJDK>(region, start);
         }
         start + bytes
     }
 
     fn get_reference_when_copied_to(_from: ObjectReference, to: Address) -> ObjectReference {
-        unsafe { to.to_object_reference() }
+        ObjectReference::from_raw_address(to)
     }
 
     fn get_current_size(object: ObjectReference) -> usize {
@@ -78,12 +78,24 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
         unimplemented!()
     }
 
-    fn object_start_ref(object: ObjectReference) -> Address {
-        object.to_address()
+    #[inline(always)]
+    fn ref_to_object_start(object: ObjectReference) -> Address {
+        object.to_raw_address()
     }
 
+    #[inline(always)]
     fn ref_to_address(object: ObjectReference) -> Address {
-        object.to_address()
+        object.to_raw_address()
+    }
+
+    #[inline(always)]
+    fn ref_to_header(object: ObjectReference) -> Address {
+        object.to_raw_address()
+    }
+
+    #[inline(always)]
+    fn address_to_ref(address: Address) -> ObjectReference {
+        ObjectReference::from_raw_address(address)
     }
 
     fn dump_object(object: ObjectReference) {