From 40ceb61da12ff4939dbf851fbb3ba2ff7bbc30e7 Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Mon, 28 Sep 2026 22:20:54 +0000
Subject: [PATCH 1/2] Update to mmtk-core PR #1602

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

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index 22537a7..aaf6e2e 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -483,7 +483,7 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 [[package]]
 name = "mmtk"
 version = "0.33.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=2feeaccb130d95376e248b0aee6bf8f83c56f0ea#2feeaccb130d95376e248b0aee6bf8f83c56f0ea"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=243b4221574b01cbe380add6f25ca9ed2815038a#243b4221574b01cbe380add6f25ca9ed2815038a"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -513,12 +513,13 @@ dependencies = [
  "strum",
  "strum_macros",
  "sysinfo",
+ "yoke-derive",
 ]
 
 [[package]]
 name = "mmtk-macros"
 version = "0.33.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=2feeaccb130d95376e248b0aee6bf8f83c56f0ea#2feeaccb130d95376e248b0aee6bf8f83c56f0ea"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=243b4221574b01cbe380add6f25ca9ed2815038a#243b4221574b01cbe380add6f25ca9ed2815038a"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -821,6 +822,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.36.1"
@@ -1026,3 +1038,15 @@ checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
 dependencies = [
  "windows-link 0.1.3",
 ]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "synstructure",
+]
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 520cdea..f9bda66 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -33,11 +33,11 @@ atomic_refcell = "0.1.9"
 probe = "0.5"
 
 [dependencies.mmtk]
-features = ["vo_bit", "object_pinning", "sticky_immix_non_moving_nursery"]
+features = ["vo_bit", "object_pinning", "sticky_immix_non_moving_nursery", "non_moving_root"]
 
 # Uncomment the following lines to use mmtk-core from the official repository.
 git = "https://github.com/mmtk/mmtk-core.git"
-rev = "2feeaccb130d95376e248b0aee6bf8f83c56f0ea"
+rev = "243b4221574b01cbe380add6f25ca9ed2815038a"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"

From 09f28e321688d510be113d040163fb1ca5249d42 Mon Sep 17 00:00:00 2001
From: mmtkgc-bot <mmtkgc.bot@gmail.com>
Date: Mon, 12 Oct 2026 08:39:08 +0000
Subject: [PATCH 2/2] Update mmtk-core to
 5025c5c6677ccfe6f15be58dab96032e7e78316b

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

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index aaf6e2e..f12371f 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -483,7 +483,7 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 [[package]]
 name = "mmtk"
 version = "0.33.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=243b4221574b01cbe380add6f25ca9ed2815038a#243b4221574b01cbe380add6f25ca9ed2815038a"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=5025c5c6677ccfe6f15be58dab96032e7e78316b#5025c5c6677ccfe6f15be58dab96032e7e78316b"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -519,7 +519,7 @@ dependencies = [
 [[package]]
 name = "mmtk-macros"
 version = "0.33.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=243b4221574b01cbe380add6f25ca9ed2815038a#243b4221574b01cbe380add6f25ca9ed2815038a"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=5025c5c6677ccfe6f15be58dab96032e7e78316b#5025c5c6677ccfe6f15be58dab96032e7e78316b"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index f9bda66..ccd4065 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -37,7 +37,7 @@ features = ["vo_bit", "object_pinning", "sticky_immix_non_moving_nursery", "non_
 
 # Uncomment the following lines to use mmtk-core from the official repository.
 git = "https://github.com/mmtk/mmtk-core.git"
-rev = "243b4221574b01cbe380add6f25ca9ed2815038a"
+rev = "5025c5c6677ccfe6f15be58dab96032e7e78316b"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"