From 47b5587514da8d1a9d51004dcf1196282204d978 Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Wed, 10 Jul 2024 05:11:44 +0000
Subject: [PATCH] Update to MMTK core PR #1159

---
 mmtk/Cargo.lock          |  8 ++++----
 mmtk/Cargo.toml          |  2 +-
 mmtk/src/object_model.rs | 11 +----------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index d923e90..1e04a82 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -431,8 +431,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk"
-version = "0.26.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=6cae51c40104d84bb74598ab3eba4f9ef8173e8e#6cae51c40104d84bb74598ab3eba4f9ef8173e8e"
+version = "0.25.0"
+source = "git+https://github.com/qinsoon/mmtk-core.git?rev=6ce0d2ca79e14b64eee321a97c5ae67227f36228#6ce0d2ca79e14b64eee321a97c5ae67227f36228"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -466,8 +466,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk-macros"
-version = "0.26.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=6cae51c40104d84bb74598ab3eba4f9ef8173e8e#6cae51c40104d84bb74598ab3eba4f9ef8173e8e"
+version = "0.25.0"
+source = "git+https://github.com/qinsoon/mmtk-core.git?rev=6ce0d2ca79e14b64eee321a97c5ae67227f36228#6ce0d2ca79e14b64eee321a97c5ae67227f36228"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 8904734..20d3f43 100644
--- 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
index e540ea3..47b4a65 100644
--- 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!()