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

Author: wks

Diff for: .gdbinit

@@ -523,14 +523,14 @@ document rp_bignum
 end
 
 define rp_class
+  set $class_and_classext = (struct RClass_and_rb_classext_t *)($arg0)
   printf "(struct RClass *) %p", (void*)$arg0
-  if RCLASS_ORIGIN((struct RClass *)($arg0)) != $arg0
-    printf " -> %p", RCLASS_ORIGIN((struct RClass *)($arg0))
+  if $class_and_classext->classext->origin_ != (VALUE)$arg0
+    printf " -> %p", $class_and_classext->classext->origin_
   end
   printf "\n"
   rb_classname $arg0
-  print/x *(struct RClass *)($arg0)
-  print *RCLASS_EXT((struct RClass *)($arg0))
+  print/x *$class_and_classext
 end
 document rp_class
   Print the content of a Class/Module.
@@ -896,10 +896,10 @@ document rb_method_entry
 end
 
 define rb_classname
-  # up to 128bit int
-  set $rb_classname = rb_mod_name($arg0)
-  if $rb_classname != RUBY_Qnil
-    rp $rb_classname
+  set $rb_classname = ((struct RClass_and_rb_classext_t*)$arg0)->classext->classpath
+  if $rb_classname != RUBY_Qfalse
+    print_string $rb_classname
+    printf "\n"
   else
     echo anonymous class/module\n
   end

Diff for: .github/workflows/dependabot_automerge.yml

@@ -1,14 +1,16 @@
 # from https://github.com/gofiber/swagger/blob/main/.github/workflows/dependabot_automerge.yml
 name: Dependabot auto-merge
 on:
-  pull_request_target:
+  pull_request:
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   automerge:
     runs-on: ubuntu-latest
-
-    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
-
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'ruby/ruby'
     steps:
       - name: Dependabot metadata
         uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0

Diff for: .github/workflows/windows.yml

@@ -25,19 +25,24 @@ jobs:
     strategy:
       matrix:
         include:
-          - vc: 2015
-            vs: 2019
+          - os: 2019
+            vc: 2015
             vcvars: '10.0.14393.0 -vcvars_ver=14.0' # The oldest Windows 10 SDK w/ VC++ 2015 toolset (v140)
             test_task: check
-          - vs: 2019
+          - os: 2019
+            vc: 2019
             test_task: check
-          - vs: 2019
+          - os: 2022
+            vc: 2019
+            vcvars: '10.0.22621.0 -vcvars_ver=14.2' # The defautl Windows 11 SDK and toolset are broken at windows-2022
+            test_task: check
+          - os: 2022
+            vc: 2019
+            vcvars: '10.0.22621.0 -vcvars_ver=14.2'
             test_task: test-bundled-gems
-          # - vs: 2022
-          #   test_task: check
       fail-fast: false
 
-    runs-on: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
+    runs-on: windows-${{ matrix.os < 2022 && '2019' || matrix.os }}
 
     if: >-
       ${{!(false
@@ -49,11 +54,11 @@ jobs:
       || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
       )}}
 
-    name: VisualStudio ${{ matrix.vc || matrix.vs }} (${{ matrix.test_task }})
+    name: Windows ${{ matrix.os }}/Visual C++ ${{ matrix.vc }} (${{ matrix.test_task }})
 
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
-      OS_VER: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
+      OS_VER: windows-${{ matrix.os < 2022 && '2019' || matrix.os }}
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.target || 'x64' }}-windows
 
     steps:
@@ -105,7 +110,7 @@ jobs:
         run: |
           iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
           Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
-          scoop install vcpkg
+          scoop install vcpkg [email protected]
         shell: pwsh
 
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
@@ -123,7 +128,7 @@ jobs:
         # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
         # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
         run: |
-          ::- Set up VC ${{ matrix.vc || matrix.vs }}
+          ::- Set up VC ${{ matrix.vc }}
           set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
           for /f "delims=;" %%I in ('%vswhere% -latest -property installationPath') do (
             set VCVARS="%%I\VC\Auxiliary\Build\vcvars64.bat"
@@ -179,7 +184,7 @@ jobs:
       - name: Set up Launchable
         uses: ./.github/actions/launchable/setup
         with:
-          os: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
+          os: windows-${{ matrix.os < 2022 && '2019' || matrix.os }}
           launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
           builddir: build
           srcdir: src
@@ -194,7 +199,7 @@ jobs:
 
       - uses: ./.github/actions/slack
         with:
-          label: VS${{ matrix.vc || matrix.vs }} / ${{ matrix.test_task || 'check' }}
+          label: Windows ${{ matrix.os }} / VC ${{ matrix.vc }} / ${{ matrix.test_task || 'check' }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
         if: ${{ failure() }}
 

Diff for: CONTRIBUTING.md

@@ -1 +1 @@
-See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing_md.html), which includes setup and build instructions.
+See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing/contributing_md.html), which includes setup and build instructions.

Diff for: NEWS.md

@@ -34,9 +34,9 @@ The following bundled gems are promoted from default gems.
 * benchmark 0.4.0
 * logger 1.7.0
 * rdoc 6.13.1
-* win32ole 1.9.1
-* irb 1.15.1
-* reline 0.6.0
+* win32ole 1.9.2
+* irb 1.15.2
+* reline 0.6.1
 * readline 0.0.4
 * fiddle 1.1.6
 
@@ -58,6 +58,7 @@ The following default gems are updated.
 * prism 1.4.0
 * psych 5.2.3
 * stringio 3.1.6
+* strscan 3.1.3
 * uri 1.0.3
 
 The following bundled gems are added.
@@ -66,14 +67,15 @@ The following bundled gems are added.
 The following bundled gems are updated.
 
 * minitest 5.25.5
+* test-unit 3.6.8
 * rexml 3.4.1
 * net-imap 0.5.6
 * net-smtp 0.5.1
 * rbs 3.9.2
 * bigdecimal 3.1.9
 * syslog 0.3.0
-* csv 3.3.3
-* repl_type_completor 0.1.10
+* csv 3.3.4
+* repl_type_completor 0.1.11
 
 ## Supported platforms
 

Diff for: README.md

@@ -85,7 +85,7 @@ Bugs should be reported at https://bugs.ruby-lang.org. Read ["Reporting Issues"]
 
 ## Contributing
 
-See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing_md.html), which includes setup and build instructions.
+See ["Contributing to Ruby"](https://docs.ruby-lang.org/en/master/contributing/contributing_md.html), which includes setup and build instructions.
 
 ## The Author
 

Diff for: bootstraptest/test_method.rb

@@ -1419,3 +1419,11 @@ def internal_foo = foo
     "ok"
   end
 }
+
+assert_equal 'ok', <<~RUBY
+  def test(*, kw: false)
+    "ok"
+  end
+
+  test
+RUBY

Diff for: bootstraptest/test_ractor.rb

@@ -1638,7 +1638,7 @@ class C
 
   1_000.times { idle_worker, tmp_reporter = Ractor.select(*workers) }
   "ok"
-} if !yjit_enabled? || ENV['GITHUB_WORKFLOW'] == 'ModGC' # flaky
+} if !yjit_enabled? && ENV['GITHUB_WORKFLOW'] != 'ModGC' # flaky
 
 assert_equal "ok", %q{
   def foo(*); ->{ super }; end
@@ -2103,3 +2103,24 @@ def ==(o)
     :fail
   end
 }
+
+# move objects inside frozen containers
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  original = obj.dup
+  ractor.send([obj].freeze, move: true)
+  roundtripped_obj = ractor.take[0]
+  roundtripped_obj == original ? :ok : roundtripped_obj
+}
+
+# move object with generic ivar
+assert_equal 'ok', %q{
+  ractor = Ractor.new { Ractor.receive }
+  obj = Array.new(10, 42)
+  obj.instance_variable_set(:@array, [1])
+
+  ractor.send(obj, move: true)
+  roundtripped_obj = ractor.take
+  roundtripped_obj.instance_variable_get(:@array) == [1] ? :ok : roundtripped_obj
+}

Diff for: class.c

@@ -1004,9 +1004,8 @@ rb_define_class(const char *name, VALUE super)
     }
     klass = rb_define_class_id(id, super);
     rb_vm_register_global_object(klass);
-    rb_const_set_raw(rb_cObject, id, klass);
+    rb_const_set(rb_cObject, id, klass);
     rb_class_inherited(super, klass);
-    rb_const_added(klass, id);
 
     return klass;
 }
@@ -1044,10 +1043,8 @@ rb_define_class_id_under_no_pin(VALUE outer, ID id, VALUE super)
     }
     klass = rb_define_class_id(id, super);
     rb_set_class_path_string(klass, outer, rb_id2str(id));
-
-    rb_const_set_raw(outer, id, klass);
+    rb_const_set(outer, id, klass);
     rb_class_inherited(super, klass);
-    rb_const_added(outer, id);
 
     return klass;
 }

Diff for: compile.c

@@ -2599,7 +2599,13 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     else {
         body->is_entries = NULL;
     }
-    body->call_data = ZALLOC_N(struct rb_call_data, body->ci_size);
+
+    if (body->ci_size) {
+        body->call_data = ZALLOC_N(struct rb_call_data, body->ci_size);
+    }
+    else {
+        body->call_data = NULL;
+    }
     ISEQ_COMPILE_DATA(iseq)->ci_index = 0;
 
     // Calculate the bitmask buffer size.
@@ -10749,7 +10755,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         if (nd_fl_newline(node)) {
             int event = RUBY_EVENT_LINE;
             ISEQ_COMPILE_DATA(iseq)->last_line = line;
-            if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+            if (line > 0 && ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
                 event |= RUBY_EVENT_COVERAGE_LINE;
             }
             ADD_TRACE(ret, event);
@@ -13379,6 +13385,11 @@ ibf_load_ci_entries(const struct ibf_load *load,
                     unsigned int ci_size,
                     struct rb_call_data **cd_ptr)
 {
+    if (!ci_size) {
+        *cd_ptr = NULL;
+        return;
+    }
+
     ibf_offset_t reading_pos = ci_entries_offset;
 
     unsigned int i;

Diff for: doc/exceptions.md

@@ -181,7 +181,7 @@ divided by 0
 
 Two read-only global variables always have `nil` value
 except in a rescue clause;
-there:
+they're:
 
 - `$!`: contains the rescued exception.
 - `$@`: contains its backtrace.

Diff for: doc/windows.md

@@ -21,14 +21,16 @@ ridk enable ucrt64
 
 pacman -S --needed %MINGW_PACKAGE_PREFIX%-openssl %MINGW_PACKAGE_PREFIX%-libyaml %MINGW_PACKAGE_PREFIX%-libffi
 
-cd c:\
-mkdir work
-cd work
-git clone https://github.com/ruby/ruby
-
-cd c:\work\ruby
-sh autogen.sh
-sh configure  -C --disable-install-doc
+mkdir c:\work\ruby
+cd /d c:\work\ruby
+
+git clone https://github.com/ruby/ruby src
+
+sh ./src/autogen.sh
+
+mkdir build
+cd build
+sh ../src/configure -C --disable-install-doc
 make
 ```
 
@@ -40,17 +42,24 @@ bash
 
 pacman -S --needed $MINGW_PACKAGE_PREFIX-openssl $MINGW_PACKAGE_PREFIX-libyaml $MINGW_PACKAGE_PREFIX-libffi
 
-cd /c/
-mkdir work
-cd work
-git clone https://github.com/ruby/ruby
-cd ruby
+mkdir /c/work/ruby
+cd /c/work/ruby
+
+git clone https://github.com/ruby/ruby src
 
-./autogen.sh
-./configure -C --disable-install-doc
+./src/autogen.sh
+cd build
+../src/configure -C --disable-install-doc
 make
 ```
 
+If you have other MSYS2 environment via other package manager like `scoop`, you need to specify `$MINGW_PACKAGE_PREFIX` is `mingw-w64-ucrt-x86_64`.
+And you need to add `--with-opt-dir` option to `configure` command like:
+
+```batch
+sh ../../ruby/configure -C --disable-install-doc --with-opt-dir=C:\Users\username\scoop\apps\msys2\current\ucrt64
+```
+
 [RubyInstaller-Devkit]: https://rubyinstaller.org/
 [git-for-windows]: https://gitforwindows.org/
 [VSCode]: https://code.visualstudio.com/
@@ -66,6 +75,12 @@ make
     **Note** if you want to build x64 version, use native compiler for
     x64.
 
+    The minimum requirement is here:
+      * VC++/MSVC on VS 2017/2019 version build tools.
+        * Visual Studio 2022 17.13.x is broken. see https://bugs.ruby-lang.org/issues/21167
+      * Windows 10/11 SDK
+        * 10.0.26100 is broken, 10.0.22621 is recommended. see https://bugs.ruby-lang.org/issues/21255
+
 3.  Please set environment variable `INCLUDE`, `LIB`, `PATH`
     to run required commands properly from the command line.
     These are set properly by `vcvarall*.bat` usually.
@@ -80,13 +95,20 @@ make
 
 4.  If you want to build from GIT source, following commands are required.
     * `git`
-    * `sed`
     * `ruby` 3.0 or later
 
     You can use [scoop](https://scoop.sh/) to install them like:
 
     ```batch
-    scoop install git sed ruby
+    scoop install git ruby
+    ```
+
+    The windows version of `git` configured with `autocrlf` is `true`. The Ruby
+    test suite may fail with `autocrlf` set to `true`. You can set it to `false`
+    like:
+
+    ```batch
+    git config --global core.autocrlf false
     ```
 
 5.  You need to install required libraries using [vcpkg](https://vcpkg.io/) on