sorah-rbpkg
diff --git a/‎debian/changelog
Lines changed: 9 additions & 0 deletions b/‎debian/changelog
Lines changed: 9 additions & 0 deletions
diff --git a/‎debian/patches/Handle-mmap-failures-for-redblack-tree-cache.patch
Lines changed: 30 additions & 0 deletions b/‎debian/patches/Handle-mmap-failures-for-redblack-tree-cache.patch
Lines changed: 30 additions & 0 deletions
diff --git a/‎debian/patches/Use-consistent-default-options-for-mbranch-protection.patch
Lines changed: 26 additions & 0 deletions b/‎debian/patches/Use-consistent-default-options-for-mbranch-protection.patch
Lines changed: 26 additions & 0 deletions
diff --git a/‎debian/patches/YJIT-Let-RubyVM-YJIT.enable-respect-yjit-stats.patch
Lines changed: 71 additions & 0 deletions b/‎debian/patches/YJIT-Let-RubyVM-YJIT.enable-respect-yjit-stats.patch
Lines changed: 71 additions & 0 deletions
diff --git a/‎debian/patches/racc-is-extracted-at-Ruby-3.3-not-3.4.patch
Lines changed: 28 additions & 0 deletions b/‎debian/patches/racc-is-extracted-at-Ruby-3.3-not-3.4.patch
Lines changed: 28 additions & 0 deletions
diff --git a/‎debian/patches/series
Lines changed: 4 additions & 0 deletions b/‎debian/patches/series
Lines changed: 4 additions & 0 deletions
@@ -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 <sorah@cookpad.com>  Wed, 17 Jan 2024 17:31:21 +0900
+
 ruby3.3 (3.3.0-0nkmi1~dist) unstable; urgency=medium
 
   * Happy Ruby 3.3!
 
@@ -0,0 +1,30 @@
+From: Aaron Patterson <tenderlove@ruby-lang.org>
+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
@@ -0,0 +1,26 @@
+From: Yuta Saito <kateinoigakukun@gmail.com>
+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
+             ])
+         ])
@@ -0,0 +1,71 @@
+From: Takashi Kokubun <takashikkbn@gmail.com>
+Date: Thu, 4 Jan 2024 14:53:44 -0800
+Subject: YJIT: Let RubyVM::YJIT.enable respect --yjit-stats
+
+---
+ test/ruby/test_yjit.rb | 14 +++++++++++++-
+ yjit.rb                |  6 +++++-
+ yjit/src/yjit.rs       |  8 +++++---
+ 3 files changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/test/ruby/test_yjit.rb b/test/ruby/test_yjit.rb
+index 9d3ec2f..55b86be 100644
+--- a/test/ruby/test_yjit.rb
++++ b/test/ruby/test_yjit.rb
+@@ -67,7 +67,19 @@ class TestYJIT < Test::Unit::TestCase
+     RUBY
+   end
+ 
+-  def test_yjit_enable_stats
++  def test_yjit_enable_stats_false
++    assert_separately(["--yjit-disable", "--yjit-stats"], <<~RUBY, ignore_stderr: true)
++      assert_false RubyVM::YJIT.enabled?
++      assert_nil RubyVM::YJIT.runtime_stats
++
++      RubyVM::YJIT.enable
++
++      assert_true RubyVM::YJIT.enabled?
++      assert_true RubyVM::YJIT.runtime_stats[:all_stats]
++    RUBY
++  end
++
++  def test_yjit_enable_stats_true
+     args = []
+     args << "--disable=yjit" if RubyVM::YJIT.enabled?
+     assert_separately(args, <<~RUBY, ignore_stderr: true)
+diff --git a/yjit.rb b/yjit.rb
+index 0365e16..a228611 100644
+--- a/yjit.rb
++++ b/yjit.rb
+@@ -28,7 +28,11 @@ module RubyVM::YJIT
+     Primitive.rb_yjit_reset_stats_bang
+   end
+ 
+-  # Enable \YJIT compilation.
++  # Enable \YJIT compilation. `stats` option decides whether to enable \YJIT stats or not.
++  #
++  # * `false`: Disable stats.
++  # * `true`: Enable stats. Print stats at exit.
++  # * `:quiet`: Enable stats. Do not print stats at exit.
+   def self.enable(stats: false)
+     return false if enabled?
+     at_exit { print_and_dump_stats } if stats
+diff --git a/yjit/src/yjit.rs b/yjit/src/yjit.rs
+index cd51ed0..50335a7 100644
+--- a/yjit/src/yjit.rs
++++ b/yjit/src/yjit.rs
+@@ -171,9 +171,11 @@ pub extern "C" fn rb_yjit_code_gc(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
+ pub extern "C" fn rb_yjit_enable(_ec: EcPtr, _ruby_self: VALUE, gen_stats: VALUE, print_stats: VALUE) -> VALUE {
+     with_vm_lock(src_loc!(), || {
+         // Initialize and enable YJIT
+-        unsafe {
+-            OPTIONS.gen_stats = gen_stats.test();
+-            OPTIONS.print_stats = print_stats.test();
++        if gen_stats.test() {
++            unsafe {
++                OPTIONS.gen_stats = gen_stats.test();
++                OPTIONS.print_stats = print_stats.test();
++            }
+         }
+         yjit_init();
+ 
@@ -0,0 +1,28 @@
+From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
+Date: Tue, 9 Jan 2024 17:14:51 +0900
+Subject: racc is extracted at Ruby 3.3, not 3.4
+
+---
+ lib/bundled_gems.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/bundled_gems.rb b/lib/bundled_gems.rb
+index 0bb2a7c..5528672 100644
+--- a/lib/bundled_gems.rb
++++ b/lib/bundled_gems.rb
+@@ -13,6 +13,7 @@ module Gem::BUNDLED_GEMS
+     "net-pop" => "3.1.0",
+     "net-smtp" => "3.1.0",
+     "prime" => "3.1.0",
++    "racc" => "3.3.0",
+     "abbrev" => "3.4.0",
+     "base64" => "3.4.0",
+     "bigdecimal" => "3.4.0",
+@@ -22,7 +23,6 @@ module Gem::BUNDLED_GEMS
+     "mutex_m" => "3.4.0",
+     "nkf" => "3.4.0",
+     "observer" => "3.4.0",
+-    "racc" => "3.4.0",
+     "resolv-replace" => "3.4.0",
+     "rinda" => "3.4.0",
+     "syslog" => "3.4.0",
@@ -8,3 +8,7 @@ TestProcess-disable-gems-to-disable-rubygems_integration.patch
 extract-gems-sequential-Keep-using-RUNRUBY.patch
 Test_SyncDefaultGems-Fail-when-editor-run.patch
 sync_default_gems-git-2.32-ignores-no-edit-in-cherry-pick.patch
+Use-consistent-default-options-for-mbranch-protection.patch
+Handle-mmap-failures-for-redblack-tree-cache.patch
+YJIT-Let-RubyVM-YJIT.enable-respect-yjit-stats.patch
+racc-is-extracted-at-Ruby-3.3-not-3.4.patch