Merge branch 'master' into dist/3.3/bookworm

Author: sorah

debian/changelog

@@ -1,3 +1,12 @@
+ruby3.3 (3.3.0-0nkmi2~dist) unstable; urgency=medium
+
+  * Early backport: https://github.com/ruby/ruby/pull/9457
+  * Early backport: https://github.com/ruby/ruby/pull/9415
+  * Early backport: https://bugs.ruby-lang.org/issues/20184 https://github.com/ruby/ruby/pull/9498
+  * Early backport: https://bugs.ruby-lang.org/issues/20085 https://github.com/ruby/ruby/pull/9385
+
+ -- Sorah Fukumori <[email protected]>  Wed, 17 Jan 2024 17:31:21 +0900
+
 ruby3.3 (3.3.0-0nkmi1~dist) unstable; urgency=medium
 
   * Happy Ruby 3.3!

debian/patches/Handle-mmap-failures-for-redblack-tree-cache.patch

@@ -0,0 +1,30 @@
+From: Aaron Patterson <[email protected]>
+Date: Thu, 11 Jan 2024 16:05:21 -0800
+Subject: Handle mmap failures for redblack tree cache
+
+The redblack tree cache is totally optional, so if we can't allocate
+room for the cache, then just pretend as if the cache is full if mmap
+fails
+---
+ shape.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/shape.c b/shape.c
+index 4cd4acd..8d8314d 100644
+--- a/shape.c
++++ b/shape.c
+@@ -1233,6 +1233,14 @@ Init_default_shapes(void)
+     rb_shape_tree_ptr->shape_cache = (redblack_node_t *)mmap(NULL, rb_size_mul_or_raise(REDBLACK_CACHE_SIZE, sizeof(redblack_node_t), rb_eRuntimeError),
+                          PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+     rb_shape_tree_ptr->cache_size = 0;
++
++    // If mmap fails, then give up on the redblack tree cache.
++    // We set the cache size such that the redblack node allocators think
++    // the cache is full.
++    if (GET_SHAPE_TREE()->shape_cache == MAP_FAILED) {
++        GET_SHAPE_TREE()->shape_cache = 0;
++        GET_SHAPE_TREE()->cache_size = REDBLACK_CACHE_SIZE;
++    }
+ #endif
+ 
+     // Shapes by size pool

debian/patches/Use-consistent-default-options-for-mbranch-protection.patch

@@ -0,0 +1,26 @@
+From: Yuta Saito <[email protected]>
+Date: Wed, 27 Dec 2023 06:22:45 +0000
+Subject: Use consistent default options for `-mbranch-protection`
+
+We need to use the same options for both C compiler and assembler
+when `-mbranch-protection` is guessed by configure. Otherwise,
+`coroutine/arm64/Context.{h,S}` will use incompatible PAC strategies.
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e4f9cc1..a7b1c77 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -830,7 +830,10 @@ AS_IF([test "$GCC" = yes], [
+ 	AS_FOR(option, opt, [-mbranch-protection=pac-ret -msign-return-address=all], [
+             RUBY_TRY_CFLAGS(option, [branch_protection=yes], [branch_protection=no])
+             AS_IF([test "x$branch_protection" = xyes], [
++                # C compiler and assembler must be consistent for -mbranch-protection
++                # since they both check `__ARM_FEATURE_PAC_DEFAULT` definition.
+                 RUBY_APPEND_OPTION(XCFLAGS, option)
++                RUBY_APPEND_OPTION(ASFLAGS, option)
+                 break
+             ])
+         ])