[pull] master from ruby:master

.github/workflows/check_misc.yml

@@ -103,7 +103,7 @@ jobs:
           }}
 
       - name: Upload docs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           path: html
           name: ${{ steps.docs.outputs.htmlout }}

.github/workflows/scorecards.yml

@@ -64,7 +64,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif

.github/workflows/wasm.yml

@@ -140,7 +140,7 @@ jobs:
       - run: tar cfz ../install.tar.gz -C ../install .
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ruby-wasm-install
           path: ${{ github.workspace }}/install.tar.gz
@@ -168,7 +168,7 @@ jobs:
       - name: Save Pull Request number
         if: ${{ github.event_name == 'pull_request' }}
         run: echo "${{ github.event.pull_request.number }}" >> ${{ github.workspace }}/github-pr-info.txt
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: ${{ github.event_name == 'pull_request' }}
         with:
           name: github-pr-info

.github/workflows/zjit-macos.yml

@@ -36,13 +36,11 @@ jobs:
             run_opts: '--zjit-call-threshold=1'
             specopts: '-T --zjit-call-threshold=1'
             configure: '--enable-zjit=dev'
-            test_all_opts: '--seed=46450'
 
           - test_task: 'check'
             run_opts: '--zjit-disable-hir-opt --zjit-call-threshold=1'
             specopts: '-T --zjit-disable-hir-opt -T --zjit-call-threshold=1'
             configure: '--enable-zjit=dev'
-            test_all_opts: '--seed=46450'
 
           - test_task: 'zjit-check' # zjit-test + quick feedback of test_zjit.rb
             configure: '--enable-yjit=dev --enable-zjit'
@@ -127,7 +125,6 @@ jobs:
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
           SYNTAX_SUGGEST_TIMEOUT: '5'
           PRECHECK_BUNDLED_GEMS: 'no'
-          TESTS: ${{ matrix.test_all_opts }}
         continue-on-error: ${{ matrix.continue-on-test_task || false }}
 
       - name: Dump crash logs

.github/workflows/zjit-ubuntu.yml

@@ -55,13 +55,11 @@ jobs:
             run_opts: '--zjit-call-threshold=1'
             specopts: '-T --zjit-call-threshold=1'
             configure: '--enable-zjit=dev'
-            test_all_opts: '--seed=39471'
 
           - test_task: 'check'
             run_opts: '--zjit-disable-hir-opt --zjit-call-threshold=1'
             specopts: '-T --zjit-disable-hir-opt -T --zjit-call-threshold=1'
             configure: '--enable-zjit=dev'
-            test_all_opts: '--seed=39471'
 
           - test_task: 'zjit-check' # zjit-test + quick feedback of test_zjit.rb
             configure: '--enable-yjit --enable-zjit=dev'
@@ -177,7 +175,6 @@ jobs:
           SYNTAX_SUGGEST_TIMEOUT: '5'
           ZJIT_BINDGEN_DIFF_OPTS: '--exit-code'
           CLANG_PATH: ${{ matrix.clang_path }}
-          TESTS: ${{ matrix.test_all_opts }}
         continue-on-error: ${{ matrix.continue-on-test_task || false }}
 
       - name: Dump crash logs

spec/ruby/core/proc/element_reference_spec.rb

@@ -17,7 +17,7 @@
   it_behaves_like :proc_call_on_proc_or_lambda, :call
 end
 
-describe "Proc#[] with frozen_string_literals" do
+describe "Proc#[] with frozen_string_literal: true/false" do
   it "doesn't duplicate frozen strings" do
     ProcArefSpecs.aref.frozen?.should be_false
     ProcArefSpecs.aref_freeze.frozen?.should be_true

spec/ruby/core/symbol/inspect_spec.rb

@@ -96,6 +96,10 @@
     :"foo "    => ":\"foo \"",
     :" foo"    => ":\" foo\"",
     :" "       => ":\" \"",
+
+    :"ê"       => ":ê",
+    :"测"      => ":测",
+    :"🦊"      => ":🦊",
   }
 
   symbols.each do |input, expected|

spec/ruby/language/assignments_spec.rb

@@ -93,7 +93,7 @@ def []=(*args, **kw)
       end
 
       ruby_version_is "3.4" do
-        it "raies SyntaxError when given keyword arguments in index assignments" do
+        it "raises SyntaxError when given keyword arguments in index assignments" do
           a = @klass.new
           -> { eval "a[1, 2, 3, b: 4] = 5" }.should raise_error(SyntaxError,
             /keywords are not allowed in index assignment expressions|keyword arg given in index assignment/) # prism|parse.y
@@ -236,7 +236,7 @@ def []=(*args, **kw)
         end
 
         ruby_version_is "3.4" do
-          it "raies SyntaxError when given keyword arguments in index assignments" do
+          it "raises SyntaxError when given keyword arguments in index assignments" do
             a = @klass.new
             -> { eval "a[1, 2, 3, b: 4] += 5" }.should raise_error(SyntaxError,
               /keywords are not allowed in index assignment expressions|keyword arg given in index assignment/) # prism|parse.y

test/ruby/test_string.rb

@@ -3750,26 +3750,28 @@ def test_chilled_string_substring
   def test_encode_fallback_raise_memory_leak
     {
       "hash" => <<~RUBY,
-        fallback = Hash.new { raise }
+        fallback = Hash.new { raise MyError }
       RUBY
       "proc" => <<~RUBY,
-        fallback = proc { raise }
+        fallback = proc { raise MyError }
       RUBY
       "method" => <<~RUBY,
-        def my_method = raise
+        def my_method(_str) = raise MyError
         fallback = method(:my_method)
       RUBY
       "aref" => <<~RUBY,
         fallback = Object.new
-        def fallback.[] = raise
+        def fallback.[](_str) = raise MyError
       RUBY
     }.each do |type, code|
       assert_no_memory_leak([], '', <<~RUBY, "fallback type is #{type}", rss: true)
+        class MyError < StandardError; end
+
         #{code}
 
         100_000.times do |i|
           "\\ufffd".encode(Encoding::US_ASCII, fallback:)
-        rescue
+        rescue MyError
         end
       RUBY
     end

vcpkg.json

@@ -7,5 +7,5 @@
     "openssl",
     "zlib"
   ],
-  "builtin-baseline": "4334d8b4c8916018600212ab4dd4bbdc343065d1"
+  "builtin-baseline": "74e6536215718009aae747d86d84b78376bf9e09"
 }

yjit/src/stats.rs

@@ -318,7 +318,6 @@ macro_rules! ptr_to_counter {
         }
     };
 }
-pub(crate) use ptr_to_counter;
 
 // Declare all the counters we track
 make_counters! {