Update to MMTK core PR #1159

mmtk · Jul 10, 2024 · 47b5587 · 47b5587
1 parent 638a9f5
commit 47b5587
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -28,7 +28,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
 # - change branch/rev
 # - 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 = "6cae51c40104d84bb74598ab3eba4f9ef8173e8e" }
+mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "6ce0d2ca79e14b64eee321a97c5ae67227f36228" }
 # Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
 # mmtk = { path = "../repos/mmtk-core" }
 

diff --git a/mmtk/src/object_model.rs b/mmtk/src/object_model.rs
@@ -230,18 +230,9 @@ impl ObjectModel<JikesRVM> for VMObjectModel {
         object.to_raw_address()
     }
 
-    #[inline(always)]
-    fn ref_to_address(object: ObjectReference) -> Address {
-        object.to_raw_address() + TIB_OFFSET
-    }
-
     const OBJECT_REF_OFFSET_LOWER_BOUND: isize = OBJECT_REF_OFFSET;
 
-    #[inline(always)]
-    fn address_to_ref(addr: Address) -> ObjectReference {
-        debug_assert!(!addr.is_zero());
-        unsafe { ObjectReference::from_raw_address_unchecked(addr + (-TIB_OFFSET)) }
-    }
+    const IN_OBJECT_ADDRESS_OFFSET: isize = TIB_OFFSET;
 
     fn dump_object(_object: ObjectReference) {
         unimplemented!()