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 abd8162..51b3560 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -37,7 +37,7 @@ 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"
+rev = "e30d0a0866fe66d352eb09eb7f9e9466dc649172"
 
 # 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>;