From c323d824b54f6d525deb2facfadb84203ea34129 Mon Sep 17 00:00:00 2001
From: Kunshan Wang <wks1986@gmail.com>
Date: Thu, 1 Aug 2024 14:01:24 +0800
Subject: [PATCH] Fix ActivePlan::number_of_mutators

Updated the `ruby` repo revision to fix a bug where the number of
mutators returned from `ActivePlan::number_of_mutators` does not match
the number of mutators returned from `ActivePlan::mutators`.

Also updated the `mmtk-core` repo revision.  More assertions are added
so that such bugs can be detected earlier.

mmtk-core PR: https://github.com/mmtk/mmtk-core/pull/1182
ruby PR: https://github.com/mmtk/ruby/pull/84

Fixes: https://github.com/mmtk/mmtk-ruby/issues/84
---
 mmtk/Cargo.lock | 4 ++--
 mmtk/Cargo.toml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index e2dd50c..a8ae88b 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -431,7 +431,7 @@ dependencies = [
 [[package]]
 name = "mmtk"
 version = "0.26.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=f9b85bca5b1ae530854e09d553f3020edde46cdb#f9b85bca5b1ae530854e09d553f3020edde46cdb"
+source = "git+https://github.com/wks/mmtk-core.git?rev=b4ed92905fb1218692170374cb6ee5b23b239a5e#b4ed92905fb1218692170374cb6ee5b23b239a5e"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -467,7 +467,7 @@ dependencies = [
 [[package]]
 name = "mmtk-macros"
 version = "0.26.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=f9b85bca5b1ae530854e09d553f3020edde46cdb#f9b85bca5b1ae530854e09d553f3020edde46cdb"
+source = "git+https://github.com/wks/mmtk-core.git?rev=b4ed92905fb1218692170374cb6ee5b23b239a5e#b4ed92905fb1218692170374cb6ee5b23b239a5e"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index b04d995..25c6963 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
 # Metadata for the Ruby repository
 [package.metadata.ci-repos.ruby]
 repo = "mmtk/ruby" # This is used by actions/checkout, so the format is "owner/repo", not URL.
-rev = "1d3f79843ef8dafa90664b18a24d4b337a4e5117"
+rev = "8082532b9f720a1e7508ac32641dcfbbf51dd518"
 
 [lib]
 name = "mmtk_ruby"
@@ -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 = "f9b85bca5b1ae530854e09d553f3020edde46cdb"
+git = "https://github.com/wks/mmtk-core.git"
+rev = "b4ed92905fb1218692170374cb6ee5b23b239a5e"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 # path = "../../mmtk-core"