Update to MMTK core PR #1159 (backport #160) (#161)

<hr>This is an automatic backport of pull request #160 done by [Mergify](https://mergify.com). --------- Co-authored-by: Yi Lin <[email protected]>
mmtk · Jul 24, 2024 · 6e3eb37 · 6e3eb37
1 parent 6a28736
commit 6e3eb37
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -31,7 +31,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 = "56b2521d2b99848ee0613a0a5288fe6d81b754ba" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a3a72f8e5795678eff06fdc1524f0b429a62ccc0" }
 # Uncomment the following to build locally
 # mmtk = { path = "../../mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

diff --git a/mmtk/src/julia_finalizer.rs b/mmtk/src/julia_finalizer.rs
@@ -111,10 +111,10 @@ impl ArrayListT {
     }
 }
 
-fn gc_ptr_clear_tag(addr: Address, tag: usize) -> ObjectReference {
+fn gc_ptr_clear_tag(addr: Address, tag: usize) -> Address {
     let addr = unsafe { Address::from_usize(addr & !tag) };
     debug_assert!(!addr.is_zero());
-    unsafe { ObjectReference::from_raw_address_unchecked(addr) }
+    addr
 }
 
 pub fn gc_ptr_tag(addr: Address, tag: usize) -> bool {
@@ -138,7 +138,7 @@ fn sweep_finalizer_list(
     let mut j = 0;
     while i < list.len {
         let v0: Address = list.get(i);
-        let v = gc_ptr_clear_tag(v0, 3);
+        let v = unsafe { ObjectReference::from_raw_address_unchecked(gc_ptr_clear_tag(v0, 3)) };
         if v0.is_zero() {
             i += 2;
             // remove from this list
@@ -204,21 +204,21 @@ fn mark_finlist<T: ObjectTracer>(list: &mut ArrayListT, start: usize, tracer: &m
             continue;
         }
 
-        let new_obj = if gc_ptr_tag(cur, 1) {
+        let new_obj_addr = if gc_ptr_tag(cur, 1) {
             // Skip next
             i += 1;
             debug_assert!(i < list.len);
             cur_tag = 1;
             gc_ptr_clear_tag(cur, 1)
         } else {
-            // unsafe: We checked `cur.is_zero()` before.
-            unsafe { ObjectReference::from_raw_address_unchecked(cur) }
+            cur
         };
         if gc_ptr_tag(cur, 2) {
             i += 1;
             continue;
         }
 
+        let new_obj = unsafe { ObjectReference::from_raw_address_unchecked(new_obj_addr) };
         let traced = tracer.trace_object(new_obj);
         // if object has moved, update the list applying the tag
         list.set(cur_i, unsafe {

diff --git a/mmtk/src/object_model.rs b/mmtk/src/object_model.rs
@@ -156,23 +156,13 @@ impl ObjectModel<JuliaVM> for VMObjectModel {
         res
     }
 
-    #[inline(always)]
-    fn ref_to_address(object: ObjectReference) -> Address {
-        object.to_raw_address()
-    }
-
-    #[inline(always)]
-    fn address_to_ref(address: Address) -> ObjectReference {
-        // `address` is a result of `ref_to_address(object)`, where `object` cannot be NULL.
-        debug_assert!(!address.is_zero());
-        unsafe { ObjectReference::from_raw_address_unchecked(address) }
-    }
-
     #[inline(always)]
     fn ref_to_header(object: ObjectReference) -> Address {
         object.to_raw_address()
     }
 
+    const IN_OBJECT_ADDRESS_OFFSET: isize = 0;
+
     fn dump_object(_object: ObjectReference) {
         unimplemented!()
     }