gc/mmtk: avoid fn_addr_eq for MSRV 1.74

Author: sorah

debian/patches/Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

@@ -12,7 +12,7 @@ Updated by John Paul Adrian Glaubitz <[email protected]> on
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 30e197b..7bedb37 100644
+index 5899f2a..5e9b168 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2690,6 +2690,9 @@ AS_CASE([$coroutine_type], [yes|''], [

debian/patches/Mark-Gemspec-reproducible-change-fixing-784225-too.patch

@@ -12,10 +12,10 @@ Signed-off-by: Christian Hofstaedtler <[email protected]>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
-index 8f353ae..095125f 100644
+index 0b905a7..a102e3c 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1711,7 +1711,9 @@ class Gem::Specification < Gem::BasicSpecification
+@@ -1709,7 +1709,9 @@ class Gem::Specification < Gem::BasicSpecification
                  raise(Gem::InvalidSpecificationException,
                        "invalid date format in specification: #{date.inspect}")
                end

debian/patches/TestProcess-disable-gems-to-disable-rubygems_integration.patch

@@ -11,7 +11,7 @@ lets such test fail.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
-index 6e8ba48..dfe47cd 100644
+index af72053..c4184b2 100644
 --- a/test/ruby/test_process.rb
 +++ b/test/ruby/test_process.rb
 @@ -292,7 +292,7 @@ class TestProcess < Test::Unit::TestCase

debian/patches/extract-gems-sequential-Keep-using-RUNRUBY.patch

@@ -15,7 +15,7 @@ Subject: extract-gems-sequential: Keep using RUNRUBY
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/common.mk b/common.mk
-index 0ea360c..9b34859 100644
+index 594b5da..0b2aa6a 100644
 --- a/common.mk
 +++ b/common.mk
 @@ -1537,7 +1537,7 @@ update-gems$(gnumake:yes=-sequential): PHONY

debian/patches/gc-mmtk-avoid-fn_addr_eq-for-MSRV-1.74.patch

@@ -0,0 +1,29 @@
+From: Sorah Fukumori <[email protected]>
+Date: Sat, 26 Apr 2025 11:08:01 +0900
+Subject: gc/mmtk: avoid fn_addr_eq for MSRV 1.74
+
+---
+ gc/mmtk/src/abi.rs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gc/mmtk/src/abi.rs b/gc/mmtk/src/abi.rs
+index fc9c899..011c496 100644
+--- a/gc/mmtk/src/abi.rs
++++ b/gc/mmtk/src/abi.rs
+@@ -153,6 +153,7 @@ impl ObjectClosure {
+     ///
+     /// Note that this function is not reentrant.  Don't call this function in either `callback` or
+     /// `f`.
++    #[allow(unpredictable_function_pointer_comparisons)]
+     pub fn set_temporarily_and_run_code<'env, T, F1, F2>(
+         &mut self,
+         mut visit_object: F1,
+@@ -163,7 +164,7 @@ impl ObjectClosure {
+         F2: 'env + FnOnce() -> T,
+     {
+         debug_assert!(
+-            std::ptr::fn_addr_eq(self.c_function, THE_UNREGISTERED_CLOSURE_FUNC),
++            self.c_function == THE_UNREGISTERED_CLOSURE_FUNC,
+             "set_temporarily_and_run_code is recursively called."
+         );
+         self.c_function = Self::c_function_registered::<F1>;

debian/patches/rbinstall-Disable-arch-dependent-file-isolation.patch

@@ -8,7 +8,7 @@ Reverts https://github.com/ruby/ruby/pull/10010
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
-index ebd76dc..105f0e8 100755
+index b194f2c..62cf5be9 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
 @@ -367,7 +367,7 @@ goruby_install_name = "go" + ruby_install_name

debian/patches/series

@@ -12,3 +12,4 @@ Ensure-Integer-GMP_VERSION-exists.patch
 gc-mmtk-keep-using-std-panic-PanicInfo-for-MSRV-1.74.patch
 TestReline-test_tty_amibuous_width-use-test_rubybin.patch
 rbinstall-Disable-arch-dependent-file-isolation.patch
+gc-mmtk-avoid-fn_addr_eq-for-MSRV-1.74.patch