Merge branch 'master' into mmtk

Author: wks

.github/workflows/annocheck.yml

@@ -74,7 +74,7 @@ jobs:
           builddir: build
           makeup: true
 
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: '3.0'
           bundler: none

.github/workflows/baseruby.yml

@@ -51,7 +51,7 @@ jobs:
           - ruby-3.3
 
     steps:
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none

.github/workflows/check_dependencies.yml

@@ -55,7 +55,7 @@ jobs:
 
       - uses: ./.github/actions/setup/directories
 
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: '3.0'
           bundler: none

.github/workflows/codeql-analysis.yml

@@ -80,15 +80,15 @@ jobs:
         run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         with:
           languages: ${{ matrix.language }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         with:
           category: '/language:${{ matrix.language }}'
           upload: False
@@ -118,7 +118,7 @@ jobs:
         continue-on-error: true
 
       - name: Upload SARIF
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         with:
           sarif_file: sarif-results/${{ matrix.language }}.sarif
         continue-on-error: true

.github/workflows/macos.yml

@@ -107,6 +107,7 @@ jobs:
 
       - name: make ${{ matrix.test_task }}
         run: |
+          ulimit -c unlimited
           make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
         timeout-minutes: 60
         env:
@@ -116,7 +117,6 @@ jobs:
 
       - name: make skipped tests
         run: |
-          ulimit -c unlimited
           make -s test-all TESTS="${TESTS//-n!\//-n/}"
         env:
           GNUMAKEFLAGS: ''
@@ -147,20 +147,6 @@ jobs:
             const job_name = `${context.job}${matrix ? ` (${Object.values(matrix).join(", ")})` : ""}`;
             return workflow_run.jobs.find((job) => job.name === job_name).id;
 
-      - name: upload /cores
-        run: |
-          ls -l /cores
-          CORES_TAR_GZ="cores-${{ github.run_id }}-${{ steps.job_id.outputs.result }}.tar.gz"
-          echo "test: $CORES_TAR_GZ"
-          if [ -n "$(ls /cores)" ]; then
-            tar czf /cores "$CORES_TAR_GZ"
-            aws s3 cp "$CORES_TAR_GZ" "s3://ruby-core-files/$CORES_TAR_GZ"
-          fi
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.RUBY_CORE_FILES_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.RUBY_CORE_FILES_AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: ap-northeast-1
-
   result:
     if: ${{ always() }}
     name: ${{ github.workflow }} result

.github/workflows/mingw.yml

@@ -66,7 +66,7 @@ jobs:
 
     steps:
       - name: Set up Ruby & MSYS2
-        uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+        uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: ${{ matrix.baseruby }}
 

.github/workflows/rjit-bindgen.yml

@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Set up Ruby
-        uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+        uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: '3.1'
 

.github/workflows/scorecards.yml

@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v2.1.27
+        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v2.1.27
         with:
           sarif_file: results.sarif

.github/workflows/spec_guards.yml

@@ -47,7 +47,7 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none

.github/workflows/ubuntu.yml

@@ -67,7 +67,7 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
 
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: '3.0'
           bundler: none

.github/workflows/wasm.yml

@@ -100,7 +100,7 @@ jobs:
         run: |
           echo "WASI_SDK_PATH=/opt/wasi-sdk" >> $GITHUB_ENV
 
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: '3.0'
           bundler: none

.github/workflows/windows.yml

@@ -91,7 +91,7 @@ jobs:
             ${{ steps.find-tools.outputs.needs }}
         if: ${{ steps.find-tools.outputs.needs != '' }}
 
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: '3.0'
           bundler: none
@@ -115,7 +115,7 @@ jobs:
 
       - name: Install libraries with vcpkg
         run: |
-          vcpkg --triplet x64-windows install libffi libyaml openssl readline zlib
+          vcpkg --triplet x64-windows install gmp libffi libyaml openssl zlib
 
       - name: Install libraries with scoop
         run: |

.github/workflows/yjit-ubuntu.yml

@@ -134,7 +134,7 @@ jobs:
 
       - uses: ./.github/actions/setup/ubuntu
 
-      - uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
+      - uses: ruby/setup-ruby@78c01b705fd9d5ad960d432d3a0cfa341d50e410 # v1.179.1
         with:
           ruby-version: '3.0'
           bundler: none

.rdoc_options

@@ -5,3 +5,5 @@ encoding: UTF-8
 main_page: README.md
 title: Documentation for Ruby development version
 visibility: :private
+rdoc_include:
+- doc

LEGAL

@@ -727,24 +727,6 @@ mentioned below.
       for internal or external distribution as long as this notice
       remains attached.
 
-[ext/nkf/nkf-utf8/config.h]
-[ext/nkf/nkf-utf8/nkf.c]
-[ext/nkf/nkf-utf8/utf8tbl.c]
-
-  These files are under the following license.  So to speak, it is
-  copyrighted semi-public-domain software.
-
-  >>>
-    Copyright (C) 1987:: Fujitsu LTD. (Itaru ICHIKAWA)
-
-    Everyone is permitted to do anything on this program
-    including copying, modifying, improving,
-    as long as you don't try to pretend that you wrote it.
-    i.e., the above copyright notice has to appear in all copies.
-    Binary distribution requires original version messages.
-    You don't have to ask before copying, redistribution or publishing.
-    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
-
 [ext/psych]
 [test/psych]
 

NEWS.md

@@ -58,7 +58,7 @@ The following default gems are updated.
 * json 2.7.2
 * net-http 0.4.1
 * optparse 0.5.0
-* prism 0.29.0
+* prism 0.30.0
 * rdoc 6.7.0
 * reline 0.5.8
 * resolv 0.4.0

README.ja.md

@@ -4,7 +4,6 @@
 [![Actions Status: Windows](https://github.com/ruby/ruby/workflows/Windows/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows")
 [![AppVeyor status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
 [![Travis Status](https://app.travis-ci.com/ruby/ruby.svg?branch=master)](https://app.travis-ci.com/ruby/ruby)
-[![Cirrus Status](https://api.cirrus-ci.com/github/ruby/ruby.svg)](https://cirrus-ci.com/github/ruby/ruby/master)
 
 # Rubyとは
 

bignum.c

@@ -30,9 +30,6 @@
 # define USE_GMP 0
 #endif
 #endif
-#if USE_GMP
-# include <gmp.h>
-#endif
 
 #include "id.h"
 #include "internal.h"
@@ -48,6 +45,15 @@
 #include "ruby/util.h"
 #include "ruby_assert.h"
 
+#if USE_GMP
+RBIMPL_WARNING_PUSH()
+# ifdef _MSC_VER
+RBIMPL_WARNING_IGNORED(4146) /* for mpn_neg() */
+# endif
+# include <gmp.h>
+RBIMPL_WARNING_POP()
+#endif
+
 static const bool debug_integer_pack = (
 #ifdef DEBUG_INTEGER_PACK
     DEBUG_INTEGER_PACK+0

bootstraptest/runner.rb

@@ -163,6 +163,10 @@ def main
   BT.quiet = false
   BT.timeout = 180
   BT.timeout_scale = (defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? ? 3 : 1) # for --jit-wait
+  if (ts = (ENV["RUBY_TEST_TIMEOUT_SCALE"] || ENV["RUBY_TEST_SUBPROCESS_TIMEOUT_SCALE"]).to_i) > 1
+    BT.timeout_scale *= ts
+  end
+
   # BT.wn = 1
   dir = nil
   quiet = false
@@ -234,7 +238,7 @@ def main
   end
   tests ||= ARGV
   tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
-  pathes = tests.map {|path| File.expand_path(path) }
+  paths = tests.map {|path| File.expand_path(path) }
 
   BT.progress = %w[- \\ | /]
   BT.progress_bs = "\b" * BT.progress[0].size
@@ -278,7 +282,7 @@ def main
   end
 
   in_temporary_working_directory(dir) do
-    exec_test pathes
+    exec_test paths
   end
 end
 
@@ -290,8 +294,8 @@ def erase(e = true)
   end
 end
 
-def load_test pathes
-  pathes.each do |path|
+def load_test paths
+  paths.each do |path|
     load File.expand_path(path)
   end
 end
@@ -341,13 +345,13 @@ def concurrent_exec_test
   end
 end
 
-def exec_test(pathes)
+def exec_test(paths)
   # setup
-  load_test pathes
+  load_test paths
   BT_STATE.count = 0
   BT_STATE.error = 0
   BT.columns = 0
-  BT.width = pathes.map {|path| File.basename(path).size}.max + 2
+  BT.width = paths.map {|path| File.basename(path).size}.max + 2
 
   # execute tests
   if BT.wn > 1

bootstraptest/test_syntax.rb

@@ -848,7 +848,7 @@ class X < RuntimeError;end
       def x(a=1, b, *rest); nil end
     end
   end
-}, bug2415
+}, bug2415 unless rjit_enabled? # flaky
 
 assert_normal_exit %q{
   0.times do
@@ -880,7 +880,7 @@ def x@; nil; end
       end
     end
   end
-}, bug2415
+}, bug2415 unless rjit_enabled? # flaky
 
 assert_normal_exit %q{
   a {

bootstraptest/test_yjit.rb

@@ -4815,6 +4815,15 @@ def tests
   tests
 }
 
+# test integer left shift fusion followed by opt_getconstant_path
+assert_equal '33', %q{
+  def test(a)
+    (a << 5) | (Object; a)
+  end
+
+  test(1)
+}
+
 # test String#stebyte with arguments that need conversion
 assert_equal "abc", %q{
   str = +"a00"
@@ -4994,3 +5003,58 @@ def test_body(args) = callee(1, *args)
   array.clear
   test_body(array)
 }
+
+# regression test for splatting empty array to cfunc
+assert_normal_exit %q{
+  def test_body(args) = Array(1, *args)
+
+  test_body([])
+  0x100.times do
+    array = Array.new(100)
+    array.clear
+    test_body(array)
+  end
+}
+
+# compiling code shouldn't emit warnings as it may call into more Ruby code
+assert_equal 'ok', <<~'RUBY'
+  # [Bug #20522]
+  $VERBOSE = true
+  Warning[:performance] = true
+
+  module StrictWarnings
+    def warn(msg, **)
+      raise msg
+    end
+  end
+  Warning.singleton_class.prepend(StrictWarnings)
+
+  class A
+    def compiled_method(is_private)
+      @some_ivar = is_private
+    end
+  end
+
+  shape_max_variations = 8
+  if defined?(RubyVM::Shape::SHAPE_MAX_VARIATIONS) && RubyVM::Shape::SHAPE_MAX_VARIATIONS != shape_max_variations
+    raise "Expected SHAPE_MAX_VARIATIONS to be #{shape_max_variations}, got: #{RubyVM::Shape::SHAPE_MAX_VARIATIONS}"
+  end
+
+  100.times do |i|
+    klass = Class.new(A)
+    (shape_max_variations - 1).times do |j|
+      obj = klass.new
+      obj.instance_variable_set("@base_#{i}", 42)
+      obj.instance_variable_set("@ivar_#{j}", 42)
+    end
+    obj = klass.new
+    obj.instance_variable_set("@base_#{i}", 42)
+    begin
+      obj.compiled_method(true)
+    rescue
+      # expected
+    end
+  end
+
+  :ok
+RUBY