From f57485546264f73942cd210dd91feedaa961539f Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Wed, 10 Jul 2024 05:19:54 +0000
Subject: [PATCH 1/2] Update to MMTK core PR #1159

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

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index a46bb88..e338946 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -425,7 +425,7 @@ dependencies = [
 [[package]]
 name = "mmtk"
 version = "0.25.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=56b2521d2b99848ee0613a0a5288fe6d81b754ba#56b2521d2b99848ee0613a0a5288fe6d81b754ba"
+source = "git+https://github.com/qinsoon/mmtk-core.git?rev=6ce0d2ca79e14b64eee321a97c5ae67227f36228#6ce0d2ca79e14b64eee321a97c5ae67227f36228"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -460,7 +460,7 @@ dependencies = [
 [[package]]
 name = "mmtk-macros"
 version = "0.25.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=56b2521d2b99848ee0613a0a5288fe6d81b754ba#56b2521d2b99848ee0613a0a5288fe6d81b754ba"
+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 11a771a..d399259 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -27,7 +27,7 @@ log = "*"
 # - 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/qinsoon/mmtk-core.git", rev = "6ce0d2ca79e14b64eee321a97c5ae67227f36228" }
 # Uncomment the following and fix the path to mmtk-core to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 
diff --git a/mmtk/src/object_model.rs b/mmtk/src/object_model.rs
index dda1026..643a48d 100644
--- a/mmtk/src/object_model.rs
+++ b/mmtk/src/object_model.rs
@@ -64,14 +64,7 @@ impl ObjectModel<V8> for VMObjectModel {
         object.to_raw_address()
     }
 
-    fn ref_to_address(object: ObjectReference) -> Address {
-        object.to_raw_address()
-    }
-
-    fn address_to_ref(address: Address) -> ObjectReference {
-        debug_assert!(!address.is_zero());
-        unsafe { ObjectReference::from_raw_address_unchecked(address) }
-    }
+    const IN_OBJECT_ADDRESS_OFFSET: isize = 0;
 
     fn dump_object(object: ObjectReference) {
         unsafe {

From 70aad1bf312d5fea2fdd83ebcfd8c8f3e8410dc5 Mon Sep 17 00:00:00 2001
From: mmtkgc-bot <mmtkgc.bot@gmail.com>
Date: Thu, 11 Jul 2024 07:02:14 +0000
Subject: [PATCH 2/2] Update mmtk-core to
 a3a72f8e5795678eff06fdc1524f0b429a62ccc0

---
 mmtk/Cargo.lock | 8 ++++----
 mmtk/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index e338946..e1e7d10 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -424,8 +424,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk"
-version = "0.25.0"
-source = "git+https://github.com/qinsoon/mmtk-core.git?rev=6ce0d2ca79e14b64eee321a97c5ae67227f36228#6ce0d2ca79e14b64eee321a97c5ae67227f36228"
+version = "0.26.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=a3a72f8e5795678eff06fdc1524f0b429a62ccc0#a3a72f8e5795678eff06fdc1524f0b429a62ccc0"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -459,8 +459,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk-macros"
-version = "0.25.0"
-source = "git+https://github.com/qinsoon/mmtk-core.git?rev=6ce0d2ca79e14b64eee321a97c5ae67227f36228#6ce0d2ca79e14b64eee321a97c5ae67227f36228"
+version = "0.26.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=a3a72f8e5795678eff06fdc1524f0b429a62ccc0#a3a72f8e5795678eff06fdc1524f0b429a62ccc0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index d399259..f31b25f 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -27,7 +27,7 @@ log = "*"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "6ce0d2ca79e14b64eee321a97c5ae67227f36228" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a3a72f8e5795678eff06fdc1524f0b429a62ccc0" }
 # Uncomment the following and fix the path to mmtk-core to build locally
 # mmtk = { path = "../repos/mmtk-core" }