From a5eb0283e890616bb2a327328fc71f27a09ccb72 Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Wed, 7 Jan 2026 23:37:18 +0000
Subject: [PATCH 1/2] Move to Rust 1.92

---
 mmtk/Cargo.toml     | 4 ++--
 mmtk/rust-toolchain | 2 +-
 mmtk/src/abi.rs     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index abd8162..0d44a31 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -36,8 +36,8 @@ probe = "0.5"
 features = ["is_mmtk_object", "object_pinning", "sticky_immix_non_moving_nursery"]
 
 # Uncomment the following lines to use mmtk-core from the official repository.
-git = "https://github.com/mmtk/mmtk-core.git"
-rev = "2ad6d36ab3d82be46135a7d76d4fe59cc84620ed"
+git = "https://github.com/qinsoon/mmtk-core.git"
+rev = "d7a06ced02c588c58a7f6064d474e5de8826f948"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"
diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain
index 6b4de0a..7f229af 100644
--- a/mmtk/rust-toolchain
+++ b/mmtk/rust-toolchain
@@ -1 +1 @@
-1.83.0
+1.92.0
diff --git a/mmtk/src/abi.rs b/mmtk/src/abi.rs
index f562180..15fad3e 100644
--- a/mmtk/src/abi.rs
+++ b/mmtk/src/abi.rs
@@ -182,7 +182,7 @@ impl ObjectClosure {
         F2: 'env + FnOnce() -> T,
     {
         debug_assert!(
-            self.c_function == THE_UNREGISTERED_CLOSURE_FUNC,
+            std::ptr::fn_addr_eq(self.c_function, THE_UNREGISTERED_CLOSURE_FUNC),
             "set_temporarily_and_run_code is recursively called."
         );
         self.c_function = Self::c_function_registered::<F1>;

From f1c084d49a5202fa7450e486f381a0924f679d83 Mon Sep 17 00:00:00 2001
From: mmtkgc-bot <mmtkgc.bot@gmail.com>
Date: Fri, 9 Jan 2026 04:05:35 +0000
Subject: [PATCH 2/2] Update mmtk-core to
 e30d0a0866fe66d352eb09eb7f9e9466dc649172

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

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index b5aec5b..af8ccf7 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -491,7 +491,7 @@ dependencies = [
 [[package]]
 name = "mmtk"
 version = "0.31.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=2ad6d36ab3d82be46135a7d76d4fe59cc84620ed#2ad6d36ab3d82be46135a7d76d4fe59cc84620ed"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=e30d0a0866fe66d352eb09eb7f9e9466dc649172#e30d0a0866fe66d352eb09eb7f9e9466dc649172"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -505,7 +505,6 @@ dependencies = [
  "downcast-rs",
  "enum-map",
  "env_logger",
- "idna_adapter",
  "is-terminal",
  "itertools",
  "lazy_static",
@@ -530,7 +529,7 @@ dependencies = [
 [[package]]
 name = "mmtk-macros"
 version = "0.31.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=2ad6d36ab3d82be46135a7d76d4fe59cc84620ed#2ad6d36ab3d82be46135a7d76d4fe59cc84620ed"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=e30d0a0866fe66d352eb09eb7f9e9466dc649172#e30d0a0866fe66d352eb09eb7f9e9466dc649172"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 0d44a31..51b3560 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -36,8 +36,8 @@ probe = "0.5"
 features = ["is_mmtk_object", "object_pinning", "sticky_immix_non_moving_nursery"]
 
 # Uncomment the following lines to use mmtk-core from the official repository.
-git = "https://github.com/qinsoon/mmtk-core.git"
-rev = "d7a06ced02c588c58a7f6064d474e5de8826f948"
+git = "https://github.com/mmtk/mmtk-core.git"
+rev = "e30d0a0866fe66d352eb09eb7f9e9466dc649172"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"