Merge branch 'master' into dev/mmtk-overrides-default

Author: wks

.github/workflows/cygwin.yml

@@ -45,20 +45,19 @@ jobs:
       - name: Setup Cygwin
         uses: cygwin/cygwin-install-action@master
         with:
-          packages: ruby gcc-core make autoconf libtool libssl-devel libyaml-devel libffi-devel zlib-devel
+          packages: ruby gcc-core make autoconf libtool libssl-devel libyaml-devel libffi-devel zlib-devel rubygems
 
       - name: configure
         run: |
           ./autogen.sh
           ./configure --disable-install-doc
         shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o igncr -o pipefail {0}
 
-      # This fails with: tool/outdate-bundled-gems.rb:3:in 'Kernel#require': cannot load such file -- rubygems (LoadError)
-      #- name: Extract bundled gems
-      #  run: |
-      #    make ruby -j5
-      #    make extract-gems
-      #  shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o igncr -o pipefail {0}
+      - name: Extract bundled gems
+        run: |
+          make ruby -j5
+          make extract-gems
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o igncr -o pipefail {0}
 
       - name: make all
         timeout-minutes: 30

.github/workflows/spec_guards.yml

@@ -42,6 +42,7 @@ jobs:
           - ruby-3.2
           - ruby-3.3
           - ruby-3.4
+      fail-fast: false
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.github/workflows/sync_default_gems.yml

@@ -59,6 +59,10 @@ jobs:
           git pull --rebase origin ${GITHUB_REF#refs/heads/}
           git push origin ${GITHUB_REF#refs/heads/}
         if: ${{ steps.sync.outputs.update }}
+        env:
+          EMAIL: svn-admin@ruby-lang.org
+          GIT_AUTHOR_NAME: git
+          GIT_COMMITTER_NAME: git
 
       - uses: ./.github/actions/slack
         with:

.github/workflows/zjit-macos.yml

@@ -122,6 +122,7 @@ jobs:
         timeout-minutes: 60
         env:
           RUBY_TESTOPTS: '-q --tty=no'
+          EXCLUDES: '../src/test/.excludes-zjit'
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
           SYNTAX_SUGGEST_TIMEOUT: '5'
           PRECHECK_BUNDLED_GEMS: 'no'

.github/workflows/zjit-ubuntu.yml

@@ -169,6 +169,7 @@ jobs:
         timeout-minutes: 90
         env:
           RUBY_TESTOPTS: '-q --tty=no'
+          EXCLUDES: '../src/test/.excludes-zjit'
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
           PRECHECK_BUNDLED_GEMS: 'no'
           SYNTAX_SUGGEST_TIMEOUT: '5'

NEWS.md

@@ -134,8 +134,8 @@ Note: We're only listing outstanding class updates.
 
 * String
 
-    * Update Unicode to Version 16.0.0 and Emoji Version 16.0.
-      [[Feature #19908]][[Feature #20724]] (also applies to Regexp)
+    * Update Unicode to Version 17.0.0 and Emoji Version 17.0.
+      [[Feature #19908]][[Feature #20724]][[Feature #21275]] (also applies to Regexp)
 
 * Thread
 
@@ -170,7 +170,7 @@ The following bundled gems are promoted from default gems.
 * rdoc 6.15.1
 * win32ole 1.9.2
 * irb 1.15.3
-* reline 0.6.2
+* reline 0.6.3
 * readline 0.0.4
 * fiddle 1.1.8
 
@@ -191,22 +191,22 @@ The following default gems are updated.
 * date 3.5.0
 * digest 3.2.1
 * english 0.8.1
-* erb 5.1.3
+* erb 6.0.0
 * etc 1.4.6
 * fcntl 1.3.0
 * fileutils 1.8.0
 * io-console 0.8.1
 * io-nonblock 0.3.2
-* io-wait 0.3.3
+* io-wait 0.4.0.dev
 * json 2.16.0
-* net-http 0.7.0
+* net-http 0.8.0
 * openssl 4.0.0.pre
 * optparse 0.8.0
 * pp 0.6.3
 * prism 1.6.0
 * psych 5.2.6
 * resolv 0.6.3
-* stringio 3.1.8.dev
+* stringio 3.1.9.dev
 * strscan 3.1.6.dev
 * timeout 0.4.4
 * uri 1.1.1

benchmark/time_now.yml

@@ -1,3 +1,4 @@
 benchmark:
   - 'Time.now'
   - 'Time.now(in: "+09:00")'
+  - 'Time.now.year'

bootstraptest/runner.rb

@@ -298,7 +298,7 @@ def main
     if defined?(RUBY_DESCRIPTION)
       puts "Driver is #{RUBY_DESCRIPTION}"
     elsif defined?(RUBY_PATCHLEVEL)
-      puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}#{RUBY_PLATFORM}) [#{RUBY_PLATFORM}]"
+      puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}#{RUBY_PATCHLEVEL}) [#{RUBY_PLATFORM}]"
     else
       puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
     end

bootstraptest/test_yjit.rb

@@ -5371,3 +5371,14 @@ class << self
 
   RESULT.any?
 }
+
+# throw and String#dup with GC stress
+assert_equal 'foo', %{
+  GC.stress = true
+
+  def foo
+    1.times { return "foo".dup }
+  end
+
+  10.times.map { foo.dup }.last
+}

class.c

@@ -590,13 +590,6 @@ rb_module_add_to_subclasses_list(VALUE module, VALUE iclass)
     }
 }
 
-void
-rb_class_remove_subclass_head(VALUE klass)
-{
-    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
-    rb_class_classext_free_subclasses(ext, klass, false);
-}
-
 static struct rb_subclass_entry *
 class_get_subclasses_for_ns(struct st_table *tbl, VALUE box_id)
 {
@@ -663,18 +656,6 @@ rb_class_remove_from_super_subclasses(VALUE klass)
     RCLASSEXT_BOX_SUPER_SUBCLASSES(ext) = 0;
 }
 
-void
-rb_class_remove_from_module_subclasses(VALUE klass)
-{
-    rb_classext_t *ext = RCLASS_EXT_WRITABLE(klass);
-    rb_box_subclasses_t *box_subclasses = RCLASSEXT_BOX_MODULE_SUBCLASSES(ext);
-
-    if (!box_subclasses) return;
-    remove_class_from_subclasses(box_subclasses->tbl, box_subclasses_tbl_key(RCLASSEXT_BOX(ext)), klass);
-    rb_box_subclasses_ref_dec(box_subclasses);
-    RCLASSEXT_BOX_MODULE_SUBCLASSES(ext) = 0;
-}
-
 void
 rb_class_classext_free_subclasses(rb_classext_t *ext, VALUE klass, bool replacing)
 {
@@ -690,19 +671,19 @@ rb_class_classext_free_subclasses(rb_classext_t *ext, VALUE klass, bool replacin
     }
     VM_ASSERT(
         rb_box_subclasses_ref_count(anchor->box_subclasses) > 0,
-        "box_subclasses refcount (%p) %d", anchor->box_subclasses, rb_box_subclasses_ref_count(anchor->box_subclasses));
+        "box_subclasses refcount (%p) %ld", anchor->box_subclasses, rb_box_subclasses_ref_count(anchor->box_subclasses));
     st_delete(tbl, &box_id, NULL);
     rb_box_subclasses_ref_dec(anchor->box_subclasses);
     xfree(anchor);
 
-    if (!replacing && RCLASSEXT_BOX_SUPER_SUBCLASSES(ext)) {
+    if (RCLASSEXT_BOX_SUPER_SUBCLASSES(ext)) {
         rb_box_subclasses_t *box_sub = RCLASSEXT_BOX_SUPER_SUBCLASSES(ext);
-        remove_class_from_subclasses(box_sub->tbl, box_id, klass);
+        if (!replacing) remove_class_from_subclasses(box_sub->tbl, box_id, klass);
         rb_box_subclasses_ref_dec(box_sub);
     }
-    if (!replacing && RCLASSEXT_BOX_MODULE_SUBCLASSES(ext)) {
+    if (RCLASSEXT_BOX_MODULE_SUBCLASSES(ext)) {
         rb_box_subclasses_t *box_sub = RCLASSEXT_BOX_MODULE_SUBCLASSES(ext);
-        remove_class_from_subclasses(box_sub->tbl, box_id, klass);
+        if (!replacing) remove_class_from_subclasses(box_sub->tbl, box_id, klass);
         rb_box_subclasses_ref_dec(box_sub);
     }
 }
@@ -730,24 +711,6 @@ class_detach_subclasses(VALUE klass, VALUE arg)
     rb_class_remove_from_super_subclasses(klass);
 }
 
-void
-rb_class_detach_subclasses(VALUE klass)
-{
-    rb_class_foreach_subclass(klass, class_detach_subclasses, Qnil);
-}
-
-static void
-class_detach_module_subclasses(VALUE klass, VALUE arg)
-{
-    rb_class_remove_from_module_subclasses(klass);
-}
-
-void
-rb_class_detach_module_subclasses(VALUE klass)
-{
-    rb_class_foreach_subclass(klass, class_detach_module_subclasses, Qnil);
-}
-
 static void
 class_switch_superclass(VALUE super, VALUE klass)
 {