Merge from upstream

.cirrus.yml

@@ -90,6 +90,7 @@ yjit_task:
     matrix:
       - CC: clang-12
         configure: --enable-yjit=dev
+        rustup_init: --default-toolchain=1.58.1
       - CC: gcc-11
         configure: --enable-yjit
   id_script: id
@@ -107,7 +108,7 @@ yjit_task:
   install_rust_script:
     - sudo apt-get update -y
     - sudo apt-get install -y curl
-    - "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
+    - "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y $rustup_init"
   autogen_script: ./autogen.sh
   configure_script: >-
     source $HOME/.cargo/env && ./configure -C

.github/auto_request_review.yml

@@ -0,0 +1,9 @@
+files:
+  'yjit*': [team:yjit]
+  'yjit/**/*': [team:yjit]
+  'doc/yjit/*': [team:yjit]
+  'bootstraptest/test_yjit*': [team:yjit]
+  'test/ruby/test_yjit*': [team:yjit]
+  '.github/workflows/yjit*': [team:yjit]
+options:
+  ignore_draft: true

.github/codeql/codeql-config.yml

@@ -1,3 +1,7 @@
 name: "CodeQL config for the Ruby language"
 
 languages: cpp
+
+# syntax_suggest consumes an hour.
+paths-ignore:
+  - lib/syntax_suggest

.github/workflows/auto_request_review.yml

@@ -0,0 +1,14 @@
+name: Auto Request Review
+on:
+  pull_request_target:
+    types: [opened, ready_for_review, reopened]
+jobs:
+  auto-request-review:
+    name: Auto Request Review
+    runs-on: ubuntu-latest
+    steps:
+      - name: Request review based on files changes and/or groups the author belongs to
+        uses: necojackarc/auto-request-review@e08cdffa277d50854744de3f76230260e61c67f4 # v0.7.0, checking sha
+        with:
+          # scope: public_repo
+          token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}

.github/workflows/compilers.yml

@@ -22,7 +22,7 @@ concurrency:
 # environment variables (plus the "echo $GITHUB_ENV" hack) is to reroute that
 # restriction.
 env:
-  default_cc: clang-14
+  default_cc: clang-15
   append_cc: ''
 
   # -O1 is faster than -O3 in our tests... Majority of time are consumed trying
@@ -91,6 +91,7 @@ jobs:
               # https://sourceware.org/annobin/annobin.html/Test-pie.html
               TEST_ANNOCHECK_OPTS: "--skip-pie"
             check: true
+          - { name: clang-16,  env: { default_cc: clang-16 } }
           - { name: clang-15,  env: { default_cc: clang-15 } }
           - { name: clang-14,  env: { default_cc: clang-14 } }
           - { name: clang-13,  env: { default_cc: clang-13 } }
@@ -214,7 +215,7 @@ jobs:
     name: ${{ matrix.entry.name }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-14' }}
+      image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-15' }}
       options: --user root
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     env: ${{ matrix.entry.env || matrix.env }}

.github/workflows/mingw.yml

@@ -70,7 +70,6 @@ jobs:
       - name: set env
         run: |
           echo "GNUMAKEFLAGS=-j$((2 * NUMBER_OF_PROCESSORS))" >> $GITHUB_ENV
-          echo "TEST_JOBS=$((15 * NUMBER_OF_PROCESSORS / 10))" >> $GITHUB_ENV
 
       - name: where check
         run: |
@@ -116,7 +115,7 @@ jobs:
           make update-gems
 
       - name: make all
-        timeout-minutes: 20
+        timeout-minutes: 30
         run: |
           make
 
@@ -140,7 +139,7 @@ jobs:
           make ${{ StartsWith(matrix.test_task, 'test/') && matrix.test_task || 'test-all' }}
         env:
           RUBY_TESTOPTS: >-
-            -j${{env.TEST_JOBS}} --retry --job-status=normal --show-skip --timeout-scale=1.5
+            --retry --job-status=normal --show-skip --timeout-scale=1.5
             ${{ matrix.test-all-opts }}
           BUNDLER_VERSION:
         if: ${{matrix.test_task == 'check' || matrix.test_task == 'test-all' || StartsWith(matrix.test_task, 'test/')}}

.github/workflows/mjit-bindgen.yml

@@ -23,9 +23,6 @@ jobs:
       matrix:
         include:
           - task: mjit-bindgen
-            configure: '--enable-yjit=dev_nodebug'
-          - task: mjit-bindgen
-            arch: i686
       fail-fast: false
     env:
       SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
@@ -74,7 +71,7 @@ jobs:
         env:
           arch: ${{ matrix.arch }}
         run: >-
-          $SETARCH ../src/configure -C --disable-install-doc --prefix=$(pwd)/install ${{ matrix.configure }}
+          $SETARCH ../src/configure -C --disable-install-doc --prefix=$(pwd)/install --enable-yjit=dev_nodebug
           ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
       - run: $SETARCH make incs
       - run: $SETARCH make

.github/workflows/ubuntu.yml

@@ -21,32 +21,33 @@ jobs:
   make:
     strategy:
       matrix:
-        test_task: ["check", "test-syntax-suggest", "test-bundler-parallel", "test-bundled-gems"]
-        os:
-          - ubuntu-20.04
-        configure: ["", "cppflags=-DRUBY_DEBUG"]
+        # main variables included in the job name
+        test_task: [check]
+        configure: [cppflags=-DRUBY_DEBUG] # default to use more assertions
+        arch: ['']
+        # specify all jobs with `include` to avoid testing duplicated things
         include:
-          - test_task: "check"
-            configure: ""
+          - test_task: check
+          - test_task: check
             arch: i686
-          - test_task: "check"
+            configure: '' # test without -DRUBY_DEBUG as well
+          - test_task: check
             configure: "--enable-shared --enable-load-relative"
-            skipped_tests: "TestGem#test_.*_from_binstubs.*"
-            continue-on-skipped_tests: true
-          - test_task: "test-all TESTS=--repeat-count=2"
+          - test_task: test-all TESTS=--repeat-count=2
+          - test_task: test-syntax-suggest
+          - test_task: test-bundler-parallel
+          - test_task: test-bundled-gems
       fail-fast: false
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       RUBY_DEBUG: ci
       SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
-    runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
+    runs-on: ubuntu-20.04
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
       - run: mkdir build
         working-directory:
       - name: Set ENV
-        env:
-          configure: ${{matrix.configure}}
         run: |
           echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
       - name: Install libraries
@@ -120,7 +121,7 @@ jobs:
           payload: |
             {
               "ci": "GitHub Actions",
-              "env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}",
+              "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}${{ matrix.arch }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
               "branch": "${{ github.ref }}".split('/').reverse()[0]

.github/workflows/windows.yml

@@ -128,14 +128,12 @@ jobs:
           YACC: win_bison
       - run: nmake test
         timeout-minutes: 5
+      - run: nmake test-spec
+        timeout-minutes: 10
       - run: nmake test-all
         env:
           RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --job-status=normal
         timeout-minutes: 60
-        continue-on-error: ${{ matrix.continue-on-error || false }}
-      - run: nmake test-spec
-        timeout-minutes: 10
-        continue-on-error: ${{ matrix.continue-on-error || false }}
       - uses: k0kubun/action-slack@v2.0.0
         with:
           payload: |

.github/workflows/yjit-ubuntu.yml

@@ -59,10 +59,16 @@ jobs:
 
           - test_task: "test-bundled-gems"
             configure: "--enable-yjit=dev"
+
+          - test_task: "yjit-bench"
+            configure: "--enable-yjit=dev"
+            yjit_bench_opts: "--yjit-stats"
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       RUN_OPTS: ${{ matrix.yjit_opts }}
+      YJIT_BENCH_OPTS: ${{ matrix.yjit_bench_opts }}
       RUBY_DEBUG: ci
+      BUNDLE_JOBS: 8 # for yjit-bench
     runs-on: ubuntu-20.04
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
@@ -98,7 +104,7 @@ jobs:
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
-        run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
+        run: ../src/configure -C --disable-install-doc --prefix=$(pwd)/install ${{ matrix.configure }}
       - run: make incs
       - run: make prepare-gems
         if: ${{ matrix.test_task == 'test-bundled-gems' }}
@@ -111,18 +117,26 @@ jobs:
         if: ${{ matrix.test_task == 'check' }}
       - name: Enable YJIT through ENV
         run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV
-      - run: make -s ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS"
+      - name: make ${{ matrix.test_task }}
+        run: make -s -j ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS"
         timeout-minutes: 60
         env:
           RUBY_TESTOPTS: "-q --tty=no"
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
           PRECHECK_BUNDLED_GEMS: "no"
+        continue-on-error: ${{ matrix.test_task == 'yjit-bench' }}
+      - name: Show ${{ github.event.pull_request.base.ref }} GitHub URL for yjit-bench comparison
+        run: echo "https://github.com/${BASE_REPO}/commit/${BASE_SHA}"
+        env:
+          BASE_REPO: ${{ github.event.pull_request.base.repo.full_name }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+        if: ${{ matrix.test_task == 'yjit-bench' && startsWith(github.event_name, 'pull') }}
       - uses: k0kubun/action-slack@v2.0.0
         with:
           payload: |
             {
               "ci": "GitHub Actions",
-              "env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}",
+              "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
               "branch": "${{ github.ref }}".split('/').reverse()[0]

.gitignore

@@ -233,10 +233,13 @@ lcov*.info
 /win32/*.ico
 
 # MJIT
-/rb_mjit_header.h
-/mjit_config.h
 /include/ruby-*/*/rb_mjit_min_header-*.h
-/mjit_instruction.rb
+/lib/mjit/instruction.rb
+/mjit_config.h
+/rb_mjit_header.h
+
+# YJIT
+/yjit-bench
 
 # /wasm/
 /wasm/tests/*.wasm

.travis.yml

@@ -113,6 +113,7 @@ env:
         libncursesw5-dev:armhf
         libreadline-dev:armhf
         libssl-dev:armhf
+        libyaml-dev:armhf
         linux-libc-dev:armhf
         zlib1g-dev:armhf
 
@@ -170,9 +171,9 @@ before_script:
     else
       mkdir build
     fi
-  - mkdir config_1st config_2nd
+  - mkdir config_1st config_2nd gems/src
   - chmod -R a-w .
-  - chmod -R u+w build config_1st config_2nd
+  - chmod -R u+w build config_1st config_2nd gems/src
   - cd build
   - |-
     case "$CC" in

NEWS.md

@@ -90,12 +90,22 @@ Note that each entry is kept to a minimum, see links for details.
     foo(k: 1)
     ```
 
+* `eval` and related methods are able to generate code coverage.
+  [[Feature #19008]]
+
 ## Command line options
 
 ## Core classes updates
 
 Note: We're only listing outstanding class updates.
 
+* Encoding
+    * Encoding#replicate has been deprecated and will be removed in 3.3. [[Feature #18949]]
+    * The dummy `Encoding::UTF_16` and `Encoding::UTF_32` encodings no longer
+      try to dynamically guess the endian based on a byte order mark.
+      Use `Encoding::UTF_16BE/UTF_16LE` and `Encoding::UTF_32BE/UTF_32LE` instead.
+      This change speeds up getting the encoding of a String. [[Feature #18949]]
+
 * Enumerator
     * Enumerator.product has been added.  Enumerator::Product is the implementation. [[Feature #18685]]
 
@@ -124,10 +134,13 @@ Note: We're only listing outstanding class updates.
     * Proc#dup returns an instance of subclass. [[Bug #17545]]
     * Proc#parameters now accepts lambda keyword. [[Feature #15357]]
 
+* Process
+    * Added `RLIMIT_NPTS` constant to FreeBSD platform
+
 * Regexp
     * Regexp.new now supports passing the regexp flags not only as an Integer,
-      but also as a String Unknown flags raise errors.  Otherwise, anything
-      other than `true`, `false`, `nil` or Integer will be warned.
+      but also as a String.  Unknown flags raise ArgumentError.
+      Otherwise, anything other than `true`, `false`, `nil` or Integer will be warned.
       [[Feature #18788]]
 
 * Refinement
@@ -137,6 +150,16 @@ Note: We're only listing outstanding class updates.
     * Set is now available as a built-in class without the need for `require "set"`. [[Feature #16989]]
       It is currently autoloaded via the `Set` constant or a call to `Enumerable#to_set`.
 
+* Socket
+    * Added the following constants for supported platforms.
+      * `SO_INCOMING_CPU`
+      * `SO_INCOMING_NAPI_ID`
+      * `SO_RTABLE`
+      * `SO_SETFIB`
+      * `SO_USER_COOKIE`
+      * `TCP_KEEPALIVE`
+      * `TCP_CONNECTION_INFO`
+
 * String
     * String#byteindex and String#byterindex have been added. [[Feature #13110]]
     * Update Unicode to Version 14.0.0 and Emoji Version 14.0. [[Feature #18037]]
@@ -165,7 +188,7 @@ Note: We're only listing outstanding class updates.
     * RubyGems 3.4.0.dev
     * bigdecimal 3.1.2
     * bundler 2.4.0.dev
-    * cgi 0.3.2
+    * cgi 0.3.3
     * date 3.2.3
     * error_highlight 0.4.0
     * etc 1.4.0
@@ -292,3 +315,5 @@ The following deprecated APIs are removed.
 [Feature #18788]: https://bugs.ruby-lang.org/issues/18788
 [Feature #18809]: https://bugs.ruby-lang.org/issues/18809
 [Feature #18481]: https://bugs.ruby-lang.org/issues/18481
+[Feature #18949]: https://bugs.ruby-lang.org/issues/18949
+[Feature #19008]: https://bugs.ruby-lang.org/issues/19008

README.md

@@ -46,6 +46,10 @@ to see the list of branches:
 You may also want to use https://git.ruby-lang.org/ruby.git (actual master of Ruby source)
 if you are a committer.
 
+## How to build
+
+see [Building Ruby](doc/contributing/building_ruby.md)
+
 ## Ruby home page
 
 https://www.ruby-lang.org/