bump patchlevel.v3_2_5

author: nagachika <nagachika@ruby-lang.org> 2024-07-26 20:54:27 +0900
committer: nagachika <nagachika@ruby-lang.org> 2024-07-26 20:54:27 +0900
commit: 31d0f1a2e7dbfb60731d1f05b868e1d578cda493 (patch)
tree: f4de78873a25f08254a5e0ab9c67d74e6c9941b6 /spec/ruby/library/socket/basicsocket/getpeername_spec.rb
parent: 367ad5055c3d5210c884d4611e08ffa32ec608ee (diff)
0 files changed, 0 insertions, 0 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 1ea5e59210..05ff204541 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,18 +17,18 @@ skip_commits:
     - '**/*.md'
     - '**/*.rdoc'
     - '**/.document'
+    - '**/*.[1-8]'
+    - '**/*.ronn'
 environment:
   ruby_version: "24-%Platform%"
-  zlib_version: "1.2.12"
   matrix:
+    # Test only the oldest supported version because AppVeyor is unstable, its concurrency
+    # is limited, and compatibility issues that happen only in newer versions are rare.
+    # You may test some other stuff on GitHub Actions instead.
     - build: vs
-      vs: 120
-      ssl: OpenSSL
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GEMS_FOR_TEST: ""
-    - build: vs
-      vs: 140
+      vs: 120 # Visual Studio 2013
       ssl: OpenSSL-v111
+      # The worker image name. This is NOT the Visual Studio version we're using here.
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       GEMS_FOR_TEST: ""
   RELINE_TEST_ENCODING: "UTF-8"
@@ -48,8 +48,9 @@ for:
     - cd C:\Tools\vcpkg
     - git pull -q
     - .\bootstrap-vcpkg.bat
+    - ps: Start-FileDownload 'https://github.com/microsoft/vcpkg-tool/releases/download/2023-08-09/vcpkg.exe' -FileName 'C:\Tools\vcpkg\vcpkg.exe'
     - cd %APPVEYOR_BUILD_FOLDER%
-    - vcpkg --triplet %Platform%-windows install libffi libyaml readline zlib
+    - vcpkg --triplet %Platform%-windows install --x-use-aria2 libffi libyaml readline zlib
     - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
     - SET vcvars
     - '"%vcvars%" %Platform:x64=amd64%'
@@ -69,9 +70,6 @@ for:
     - mkdir \usr\local\bin
     - mkdir \usr\local\include
     - mkdir \usr\local\lib
-    - SET ZLIB_ZIP=.downloaded-cache\zlib%zlib_version:.=%.zip
-    - if not exist %ZLIB_ZIP% curl -fsSL -o %ZLIB_ZIP% --retry 10 https://zlib.net/zlib%zlib_version:.=%.zip
-    - 7z x -aos -o%APPVEYOR_BUILD_FOLDER%\ext\zlib %ZLIB_ZIP%
     - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
     - for %%I in (c:\Tools\vcpkg\installed\%Platform%-windows\bin\*.dll) do (
         if not %%~nI == readline mklink \usr\local\bin\%%~nxI %%I
@@ -79,6 +77,7 @@ for:
     - attrib +r /s /d
     - mkdir %Platform%-mswin_%vs%
   build_script:
+    - set HAVE_GIT=no
     - cd %APPVEYOR_BUILD_FOLDER%
     - cd %Platform%-mswin_%vs%
     - >-
@@ -95,7 +94,7 @@ for:
     - nmake -l "TESTOPTS=-v -q" btest
     - nmake -l "TESTOPTS=-v -q" test-basic
     - >-
-      nmake -l "TESTOPTS=-v --timeout-scale=3.0
+      nmake -l "TESTOPTS=--timeout-scale=3.0
       --excludes=../test/excludes/_appveyor -j%JOBS%
       --exclude win32ole
       --exclude test_bignum
@@ -106,7 +105,7 @@ for:
     # separately execute tests without -j which may crash worker with -j.
     - >-
       nmake -l
-      "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor"
+      "TESTOPTS=--timeout-scale=3.0 --excludes=../test/excludes/_appveyor"
       TESTS="
       ../test/win32ole
       ../test/ruby/test_bignum.rb
@@ -124,7 +123,7 @@ notifications:
       {{^isPullRequest}}
         {
           "ci": "AppVeyor CI",
-          "env": "Visual Studio 2013 / 2015",
+          "env": "Visual Studio 2013",
           "url": "{{buildUrl}}",
           "commit": "{{commitId}}",
           "branch": "{{branch}}"
diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 854a3df982..0000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-# This CI is used to test Arm cases. We can set the maximum 16 tasks.
-# The entire testing design is inspired from .github/workflows/compilers.yml.
-
-# By default, Cirrus mounts an empty volume to `/tmp`
-# which triggers all sorts of warnings like "system temporary path is world-writable: /tmp".
-# Lets workaround it by specifying a custom volume mount point.
-env:
-  CIRRUS_VOLUME: /cirrus-ci-volume
-  LANG: C.UTF-8
-
-task:
-  name: Arm64 Graviton2 / $CC
-  skip: "changesIncludeOnly('doc/**', '**.{md,rdoc}', '.document')"
-  arm_container:
-    # We use the arm64 images at https://github.com/ruby/ruby-ci-image/pkgs/container/ruby-ci-image .
-    image: ghcr.io/ruby/ruby-ci-image:$CC
-    # Define the used cpu core in each matrix task. We can use total 16 cpu
-    # cores in entire matrix. [cpu] = [total cpu: 16] / [number of tasks]
-    cpu: 8
-    # We can request maximum 4 GB per cpu.
-    # [memory per task] = [memory per cpu: 4 GB] * [cpu]
-    memory: 32G
-  env:
-    CIRRUS_CLONE_DEPTH: 50
-    optflags: '-O1'
-    debugflags: '-ggdb3'
-    RUBY_PREFIX: /tmp/ruby-prefix
-    RUBY_DEBUG: ci rgengc
-    RUBY_TESTOPTS: >-
-      -q
-      --color=always
-      --tty=no
-    matrix:
-      CC: clang-12
-      CC: gcc-11
-  id_script: id
-  set_env_script:
-    # Set `GNUMAKEFLAGS`, because the flags are GNU make specific. Note using
-    # the `make` environment variable used in compilers.yml causes some rubygems
-    # tests to fail.
-    # https://github.com/rubygems/rubygems/issues/4921
-    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> $CIRRUS_ENV
-  print_env_script:
-    - echo "GNUMAKEFLAGS=$GNUMAKEFLAGS"
-  # Arm containers are executed in AWS's EKS, and it's not yet supporting IPv6
-  # See https://github.com/aws/containers-roadmap/issues/835
-  disable_ipv6_script: sudo ./tool/disable_ipv6.sh
-  autogen_script: ./autogen.sh
-  configure_script: >-
-    ./configure -C
-    --enable-debug-env
-    --disable-install-doc
-    --with-ext=-test-/cxxanyargs,+
-    --prefix="$RUBY_PREFIX"
-  make_extract-extlibs_script: make extract-extlibs
-  make_incs_script: make incs
-  make_script: make
-  make_leaked-globals_script: make leaked-globals
-  make_test_script: make test
-  make_install_script: make install
-  install_gems_for_test_script: $RUBY_PREFIX/bin/gem install --no-doc timezone tzinfo
-  make_test-tool_script: make test-tool
-  make_test-all_script: make test-all
-  make_test-spec_script: make test-spec
-
-# The following is to test YJIT on ARM64 CPUs available on Cirrus CI
-yjit_task:
-  name: Arm64 Graviton2 / $CC YJIT
-  auto_cancellation: $CIRRUS_BRANCH != 'master'
-  skip: "changesIncludeOnly('doc/**', '**.{md,rdoc}')"
-  arm_container:
-    # We use the arm64 images at https://github.com/ruby/ruby-ci-image/pkgs/container/ruby-ci-image .
-    image: ghcr.io/ruby/ruby-ci-image:$CC
-    # Define the used cpu core in each matrix task. We can use total 16 cpu
-    # cores in entire matrix. [cpu] = [total cpu: 16] / [number of tasks]
-    cpu: 8
-    # We can request maximum 4 GB per cpu.
-    # [memory per task] = [memory per cpu: 4 GB] * [cpu]
-    memory: 32G
-  env:
-    CIRRUS_CLONE_DEPTH: 50
-    optflags: '-O1'
-    debugflags: '-ggdb3'
-    RUBY_PREFIX: /tmp/ruby-prefix
-    RUBY_DEBUG: ci rgengc
-    RUBY_TESTOPTS: >-
-      -q
-      --color=always
-      --tty=no
-    matrix:
-      - CC: clang-12
-        configure: --enable-yjit=dev
-        rustup_init: --default-toolchain=1.58.1
-      - CC: gcc-11
-        configure: --enable-yjit
-  id_script: id
-  set_env_script:
-    # Set `GNUMAKEFLAGS`, because the flags are GNU make specific. Note using
-    # the `make` environment variable used in compilers.yml causes some rubygems
-    # tests to fail.
-    # https://github.com/rubygems/rubygems/issues/4921
-    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> $CIRRUS_ENV
-  print_env_script:
-    - echo "GNUMAKEFLAGS=$GNUMAKEFLAGS"
-  # Arm containers are executed in AWS's EKS, and it's not yet supporting IPv6
-  # See https://github.com/aws/containers-roadmap/issues/835
-  disable_ipv6_script: sudo ./tool/disable_ipv6.sh
-  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 $rustup_init"
-  autogen_script: ./autogen.sh
-  configure_script: >-
-    source $HOME/.cargo/env && ./configure -C
-    --enable-debug-env
-    --disable-install-doc
-    --with-ext=-test-/cxxanyargs,+
-    --prefix="$RUBY_PREFIX"
-    $configure
-  make_miniruby_script: source $HOME/.cargo/env && make miniruby
-  make_bindgen_script: |
-    if [[ "$CC" = "clang-12" ]]; then
-      source $HOME/.cargo/env && make yjit-bindgen
-    else
-      echo "only running bindgen on clang image"
-    fi
-  boot_miniruby_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 -e0
-  test_dump_insns_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 --yjit-dump-insns -e0
-  output_stats_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 --yjit-stats -e0
-  full_build_script: source $HOME/.cargo/env && make
-  cargo_test_script: source $HOME/.cargo/env && cd yjit && cargo test
-  make_test_script: source $HOME/.cargo/env && make test RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
-  make_test_all_script: source $HOME/.cargo/env && make test-all RUN_OPTS="--yjit-call-threshold=1" TESTOPTS="$RUBY_TESTOPTS"
-  make_test_spec_script: source $HOME/.cargo/env && make test-spec RUN_OPTS="--yjit-call-threshold=1"
diff --git a/.document b/.document
index ec2fa09326..3a6b0c238c 100644
--- a/.document
+++ b/.document
@@ -18,15 +18,18 @@ gc.rb
 io.rb
 kernel.rb
 marshal.rb
+mjit.rb
 numeric.rb
 nilclass.rb
 pack.rb
 ractor.rb
 string.rb
+symbol.rb
 timev.rb
 thread_sync.rb
 trace_point.rb
 warning.rb
+yjit.rb
 
 # the lib/ directory (which has its own .document file)
 lib
diff --git a/.github/auto_request_review.yml b/.github/auto_request_review.yml
deleted file mode 100644
index d058b6ca00..0000000000
--- a/.github/auto_request_review.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b18fd29357..bc63aca35b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,4 +3,4 @@ updates:
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      interval: 'weekly'
+      interval: 'monthly'
diff --git a/.github/workflows/auto_request_review.yml b/.github/workflows/auto_request_review.yml
deleted file mode 100644
index 7e163de697..0000000000
--- a/.github/workflows/auto_request_review.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-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 }}
diff --git a/.github/workflows/baseruby.yml b/.github/workflows/baseruby.yml
index 1c314da911..ebaafe3bf0 100644
--- a/.github/workflows/baseruby.yml
+++ b/.github/workflows/baseruby.yml
@@ -4,22 +4,36 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
+      - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   baseruby:
     name: BASERUBY
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     strategy:
       matrix:
@@ -34,12 +48,12 @@ jobs:
           - ruby-3.1
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: .downloaded-cache
           key: downloaded-cache
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none
@@ -51,7 +65,7 @@ jobs:
       - run: make incs
       - run: make all
       - run: make test
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -59,7 +73,7 @@ jobs:
               "env": "${{ github.workflow }} / BASERUBY @ ${{ matrix.ruby }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml
index f6f8b9a45b..070c0fa1dd 100644
--- a/.github/workflows/bundled_gems.yml
+++ b/.github/workflows/bundled_gems.yml
@@ -2,18 +2,31 @@ name: bundled_gems
 
 on:
   push:
+    branches: [ "master" ]
     paths:
       - '.github/workflows/bundled_gems.yml'
       - 'gems/bundled_gems'
   pull_request:
+    branches: [ "master" ]
+    paths:
+      - '.github/workflows/bundled_gems.yml'
+      - 'gems/bundled_gems'
+  merge_group:
+    branches: [ "master" ]
     paths:
       - '.github/workflows/bundled_gems.yml'
       - 'gems/bundled_gems'
   schedule:
     - cron: '45 6 * * *'
+  workflow_dispatch:
+
+permissions:  # added using https://github.com/step-security/secure-workflows
+  contents: read
 
 jobs:
   update:
+    permissions:
+      contents: write  # for Git to git push
     if: ${{ github.event_name != 'schedule' || github.repository == 'ruby/ruby' }}
     name: update ${{ github.workflow }}
     runs-on: ubuntu-latest
@@ -28,9 +41,9 @@ jobs:
           echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
           echo "TODAY=$(date +%F)" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: .downloaded-cache
           key: downloaded-cache-${{ github.sha }}
@@ -68,14 +81,14 @@ jobs:
               [g, v] unless last[g] == v
             end
             changed, added = changed.partition {|g, _| last[g]}
-            news.sub!(/^\*( +)The following #{type} gems? are updated\.\n\K(?: \1\* .*\n)*/) do
-              mark = "#{$1} * "
+            news.sub!(/^\*( +)The following #{type} gems? are updated\.\n+\K(?: \1\*( +).*\n)*/) do
+              mark = "#{$1} *#{$2}"
               changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
             end or next
-            news.sub!(/^\*( +)The following default gems are now bundled gems\.\n\K(?: \1\* .*\n)*/) do
-              mark = "#{$1} * "
+            news.sub!(/^\*( +)The following default gems are now bundled gems\.\n+\K(?: \1\*( +).*\n)*/) do
+              mark = "#{$1} *#{$2}"
               added.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
-            end or next if added
+            end or next unless added.empty?
             File.write("NEWS.md", news)
           end
         shell: ruby {0}
@@ -137,3 +150,17 @@ jobs:
           GIT_AUTHOR_NAME: git
           GIT_COMMITTER_NAME: git
         if: ${{ github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull') && steps.show.outcome == 'failure' }}
+
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} / update",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref_name }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: ${{ failure() && github.event_name == 'push' }}
diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml
index fab1989335..79b2916feb 100644
--- a/.github/workflows/check_dependencies.yml
+++ b/.github/workflows/check_dependencies.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,11 +26,14 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   update-deps:
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
       fail-fast: true
     runs-on: ${{ matrix.os }}
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
@@ -34,15 +46,14 @@ jobs:
         if: ${{ contains(matrix.os, 'ubuntu') }}
       - name: Install libraries
         run: |
-          brew upgrade
           brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline
         if: ${{ contains(matrix.os, 'macos') }}
       - name: git config
         run: |
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: .downloaded-cache
           key: downloaded-cache
@@ -52,7 +63,7 @@ jobs:
       - run: make all golf
       - run: ruby tool/update-deps --fix
       - run: git diff --no-ext-diff --ignore-submodules --exit-code
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -60,7 +71,7 @@ jobs:
               "env": "${{ matrix.os }} / Dependencies need to update",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/check_misc.yml b/.github/workflows/check_misc.yml
deleted file mode 100644
index 32a07f7fd6..0000000000
--- a/.github/workflows/check_misc.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-name: Miscellaneous checks
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
-  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
-
-jobs:
-  checks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check if C-sources are US-ASCII
-        run: |
-          ! grep -r -n '[^	 -~]' *.[chy] include internal win32/*.[ch]
-      - name: Check for trailing spaces
-        run: |
-          ! git grep -n '[	 ]$' '*.rb' '*.[chy]'
-      - name: Check for header macros
-        run: |
-          ! for header in ruby/*.h; do \
-            git grep -l -F -e $header -e HAVE_`echo $header | tr a-z./ A-Z__` -- . > /dev/null || echo $header
-          done | grep -F .
-        working-directory: include
-
-      - uses: actions/cache@v3
-        with:
-          path: .downloaded-cache
-          key: downloaded-cache-${{ github.sha }}
-          restore-keys: |
-            downloaded-cache
-
-      - name: Download previous gems list
-        run: |
-          data=default_gems.json
-          mkdir -p .downloaded-cache
-          ln -s .downloaded-cache/$data .
-          curl -O -R -z ./$data https://stdgems.org/$data
-
-      - name: Make default gems list
-        run: |
-          #!ruby
-          require 'rubygems'
-          $:.unshift "lib"
-          rgver = File.foreach("lib/rubygems.rb") do |line|
-            break $1 if /^\s*VERSION\s*=\s*"([^"]+)"/ =~ line
-          end
-          gems = Dir.glob("{ext,lib}/**/*.gemspec").map do |f|
-            spec = Gem::Specification.load(f)
-            "#{spec.name} #{spec.version}"
-          end.sort
-          File.open("gems/default_gems", "w") do |f|
-            f.puts "RubyGems #{rgver}"
-            f.puts gems
-          end
-        shell: ruby --disable=gems {0}
-
-      - name: Maintain updated gems list in NEWS
-        run: |
-          #!ruby
-          require 'json'
-          news = File.read("NEWS.md")
-          prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1]
-          prevs = [prev, prev.sub(/\.\d+\z/, '')]
-          %W[default].each do |type|
-            last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g|
-              v = g['versions'].values_at(*prevs).compact.first
-              g = g['gem']
-              g = 'RubyGems' if g == 'rubygems'
-              [g, v] if v
-            end.to_h
-            changed = File.foreach("gems/#{type}_gems").filter_map do |l|
-              next if l.start_with?("#")
-              g, v = l.split(" ", 3)
-              [g, v] unless last[g] == v
-            end
-            news.sub!(/^\*( +)The following #{type} gems? are updated\.\n\K(?: \1\* .*\n)*/) do
-              mark = "#{$1} * "
-              changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
-            end or next
-            File.write("NEWS.md", news)
-          end
-        shell: ruby {0}
-
-      - name: Check diffs
-        id: diff
-        run: |
-          git diff --color --no-ext-diff --ignore-submodules --exit-code NEWS.md
-        continue-on-error: true
-      - name: Commit
-        run: |
-          git pull --ff-only origin ${GITHUB_REF#refs/heads/}
-          git commit --message="Update default gems list at ${GITHUB_SHA:0:30} [ci skip]" NEWS.md
-          git push origin ${GITHUB_REF#refs/heads/}
-        env:
-          EMAIL: svn-admin@ruby-lang.org
-          GIT_AUTHOR_NAME: git
-          GIT_COMMITTER_NAME: git
-        if: ${{ github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull') && steps.diff.outcome == 'failure' }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f9fa0a7449..8dba76fbe2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,31 +1,42 @@
 name: "Code scanning - action"
 
 on:
-  push:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
-  pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
+  # push:
+  #   paths-ignore:
+  #     - 'doc/**'
+  #     - '**/man'
+  #     - '**.md'
+  #     - '**.rdoc'
+  #     - '**/.document'
+  # pull_request:
+  #   paths-ignore:
+  #     - 'doc/**'
+  #     - '**/man'
+  #     - '**.md'
+  #     - '**.rdoc'
+  #     - '**/.document'
   schedule:
-    - cron: '0 12 * * 4'
+    - cron: '0 12 * * *'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:  # added using https://github.com/step-security/secure-workflows
+  contents: read
+
 jobs:
   CodeQL-Build:
 
     # CodeQL runs on ubuntu-latest and windows-latest
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/autobuild to send a status report
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    # CodeQL fails to run pull requests from dependabot due to missing write access to upload results.
+    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') && github.event.head_commit.pusher.name != 'dependabot[bot]' }}
 
     env:
       enable_install_doc: no
@@ -38,9 +49,9 @@ jobs:
         sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: .downloaded-cache
         key: downloaded-cache
@@ -49,15 +60,16 @@ jobs:
       run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
       with:
         config-file: ./.github/codeql/codeql-config.yml
+        trap-caching: false
 
     - name: Set ENV
       run: echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 70d0e3ae6c..caf12cc0f4 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -4,13 +4,20 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - '**.md'
+      - '**/man'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.rdoc'
       - '**/.document'
 
@@ -56,6 +63,9 @@ env:
     --color=always
     --tty=no
 
+permissions:
+  contents: read
+
 jobs:
   compile:
     strategy:
@@ -70,27 +80,13 @@ jobs:
           - { name: gcc-9,     env: { default_cc: gcc-9 } }
           - { name: gcc-8,     env: { default_cc: gcc-8 } }
           - { name: gcc-7,     env: { default_cc: gcc-7 } }
-          - { name: gcc-6,     env: { default_cc: gcc-6 } }
-          - { name: gcc-5,     env: { default_cc: gcc-5 } }
-          - { name: gcc-4.8,   env: { default_cc: gcc-4.8 } }
-          - name: 'gcc-11 LTO'
-            container: gcc-11
+          - name: 'gcc-13 LTO'
+            container: gcc-13
             env:
-              default_cc: 'gcc-11 -flto=auto -ffat-lto-objects'
+              default_cc: 'gcc-13 -flto=auto -ffat-lto-objects -Werror=lto-type-mismatch'
               optflags: '-O2'
             shared: disable
             # check: true
-          - name: 'gcc-11 annocheck'
-            container: gcc-11
-            env:
-              # Minimal flags to pass the check.
-              default_cc: 'gcc-11 -O2 -fcf-protection -Wa,--generate-missing-build-notes=yes'
-              LDFLAGS: '-Wl,-z,now'
-              # FIXME: Drop skipping options
-              # https://bugs.ruby-lang.org/issues/18061
-              # 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 } }
@@ -98,17 +94,15 @@ jobs:
           - { name: clang-12,  env: { default_cc: clang-12 } }
           - { name: clang-11,  env: { default_cc: clang-11 } }
           - { name: clang-10,  env: { default_cc: clang-10 } }
-          - { name: clang-9,   env: { default_cc: clang-9 } }
-          - { name: clang-8,   env: { default_cc: clang-8 } }
-          - { name: clang-7,   env: { default_cc: clang-7 } }
-          - { name: clang-6.0, env: { default_cc: clang-6.0 } }
-          - { name: clang-5.0, env: { default_cc: clang-5.0 } }
-          - { name: clang-4.0, env: { default_cc: clang-4.0 } }
-          - { name: clang-3.9, env: { default_cc: clang-3.9 } }
-          - name: 'clang-14 LTO'
-            container: clang-14
+          # llvm-objcopy<=9 doesn't have --wildcard. It compiles, but leaves Rust symbols in libyjit.o.
+          - { name: clang-9,   env: { default_cc: clang-9,   append_configure: '--disable-yjit' } }
+          - { name: clang-8,   env: { default_cc: clang-8,   append_configure: '--disable-yjit' } }
+          - { name: clang-7,   env: { default_cc: clang-7,   append_configure: '--disable-yjit' } }
+          - { name: clang-6.0, env: { default_cc: clang-6.0, append_configure: '--disable-yjit' } }
+          - name: 'clang-16 LTO'
+            container: clang-16
             env:
-              default_cc: 'clang-14 -flto=auto'
+              default_cc: 'clang-16 -flto=auto'
               optflags: '-O2'
             shared: disable
             # check: true
@@ -174,7 +168,11 @@ jobs:
 #         - { name: VM_CHECK_MODE,                  env: { cppflags: '-DVM_CHECK_MODE' } }
 
           - { name: USE_EMBED_CI=0,                 env: { cppflags: '-DUSE_EMBED_CI=0' } }
-          - { name: USE_FLONUM=0,                   env: { cppflags: '-DUSE_FLONUM=0' } }
+          - name: USE_FLONUM=0,
+            env:
+              cppflags: '-DUSE_FLONUM=0'
+              # yjit requires FLONUM for the pointer tagging scheme
+              append_configure: '--disable-yjit'
 #         - { name: USE_GC_MALLOC_OBJ_INFO_DETAILS, env: { cppflags: '-DUSE_GC_MALLOC_OBJ_INFO_DETAILS' } }
           - { name: USE_LAZY_LOAD,                  env: { cppflags: '-DUSE_LAZY_LOAD' } }
 #         - { name: USE_RINCGC=0,                   env: { cppflags: '-DUSE_RINCGC=0' } }
@@ -227,10 +225,10 @@ jobs:
       - name: setenv
         run: |
           echo "GNUMAKEFLAGS=-sj$((1 + $(nproc --all)))" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
@@ -264,7 +262,7 @@ jobs:
       - run: make test-annocheck
         if: ${{ matrix.entry.check && endsWith(matrix.entry.name, 'annocheck') }}
 
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -272,7 +270,7 @@ jobs:
               "env": "${{ github.workflow }} / ${{ matrix.entry.name }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 72f28a7b61..d8dc58b119 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,14 +26,18 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   make:
     strategy:
       matrix:
         test_task: ["check"] # "test-bundler-parallel", "test-bundled-gems"
         os:
-          - macos-11
-          - macos-12
+          - macos-13
+          - macos-14
+          - macos-15
       fail-fast: false
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
@@ -37,21 +50,21 @@ jobs:
         run: |
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
       - name: Install libraries
         run: |
-          brew upgrade
-          brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline
+          brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline bison
         working-directory: src
       - name: Set ENV
         run: |
           echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
+          echo "PATH="/usr/local/opt/bison/bin:/opt/homebrew/opt/bison/bin:$PATH"" >> $GITHUB_ENV
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
@@ -81,7 +94,7 @@ jobs:
           PRECHECK_BUNDLED_GEMS: "no"
         if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }}
         continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -89,7 +102,7 @@ jobs:
               "env": "${{ matrix.os }} / ${{ 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]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 020295baa1..0df917d3d8 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 # Notes:
 # Actions console encoding causes issues, see test-all & test-spec steps
 #
@@ -28,19 +40,16 @@ jobs:
       MSYSTEM: ${{ matrix.msystem }}
       MSYS2_ARCH: x86_64
       CHOST: "x86_64-w64-mingw32"
-      CFLAGS:   "-march=x86-64 -mtune=generic -O3 -pipe -fstack-protector-strong"
+      CFLAGS:   "-march=x86-64 -mtune=generic -O3 -pipe"
       CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe"
       CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048"
-      LDFLAGS:  "-pipe -fstack-protector-strong"
+      LDFLAGS:  "-pipe"
       UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
     strategy:
       matrix:
         include:
-          - msystem: "MINGW64"
-            base_ruby: 2.6
-            test_task: "check"
-            test-all-opts: "--name=!/TestObjSpace#test_reachable_objects_during_iteration/"
+          # To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
           - msystem: "UCRT64"
             base_ruby: head
             test_task: "check"
@@ -56,15 +65,15 @@ jobs:
           git config --global core.eol lf
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
       - name: Set up Ruby & MSYS2
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
         with:
           ruby-version: ${{ matrix.base_ruby }}
       - name: set env
@@ -150,7 +159,7 @@ jobs:
           make ${{ StartsWith(matrix.test_task, 'spec/') && matrix.test_task || 'test-spec' }}
         if: ${{matrix.test_task == 'check' || matrix.test_task == 'test-spec' || StartsWith(matrix.test_task, 'spec/')}}
 
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -158,7 +167,7 @@ jobs:
               "env": "${{ github.workflow }} ${{ matrix.msystem }} / ${{ matrix.test_task }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/mjit-bindgen.yml b/.github/workflows/mjit-bindgen.yml
index 04c9ac4a9f..26f8a1b2aa 100644
--- a/.github/workflows/mjit-bindgen.yml
+++ b/.github/workflows/mjit-bindgen.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   make:
     strategy:
@@ -24,9 +36,7 @@ jobs:
         include:
           - task: mjit-bindgen
       fail-fast: false
-    env:
-      SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
       - run: mkdir build
@@ -35,28 +45,28 @@ jobs:
         run: |
           echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
       - name: Install libraries
-        env:
-          arch: ${{ matrix.arch }}
         run: |
           set -x
-          arch=${arch:+:${arch/i[3-6]86/i386}}
-          ${arch:+sudo dpkg --add-architecture ${arch#:}}
           sudo apt-get update -q || :
           sudo apt-get install --no-install-recommends -q -y \
-          ${arch:+cross}build-essential${arch/:/-} \
-          libssl-dev${arch} libyaml-dev${arch} libreadline6-dev${arch} \
-          zlib1g-dev${arch} libncurses5-dev${arch} libffi-dev${arch} \
-          libclang1-10${arch} \
-          bison autoconf ruby
-          sudo apt-get install -q -y pkg-config${arch} || :
+          build-essential \
+          libssl-dev libyaml-dev libreadline6-dev \
+          zlib1g-dev libncurses5-dev libffi-dev \
+          libclang1-14 \
+          bison autoconf
+          sudo apt-get install -q -y pkg-config || :
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
+        with:
+          ruby-version: '3.1'
       - name: git config
         run: |
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
@@ -68,18 +78,14 @@ jobs:
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
-        env:
-          arch: ${{ matrix.arch }}
-        run: >-
-          $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
-      - run: $SETARCH make install
-      - run: $SETARCH make ${{ matrix.task }}
+        run: ../src/configure -C --disable-install-doc --prefix=$(pwd)/install --enable-yjit=dev_nodebug
+      - run: make incs
+      - run: make
+      - run: make install
+      - run: make ${{ matrix.task }}
       - run: git diff --exit-code
         working-directory: src
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -87,7 +93,7 @@ jobs:
               "env": "${{ matrix.os }} / ${{ 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]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index b5065288c7..6f7181489a 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -3,32 +3,47 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   make:
     strategy:
       matrix:
-        test_task: [ "check" ] # to make job names consistent
-        jit_opts: [ "--mjit", "--mjit-wait" ]
+        test_task: [check] # to make job names consistent
+        mjit_opts: [--mjit-wait]
       fail-fast: false
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     env:
       TESTOPTS: '-q --tty=no'
-      RUN_OPTS: '--disable-gems ${{ matrix.jit_opts }} --mjit-debug=-ggdb3'
+      RUN_OPTS: '--disable-gems ${{ matrix.mjit_opts }} --mjit-debug=-ggdb3'
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
     steps:
       - run: mkdir build
@@ -42,10 +57,10 @@ jobs:
         run: |
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
@@ -64,31 +79,30 @@ jobs:
       - run: make incs
       - run: make
       - run: sudo make -s install
-      - run: sudo apt-get install gdb # used by test / test-all failure
       - name: Run test
         run: |
-          ulimit -c unlimited
+          unset GNUMAKEFLAGS
           make -s test RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 60
-      - name: Run test-all
-        run: |
-          ulimit -c unlimited
-          make -s test-all RUN_OPTS="$RUN_OPTS"
-        timeout-minutes: 60
+      # - name: Run test-all
+      #   run: |
+      #     ulimit -c unlimited
+      #     make -s test-all RUN_OPTS="$RUN_OPTS"
+      #   timeout-minutes: 60
       - name: Run test-spec
         run: |
-          ulimit -c unlimited
+          unset GNUMAKEFLAGS
           make -s test-spec RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 60
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
               "ci": "GitHub Actions",
-              "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }}",
+              "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.mjit_opts }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000000..5d4474d978
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,18 @@
+name: Start release workflow
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build release package
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/actions/dispatches \
+            -d '{"event_type": "${{ github.ref }}"}'
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
new file mode 100644
index 0000000000..c12a95362d
--- /dev/null
+++ b/.github/workflows/scorecards.yml
@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecards supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '22 4 * * 2'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecards analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@ea651e62978af7915d09fe2e282747c798bf2dab # v2.4.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) Read-only PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecards on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # 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
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.27
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/spec_guards.yml b/.github/workflows/spec_guards.yml
index 7bffe25bb2..4521195a2b 100644
--- a/.github/workflows/spec_guards.yml
+++ b/.github/workflows/spec_guards.yml
@@ -2,47 +2,61 @@ name: Rubyspec Version Guards Check
 
 on:
   push:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
+    paths:
+      - 'spec/**'
+      - '!spec/*.md'
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-      - '**/.document'
+    paths:
+      - 'spec/**'
+      - '!spec/*.md'
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   rubyspec:
     name: Rubyspec
-    runs-on: ubuntu-20.04
-    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+
+    runs-on: ubuntu-22.04
+
+    if: >-
+      ${{!(false
+      || contains(github.event.head_commit.message, '[DOC]')
+      || contains(github.event.head_commit.message, 'Document')
+      || contains(github.event.pull_request.title, '[DOC]')
+      || contains(github.event.pull_request.title, 'Document')
+      || contains(github.event.pull_request.labels.*.name, 'Document')
+      || (github.event_name == 'push' && github.actor == 'dependabot[bot]')
+      )}}
+
     strategy:
       matrix:
         # Specs from ruby/spec should still run on all supported Ruby versions.
         # This also ensures the needed ruby_version_is guards are there, see spec/README.md.
         ruby:
-          - ruby-2.7
           - ruby-3.1
+          - ruby-3.2
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none
+
       - run: gem install webrick
+
       - run: ruby ../mspec/bin/mspec
         working-directory: spec/ruby
         env:
           CHECK_LEAKS: true
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -50,8 +64,8 @@ jobs:
               "env": "${{ github.workflow }} / rubyspec @ ${{ matrix.ruby }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
-        if: ${{ failure() && github.event_name == 'push' }}
+        if: ${{ failure() }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index a1818182a3..4fbca1170e 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   make:
     strategy:
@@ -34,7 +46,6 @@ jobs:
           - test_task: check
             configure: "--enable-shared --enable-load-relative"
           - 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
@@ -42,7 +53,7 @@ jobs:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       RUBY_DEBUG: ci
       SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
       - run: mkdir build
@@ -68,10 +79,10 @@ jobs:
         run: |
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
@@ -116,7 +127,7 @@ jobs:
           TESTS: ${{ matrix.skipped_tests }}
         if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }}
         continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -124,7 +135,7 @@ jobs:
               "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]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
index 553347d727..27920b5821 100644
--- a/.github/workflows/wasm.yml
+++ b/.github/workflows/wasm.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:  # added using https://github.com/step-security/secure-workflows
+  contents: read
+
 jobs:
   make:
     strategy:
@@ -38,7 +50,7 @@ jobs:
       WASI_SDK_VERSION_MINOR: 0
       BINARYEN_VERSION: 109
       WASMTIME_VERSION: v0.33.0
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
       - run: mkdir build
@@ -47,7 +59,7 @@ jobs:
         run: |
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
       - name: Install libraries
@@ -79,6 +91,18 @@ jobs:
           echo "WASI_SDK_PATH=/opt/wasi-sdk" >> $GITHUB_ENV
       - run: ./autogen.sh
         working-directory: src
+
+      - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
+        with:
+          ruby-version: '3.0'
+          bundler: none
+
+      - name: Download config.guess with wasi version
+        run: |
+          rm tool/config.guess tool/config.sub
+          ruby tool/downloader.rb -d tool -e gnu config.guess config.sub
+        working-directory: src
+
       - name: Run configure
         run: |
           ../src/configure \
@@ -103,6 +127,20 @@ jobs:
           ruby ./bootstraptest/runner.rb --ruby="$(which wasmtime) run $PWD/../build/ruby --mapdir /::./ -- " --verbose "--sets=$NO_THREAD_TESTS"
         working-directory: src
 
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} / ${{ matrix.name }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref_name }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: ${{ failure() && github.event_name == 'push' }}
+
 defaults:
   run:
     working-directory: build
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ab9e35d5a3..c2bd4881c2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,90 +26,76 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   make:
     strategy:
       matrix:
         include:
-          - vs: 2019
           - vs: 2022
+            vcvers: -vcvars_ver=14.2
       fail-fast: false
-    runs-on: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
+    runs-on: windows-${{ matrix.vs }}
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     name: VisualStudio ${{ matrix.vs }}
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       PATCH: C:\msys64\usr\bin\patch.exe
-      OS_VER: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
+      OS_VER: windows-${{ matrix.vs }}
     steps:
       - run: md build
         working-directory:
-      - uses: msys2/setup-msys2@v2
+      - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # v2.27.0
         id: setup-msys2
         with:
           update: true
-          install: >-
-            patch
-        if: ${{ env.OS_VER != 'windows-2019' }}
+          install: bison patch
       - name: patch path
         shell: msys2 {0}
         run: echo PATCH=$(cygpath -wa $(command -v patch)) >> $GITHUB_ENV
         if: ${{ steps.setup-msys2.outcome == 'success' }}
-      - uses: actions/cache@v3
-        with:
-          path: C:\vcpkg\downloads
-          key: ${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-vcpkg-download-${{ env.OS_VER }}-
-            ${{ runner.os }}-vcpkg-download-
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: C:\vcpkg\installed
-          key: ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}-${{ github.sha }}
+          key: ${{ runner.os }}-vcpkg-installed-windows-${{ matrix.vs }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-installed-${{ matrix.os }}-
-            ${{ runner.os }}-vcpkg-installed-
+            ${{ runner.os }}-vcpkg-installed-windows-${{ matrix.vs }}-
+            ${{ runner.os }}-vcpkg-installed-windows-
       - name: Install libraries with vcpkg
         run: |
+          iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
+          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
+          scoop install cmake@3.31.6
           vcpkg --triplet x64-windows install libffi libyaml openssl readline zlib
-      - uses: actions/cache@v3
-        with:
-          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-          key: ${{ runner.os }}-chocolatey-${{ env.OS_VER }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-chocolatey-${{ env.OS_VER }}-
-            ${{ runner.os }}-chocolatey-
-      - name: Install libraries with chocolatey
-        run: |
-          # Using Choco-Install for retries, but it doesn't detect failures properly
-          # if you pass multiple package names in a single command.
-          Choco-Install -PackageName winflexbison3
-        shell: pwsh
+        shell:
+          pwsh
       - name: git config
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
       - name: setup env
         # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
         # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
+        # msys2/setup-msys2 installs MSYS2 to D:/a/_temp/msys64/usr/bin
         run: |
-          set VS=${{ matrix.vs }}
-          set VCVARS=${{ matrix.vcvars }}
+          set Path=D:/a/_temp/msys64/usr/bin;%Path%
           if not "%VCVARS%" == "" goto :vcset
-            set VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-            if not exist %VCVARS% set VCVARS="C:\Program Files\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+            set VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+            if not exist %VCVARS% set VCVARS="C:\Program Files\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           :vcset
           set | C:\msys64\usr\bin\sort > old.env
-          call %VCVARS%
+          call %VCVARS% ${{ matrix.vcvers || ''}}
           set TMP=%USERPROFILE%\AppData\Local\Temp
           set TEMP=%USERPROFILE%\AppData\Local\Temp
           set /a TEST_JOBS=(15 * %NUMBER_OF_PROCESSORS% / 10) > nul
@@ -125,7 +120,7 @@ jobs:
       - run: nmake extract-extlibs
       - run: nmake
         env:
-          YACC: win_bison
+          YACC: bison.exe
       - run: nmake test
         timeout-minutes: 5
       - run: nmake test-spec
@@ -134,7 +129,7 @@ jobs:
         env:
           RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --job-status=normal
         timeout-minutes: 60
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -142,7 +137,7 @@ jobs:
               "env": "VS${{ matrix.vs }} / ${{ matrix.test_task || 'check' }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
index ae108d72a5..0b7b9046e9 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -3,12 +3,21 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
   pull_request:
     paths-ignore:
       - 'doc/**'
+      - '**/man'
+      - '**.md'
+      - '**.rdoc'
+      - '**/.document'
+  merge_group:
+    paths-ignore:
+      - 'doc/**'
+      - '**/man'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
@@ -17,13 +26,16 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
+permissions:
+  contents: read
+
 jobs:
   cargo:
     name: Rust cargo test
     # GitHub Action's image seems to already contain a Rust 1.58.0.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       # For now we can't run cargo test --offline because it complains about the
       # capstone dependency, even though the dependency is optional
       #- run: cargo test --offline
@@ -40,19 +52,23 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - test_task: "check-yjit-bindings"
-            configure: "--with-gcc=clang-12 --enable-yjit=dev"
+          - test_task: 'yjit-bindgen'
+            hint: 'To fix: use patch in logs'
+            configure: '--with-gcc=clang-14 --enable-yjit=dev'
+            libclang_path: '/usr/lib/llvm-14/lib/libclang.so.1'
 
           - test_task: "check"
-            configure: "--enable-yjit RUSTC='rustc +1.58.1'" # release build
-            rust_version: "1.58.1"
+            # YJIT should be automatically built in release mode on x86-64 Linux with rustc present
+            #configure: "--enable-yjit RUSTC='rustc +1.58.0'"
+            configure: "RUSTC='rustc +1.58.0'"
+            rust_version: "1.58.0"
 
           - test_task: "check"
             configure: "--enable-yjit=dev"
 
           - test_task: "check"
             configure: "--enable-yjit=dev"
-            yjit_opts: "--yjit-call-threshold=1"
+            yjit_opts: "--yjit-call-threshold=1 --yjit-verify-ctx"
 
           - test_task: "test-all TESTS=--repeat-count=2"
             configure: "--enable-yjit=dev"
@@ -69,7 +85,7 @@ jobs:
       YJIT_BENCH_OPTS: ${{ matrix.yjit_bench_opts }}
       RUBY_DEBUG: ci
       BUNDLE_JOBS: 8 # for yjit-bench
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
       - run: mkdir build
@@ -86,10 +102,10 @@ jobs:
         run: |
           git config --global advice.detachedHead 0
           git config --global init.defaultBranch garbage
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: src
-      - uses: actions/cache@v3
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: src/.downloaded-cache
           key: downloaded-cache
@@ -117,6 +133,9 @@ jobs:
         if: ${{ matrix.test_task == 'check' }}
       - name: Enable YJIT through ENV
         run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV
+      # Check that the binary was built with YJIT
+      - name: Check YJIT enabled
+        run: ./miniruby --yjit -v | grep "+YJIT"
       - 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
@@ -124,6 +143,7 @@ jobs:
           RUBY_TESTOPTS: "-q --tty=no"
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
           PRECHECK_BUNDLED_GEMS: "no"
+          LIBCLANG_PATH: ${{ matrix.libclang_path }}
         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}"
@@ -131,7 +151,7 @@ jobs:
           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
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -139,7 +159,7 @@ jobs:
               "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]
+              "branch": "${{ github.ref_name }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
diff --git a/.gitignore b/.gitignore
index 4bbf24f094..99d32a1825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 *.inc
 *.log
 *.o
+*.o.tmp
 *.obj
 *.old
 *.orig
@@ -25,6 +26,7 @@
 *.sav
 *.sl
 *.so
+*.so.*
 *.swp
 *.yarb
 *~
@@ -145,6 +147,8 @@ lcov*.info
 
 /bin/*.exe
 /bin/*.dll
+/bin/goruby
+/bin/ruby
 
 # /benchmark/
 /benchmark/bm_require.data
@@ -234,12 +238,13 @@ lcov*.info
 
 # MJIT
 /include/ruby-*/*/rb_mjit_min_header-*.h
-/lib/mjit/instruction.rb
+/lib/ruby_vm/mjit/instruction.rb
 /mjit_config.h
 /rb_mjit_header.h
 
 # YJIT
 /yjit-bench
+/yjit_exit_locations.dump
 
 # /wasm/
 /wasm/tests/*.wasm
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 665feba914..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,235 +0,0 @@
-# -*- YAML -*-
-# Copyright (C) 2011 Urabe, Shyouhei.  All rights reserved.
-#
-# This file is  a part of the programming language  Ruby.  Permission is hereby
-# granted,  to either  redistribute  or  modify this  file,  provided that  the
-# conditions  mentioned in  the file  COPYING are  met.  Consult  the  file for
-# details.
-
-# We only manage non-amd64 free pipelines.
-# https://docs.travis-ci.com/user/billing-overview/
-
-language: c
-
-os: linux
-
-if: commit_message !~ /\[DOC\]/
-
-dist: focal
-
-git:
-  quiet: true
-
-cache:
-  ccache: true
-  directories:
-    - $HOME/config_2nd
-    - $HOME/.downloaded-cache
-
-env:
-  global:
-    # The tests skipped in `make test-all`.
-    - TEST_ALL_SKIPPED_TESTS=
-    # The tests executed separately by `make test-all`.
-    - TEST_ALL_SEPARATED_TESTS=
-    # Reset timestamps early
-    - _=$(touch NEWS && find . -type f -exec touch -r NEWS {} +)
-    - CONFIGURE_TTY=no
-    - CCACHE_COMPILERCHECK=none
-    - CCACHE_NOCOMPRESS=1
-    - CCACHE_MAXSIZE=512Mi
-    - NPROC="`nproc`"
-    # JOBS and SETARCH are overridden when necessary; see below.
-    - JOBS=-j$((1+${NPROC}))
-    - SETARCH=
-    - RUBY_PREFIX=/tmp/ruby-prefix
-    - GEMS_FOR_TEST='timezone tzinfo'
-    # https://github.com/travis-ci/travis-build/blob/e411371dda21430a60f61b8f3f57943d2fe4d344/lib/travis/build/bash/travis_apt_get_options.bash#L7
-    - travis_apt_get_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages'
-    - travis_apt_get_options="-yq --no-install-suggests --no-install-recommends $travis_apt_get_options"
-    # -O1 is faster than -O3 in our tests.
-    - optflags=-O1
-    # -g0 disables backtraces when SEGV.  Do not set that.
-    - debugflags=-ggdb3
-
-.org.ruby-lang.ci.matrix-definitions:
-
-  - &gcc-10
-    compiler: gcc-10
-    before_install:
-      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
-      - >-
-        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install
-        ccache
-        gcc-10
-        g++-10
-        libffi-dev
-        libncurses-dev
-        libncursesw5-dev
-        libreadline-dev
-        libssl-dev
-        libyaml-dev
-        openssl
-        zlib1g-dev
-
-  # --------
-
-  - &arm64-linux
-    name: arm64-linux
-    arch: arm64
-    <<: *gcc-10
-
-  - &ppc64le-linux
-    name: ppc64le-linux
-    arch: ppc64le
-    <<: *gcc-10
-
-  - &s390x-linux
-    name: s390x-linux
-    arch: s390x
-    <<: *gcc-10
-
-  - &arm32-linux
-    name: arm32-linux
-    arch: arm64
-    # https://packages.ubuntu.com/focal/crossbuild-essential-armhf
-    compiler: arm-linux-gnueabihf-gcc
-    env:
-      - SETARCH='setarch linux32 --verbose --32bit'
-      # The "TestReadline#test_interrupt_in_other_thread" started failing on arm32
-      # from https://www.travis-ci.com/github/ruby/ruby/jobs/529005145
-      - TEST_ALL_SKIPPED_TESTS=test_interrupt_in_other_thread
-    before_install:
-      - sudo dpkg --add-architecture armhf
-      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
-      - >-
-        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install
-        ccache
-        crossbuild-essential-armhf
-        libc6:armhf
-        libstdc++-10-dev:armhf
-        libffi-dev:armhf
-        libncurses-dev:armhf
-        libncursesw5-dev:armhf
-        libreadline-dev:armhf
-        libssl-dev:armhf
-        libyaml-dev:armhf
-        linux-libc-dev:armhf
-        zlib1g-dev:armhf
-
-matrix:
-  include:
-    # Build every commit (Allowed Failures):
-    - <<: *arm32-linux
-    # Comment out as the 2nd arm64 pipeline is unstable.
-    # - <<: *arm64-linux
-    - <<: *ppc64le-linux
-    - <<: *s390x-linux
-  allow_failures:
-    # We see multiple errors indicating errors on the Travis environment itself in a short while:
-    # https://app.travis-ci.com/github/ruby/ruby/jobs/544382885
-    # https://app.travis-ci.com/github/ruby/ruby/jobs/544361370
-    # It's not a fault of Ruby's arm32 support but just Travis arm32 seems unsable.
-    - name: arm32-linux
-    # - name: arm64-linux
-    # We see "Some worker was crashed." in about 40% of recent ppc64le-linux jobs
-    # e.g. https://app.travis-ci.com/github/ruby/ruby/jobs/530959548
-    - name: ppc64le-linux
-    # Tentatively disable, because often hungs up **after** all tests
-    # have finished successfully and saving caches.
-    - name: s390x-linux
-  fast_finish: true
-
-before_script:
-  - . tool/ci_functions.sh
-  - |-
-    if [ -n "${TEST_ALL_SKIPPED_TESTS}" ]; then
-      TEST_ALL_OPTS="${TEST_ALL_OPTS} $(ci_to_excluded_test_opts "${TEST_ALL_SKIPPED_TESTS}")"
-      if [ -z "${TEST_ALL_SEPARATED_TESTS}" ]; then
-        TEST_ALL_SEPARATED_TESTS="${TEST_ALL_SKIPPED_TESTS}"
-      fi
-    fi
-  - |-
-    if [ -n "${TEST_ALL_SEPARATED_TESTS}" ]; then
-      TEST_ALL_OPTS_SEPARATED="$(ci_to_included_test_opts "${TEST_ALL_SEPARATED_TESTS}")"
-    fi
-  - echo TEST_ALL_OPTS="${TEST_ALL_OPTS}" TEST_ALL_OPTS_SEPARATED="${TEST_ALL_OPTS_SEPARATED}"
-  - rm -fr .ext autom4te.cache
-  - |-
-    [ -d ~/.downloaded-cache ] ||
-    mkdir ~/.downloaded-cache
-  - ln -s ~/.downloaded-cache
-  - "> config.status"
-  - "> .rbconfig.time"
-  - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
-  - make -s $JOBS up
-  - make -s $JOBS srcs
-  - rm -f config.status Makefile rbconfig.rb .rbconfig.time
-  - |-
-    if [ -d ~/config_2nd ]; then
-      cp -pr ~/config_2nd build
-    else
-      mkdir build
-    fi
-  - mkdir config_1st config_2nd gems/src
-  - chmod -R a-w .
-  - chmod -R u+w build config_1st config_2nd gems/src
-  - cd build
-  - |-
-    case "$CC" in
-    gcc*)   CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
-    clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
-    esac
-  - |-
-    [ ! -f config.cache ] ||
-    [ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] ||
-    (set -x; exec rm config.cache)
-  - $SETARCH ../configure -C --disable-install-doc --prefix=$RUBY_PREFIX $CONFIG_FLAG
-  - cp -pr config.cache config.status .ext/include ../config_1st
-  - $SETARCH make reconfig
-  - cp -pr config.cache config.status .ext/include ../config_2nd
-  - (cd .. && exec diff -ru config_1st config_2nd)
-  - chmod u+w ..
-  - rm -rf ~/config_2nd
-  - mv ../config_2nd ~
-  - chmod u-w ..
-  - $SETARCH make -s $JOBS
-  - make -s install
-  - |-
-    [ -z "${GEMS_FOR_TEST}" ] ||
-    $RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
-  - echo "raise 'do not load ~/.irbrc in test'" > ~/.irbrc
-
-script:
-  - $SETARCH make -s test -o showflags TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
-  - ../tool/travis_wait.sh $SETARCH make -s test-all -o exts TESTOPTS="$JOBS -q --tty=no ${TEST_ALL_OPTS}" RUBYOPT="-w"
-  # Run the failing tests separately returning ok status to check if it works,
-  # visualize them.
-  - |
-    if [ -n "${TEST_ALL_OPTS_SEPARATED}" ]; then
-      $SETARCH make -s test-all -o exts TESTOPTS="$JOBS -v --tty=no ${TEST_ALL_OPTS_SEPARATED}" RUBYOPT="-w" || :
-    fi
-  - $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies
-  - $SETARCH make -s -o showflags leaked-globals
-
-# We enable Travis on the specific branches or forked repositories here.
-if: (repo = ruby/ruby AND (branch = master OR branch =~ /^ruby_\d_\d$/)) OR repo != ruby/ruby
-
-# We want to be notified when something happens.
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#ruby-core"
-    on_success: change # [always|never|change] # default: always
-    on_failure: always # [always|never|change] # default: always
-    template:
-      - "%{message} by @%{author}: See %{build_url}"
-
-  webhooks:
-    urls:
-      - secure: mRsoS/UbqDkKkW5p3AEqM27d4SZnV6Gsylo3bm8T/deltQzTsGzZwrm7OIBXZv0UFZdE68XmPlyHfZFLSP2V9QZ7apXMf9/vw0GtcSe1gchtnjpAPF6lYBn7nMCbVPPx9cS0dwL927fjdRM1vj7IKZ2bk4F0lAJ25R25S6teqdk= # ruby-lang slack: ruby/simpler-alerts-bot (travis)
-    on_success: never
-    on_failure: always
-
-  email:
-    - jaruga@ruby-lang.org
diff --git a/LEGAL b/LEGAL
index 9645728efe..0423d57ac9 100644
--- a/LEGAL
+++ b/LEGAL
@@ -979,7 +979,6 @@ mentioned below.
     {MIT License}[rdoc-label:label-MIT+License]
 
 [lib/rubygems/resolver/molinillo]
-[lib/bundler/vendor/molinillo]
 
   molinillo is under the following license.
 
@@ -988,6 +987,15 @@ mentioned below.
 
     {MIT License}[rdoc-label:label-MIT+License]
 
+[lib/bundler/vendor/pub_grub]
+
+  pub_grub is under the following license.
+
+  >>>
+    Copyright (c) 2018 John Hawthorn
+
+    {MIT License}[rdoc-label:label-MIT+License]
+
 [lib/bundler/vendor/connection_pool]
 
   connection_pool is under the following license.
diff --git a/NEWS.md b/NEWS.md
index 53827f98d5..f6c3c6fc97 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -23,13 +23,13 @@ Note that each entry is kept to a minimum, see links for details.
 * A proc that accepts a single positional argument and keywords will
   no longer autosplat. [[Bug #18633]]
 
-  ```ruby
-  proc{|a, **k| a}.call([1, 2])
-  # Ruby 3.1 and before
-  # => 1
-  # Ruby 3.2 and after
-  # => [1, 2]
-  ```
+    ```ruby
+    proc{|a, **k| a}.call([1, 2])
+    # Ruby 3.1 and before
+    # => 1
+    # Ruby 3.2 and after
+    # => [1, 2]
+    ```
 
 * Constant assignment evaluation order for constants set on explicit
   objects has been made consistent with single attribute assignment
@@ -39,24 +39,24 @@ Note that each entry is kept to a minimum, see links for details.
     foo::BAR = baz
     ```
 
-  `foo` is now called before `baz`. Similarly, for multiple assignments
-  to constants,  left-to-right evaluation order is used. With this
-  code:
+    `foo` is now called before `baz`. Similarly, for multiple assignments
+    to constants,  left-to-right evaluation order is used. With this
+    code:
 
     ```ruby
-      foo1::BAR1, foo2::BAR2 = baz1, baz2
+    foo1::BAR1, foo2::BAR2 = baz1, baz2
     ```
 
-  The following evaluation order is now used:
+    The following evaluation order is now used:
 
-  1. `foo1`
-  2. `foo2`
-  3. `baz1`
-  4. `baz2`
+    1. `foo1`
+    2. `foo2`
+    3. `baz1`
+    4. `baz2`
 
-  [[Bug #15928]]
+    [[Bug #15928]]
 
-* Find pattern is no longer experimental.
+* "Find pattern" is no longer experimental.
   [[Feature #18585]]
 
 * Methods taking a rest parameter (like `*args`) and wishing to delegate keyword
@@ -90,55 +90,151 @@ 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. Enabled using
-  `Coverage.setup(:all)` or `Coverge.setup(eval: true)`. [[Feature #19008]]
-
-* `Coverage.supported?(mode)` enables detection of what coverage modes are
-  supported. [[Feature #19026]]
-
-## Command line options
-
 ## Core classes updates
 
 Note: We're only listing outstanding class updates.
 
+* Fiber
+
+    * Introduce Fiber.[] and Fiber.[]= for inheritable fiber storage.
+      Introduce Fiber#storage and Fiber#storage= (experimental) for
+      getting and resetting the current storage.  Introduce
+      `Fiber.new(storage:)` for setting the storage when creating a
+      fiber. [[Feature #19078]]
+
+        Existing Thread and Fiber local variables can be tricky to use.
+        Thread-local variables are shared between all fibers, making it
+        hard to isolate, while Fiber-local variables can be hard to
+        share.  It is often desirable to define unit of execution
+        ("execution context") such that some state is shared between all
+        fibers and threads created in that context.  This is what Fiber
+        storage provides.
+
+        ```ruby
+        def log(message)
+          puts "#{Fiber[:request_id]}: #{message}"
+        end
+
+        def handle_requests
+          while request = read_request
+            Fiber.schedule do
+              Fiber[:request_id] = SecureRandom.uuid
+
+              request.messages.each do |message|
+                Fiber.schedule do
+                  log("Handling #{message}") # Log includes inherited request_id.
+                end
+              end
+            end
+          end
+        end
+        ```
+
+        You should generally consider Fiber storage for any state which
+        you want to be shared implicitly between all fibers and threads
+        created in a given context, e.g. a connection pool, a request
+        id, a logger level, environment variables, configuration, etc.
+
+* Fiber::Scheduler
+
+    * Introduce `Fiber::Scheduler#io_select` for non-blocking IO.select.
+      [[Feature #19060]]
+
+* IO
+
+    * Introduce IO#timeout= and IO#timeout which can cause
+      IO::TimeoutError to be raised if a blocking operation exceeds the
+      specified timeout. [[Feature #18630]]
+
+        ```ruby
+        STDIN.timeout = 1
+        STDIN.read # => Blocking operation timed out! (IO::TimeoutError)
+        ```
+
+    * Introduce `IO.new(..., path:)` and promote `File#path` to `IO#path`.
+      [[Feature #19036]]
+
+* Class
+
+    * Class#attached_object, which returns the object for which
+      the receiver is the singleton class. Raises TypeError if the
+      receiver is not a singleton class.
+      [[Feature #12084]]
+
+        ```ruby
+        class Foo; end
+
+        Foo.singleton_class.attached_object        #=> Foo
+        Foo.new.singleton_class.attached_object    #=> #<Foo:0x000000010491a370>
+        Foo.attached_object                        #=> TypeError: `Foo' is not a singleton class
+        nil.singleton_class.attached_object        #=> TypeError: `NilClass' is not a singleton class
+        ```
+
 * Data
+
     * New core class to represent simple immutable value object. The class is
-      similar to `Struct` and partially shares an implementation, but has more
+      similar to Struct and partially shares an implementation, but has more
       lean and strict API. [[Feature #16122]]
 
+        ```ruby
+        Measure = Data.define(:amount, :unit)
+        distance = Measure.new(100, 'km')            #=> #<data Measure amount=100, unit="km">
+        weight = Measure.new(amount: 50, unit: 'kg') #=> #<data Measure amount=50, unit="kg">
+        weight.with(amount: 40)                      #=> #<data Measure amount=40, unit="kg">
+        weight.amount                                #=> 50
+        weight.amount = 40                           #=> NoMethodError: undefined method `amount='
+        ```
+
 * 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.
+      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]]
+    * Limit maximum encoding set size by 256.
+      If exceeding maximum size, `EncodingError` will be raised. [[Feature #18949]]
 
 * Enumerator
+
     * Enumerator.product has been added.  Enumerator::Product is the implementation. [[Feature #18685]]
 
+* Exception
+
+    * Exception#detailed_message has been added.
+      The default error printer calls this method on the Exception object
+      instead of #message. [[Feature #18564]]
+
 * Hash
+
     * Hash#shift now always returns nil if the hash is
       empty, instead of returning the default value or
       calling the default proc. [[Bug #16908]]
 
 * Integer
+
     * Integer#ceildiv has been added. [[Feature #18809]]
 
 * Kernel
+
     * Kernel#binding raises RuntimeError if called from a non-Ruby frame
       (such as a method defined in C). [[Bug #18487]]
 
 * MatchData
+
     * MatchData#byteoffset has been added. [[Feature #13110]]
+    * MatchData#deconstruct has been added. [[Feature #18821]]
+    * MatchData#deconstruct_keys has been added. [[Feature #18821]]
 
 * Module
+
     * Module.used_refinements has been added. [[Feature #14332]]
     * Module#refinements has been added. [[Feature #12737]]
     * Module#const_added has been added. [[Feature #17881]]
     * Module#undefined_instance_methods has been added. [[Feature #12655]]
 
 * Proc
+
     * Proc#dup returns an instance of subclass. [[Bug #17545]]
     * Proc#parameters now accepts lambda keyword. [[Feature #15357]]
 
@@ -146,91 +242,335 @@ Note: We're only listing outstanding class updates.
     * Added `RLIMIT_NPTS` constant to FreeBSD platform
 
 * Regexp
+
+    * The cache-based optimization is introduced.
+      Many (but not all) Regexp matching is now in linear time, which
+      will prevent regular expression denial of service (ReDoS)
+      vulnerability. [[Feature #19104]]
+
+    * Regexp.linear_time? is introduced. [[Feature #19194]]
+
     * Regexp.new now supports passing the regexp flags not only as an Integer,
       but also as a String.  Unknown flags raise ArgumentError.
       Otherwise, anything other than `true`, `false`, `nil` or Integer will be warned.
       [[Feature #18788]]
 
+    * Regexp.timeout= has been added. Also, Regexp.new new supports timeout keyword.
+      See [[Feature #17837]]
+
 * Refinement
+
     * Refinement#refined_class has been added. [[Feature #12737]]
 
+* RubyVM::AbstractSyntaxTree
+
+    * Add `error_tolerant` option for `parse`, `parse_file` and `of`. [[Feature #19013]]
+      With this option
+
+        1. SyntaxError is suppressed
+        2. AST is returned for invalid input
+        3. `end` is complemented when a parser reaches to the end of input but `end` is insufficient
+        4. `end` is treated as keyword based on indent
+
+        ```ruby
+        # Without error_tolerant option
+        root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY)
+        def m
+          a = 10
+          if
+        end
+        RUBY
+        # => <internal:ast>:33:in `parse': syntax error, unexpected `end' (SyntaxError)
+
+        # With error_tolerant option
+        root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY, error_tolerant: true)
+        def m
+          a = 10
+          if
+        end
+        RUBY
+        p root # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-4:3>
+
+        # `end` is treated as keyword based on indent
+        root = RubyVM::AbstractSyntaxTree.parse(<<~RUBY, error_tolerant: true)
+        module Z
+          class Foo
+            foo.
+          end
+
+          def bar
+          end
+        end
+        RUBY
+        p root.children[-1].children[-1].children[-1].children[-2..-1]
+        # => [#<RubyVM::AbstractSyntaxTree::Node:CLASS@2:2-4:5>, #<RubyVM::AbstractSyntaxTree::Node:DEFN@6:2-7:5>]
+        ```
+
+    * Add `keep_tokens` option for `parse`, `parse_file` and `of`. Add `#tokens` and `#all_tokens`
+      for RubyVM::AbstractSyntaxTree::Node [[Feature #19070]]
+
+        ```ruby
+        root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2", keep_tokens: true)
+        root.tokens # => [[0, :tIDENTIFIER, "x", [1, 0, 1, 1]], [1, :tSP, " ", [1, 1, 1, 2]], ...]
+        root.tokens.map{_1[2]}.join # => "x = 1 + 2"
+        ```
+
 * Set
-    * 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`
+    * 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.
 
 * 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]]
+    * Update Unicode to Version 15.0.0 and Emoji Version 15.0. [[Feature #18639]]
       (also applies to Regexp)
     * String#bytesplice has been added.  [[Feature #18598]]
+    * String#dedup has been added as an alias to String#-@.  [[Feature #18595]]
 
 * Struct
+
     * A Struct class can also be initialized with keyword arguments
-      without `keyword_init: true` on `Struct.new` [[Feature #16806]]
+      without `keyword_init: true` on Struct.new [[Feature #16806]]
+
+        ```ruby
+        Post = Struct.new(:id, :name)
+        Post.new(1, "hello") #=> #<struct Post id=1, name="hello">
+        # From Ruby 3.2, the following code also works without keyword_init: true.
+        Post.new(id: 1, name: "hello") #=> #<struct Post id=1, name="hello">
+        ```
+
+* Thread
+
+    * Thread.each_caller_location is added. [[Feature #16663]]
+
+* Thread::Queue
+
+    * Thread::Queue#pop(timeout: sec) is added. [[Feature #18774]]
+
+* Thread::SizedQueue
+
+    * Thread::SizedQueue#pop(timeout: sec) is added. [[Feature #18774]]
+    * Thread::SizedQueue#push(timeout: sec) is added. [[Feature #18944]]
+
+* Time
+
+    * Time#deconstruct_keys is added, allowing to use Time instances
+      in pattern-matching expressions [[Feature #19071]]
+
+    * Time.new now can parse a string like generated by Time#inspect
+      and return a Time instance based on the given argument.
+      [[Feature #18033]]
+
+* SyntaxError
+    * SyntaxError#path has been added.  [[Feature #19138]]
 
 * TracePoint
+
     * TracePoint#binding now returns `nil` for `c_call`/`c_return` TracePoints.
       [[Bug #18487]]
     * TracePoint#enable `target_thread` keyword argument now defaults to the
-      current thread if `target` and `target_line` keyword arguments are not
-      passed. [[Bug #16889]]
+      current thread if a block is given and `target` and `target_line` keyword
+      arguments are not passed. [[Bug #16889]]
+
+* UnboundMethod
+
+    * `UnboundMethod#==` returns `true` if the actual method is same. For example,
+      `String.instance_method(:object_id) == Array.instance_method(:object_id)`
+      returns `true`. [[Feature #18798]]
+
+    * `UnboundMethod#inspect` does not show the receiver of `instance_method`.
+      For example `String.instance_method(:object_id).inspect` returns
+      `"#<UnboundMethod: Kernel#object_id()>"`
+      (was `"#<UnboundMethod: String(Kernel)#object_id()>"`).
+
+* GC
+
+    * Expose `need_major_gc` via `GC.latest_gc_info`. [GH-6791]
+
+* ObjectSpace
+
+    * `ObjectSpace.dump_all` dump shapes as well. [GH-6868]
 
 ## Stdlib updates
 
+* Bundler
+
+    * Bundler now uses [PubGrub] resolver instead of [Molinillo] for performance improvement.
+    * Add --ext=rust support to bundle gem for creating simple gems with Rust extensions.
+      [[GH-rubygems-6149]]
+    * Make cloning git repos faster [[GH-rubygems-4475]]
+
+* RubyGems
+
+    * Add mswin support for cargo builder. [[GH-rubygems-6167]]
+
+* CGI
+
+    * `CGI.escapeURIComponent` and `CGI.unescapeURIComponent` are added.
+      [[Feature #18822]]
+
+* Coverage
+
+    * `Coverage.setup` now accepts `eval: true`. By this, `eval` and related methods are
+      able to generate code coverage. [[Feature #19008]]
+
+    * `Coverage.supported?(mode)` enables detection of what coverage modes are
+      supported. [[Feature #19026]]
+
+* Date
+
+    * Added `Date#deconstruct_keys` and `DateTime#deconstruct_keys` same as [[Feature #19071]]
+
+* ERB
+
+    * `ERB::Util.html_escape` is made faster than `CGI.escapeHTML`.
+        * It no longer allocates a String object when no character needs to be escaped.
+        * It skips calling `#to_s` method when an argument is already a String.
+        * `ERB::Escape.html_escape` is added as an alias to `ERB::Util.html_escape`,
+          which has not been monkey-patched by Rails.
+    * `ERB::Util.url_encode` is made faster using `CGI.escapeURIComponent`.
+    * `-S` option is removed from `erb` command.
+
+* FileUtils
+
+    * Add FileUtils.ln_sr method and `relative:` option to FileUtils.ln_s.
+      [[Feature #18925]]
+
+* IRB
+
+    * debug.gem integration commands have been added: `debug`, `break`, `catch`,
+      `next`, `delete`, `step`, `continue`, `finish`, `backtrace`, `info`
+        * They work even if you don't have `gem "debug"` in your Gemfile.
+        * See also: [What's new in Ruby 3.2's IRB?](https://st0012.dev/whats-new-in-ruby-3-2-irb)
+    * More Pry-like commands and features have been added.
+        * `edit` and `show_cmds` (like Pry's `help`) are added.
+        * `ls` takes `-g` or `-G` option to filter out outputs.
+        * `show_source` is aliased from `$` and accepts unquoted inputs.
+        * `whereami` is aliased from `@`.
+
+* Net::Protocol
+
+    * Improve `Net::BufferedIO` performance. [[GH-net-protocol-14]]
+
+* Pathname
+
+    * Added `Pathname#lutime`. [[GH-pathname-20]]
+
+* 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`
+
 * SyntaxSuggest
 
-  * The feature of `syntax_suggest` formerly `dead_end` is integrated in Ruby.
-    [[Feature #18159]]
+    * The feature of `syntax_suggest` formerly `dead_end` is integrated in Ruby.
+      [[Feature #18159]]
+
+* UNIXSocket
+
+    * Add support for UNIXSocket on Windows. Emulate anonymous sockets. Add
+      support for File.socket? and File::Stat#socket? where possible.
+      [[Feature #19135]]
 
 *   The following default gems are updated.
-    * RubyGems 3.4.0.dev
-    * bigdecimal 3.1.2
-    * bundler 2.4.0.dev
-    * cgi 0.3.3
-    * date 3.2.3
-    * error_highlight 0.4.0
-    * etc 1.4.0
-    * io-console 0.5.11
-    * io-nonblock 0.1.1
-    * io-wait 0.3.0.pre
-    * ipaddr 1.2.4
-    * irb 1.4.2
-    * json 2.6.2
-    * logger 1.5.1
-    * net-http 0.2.2
-    * net-protocol 0.1.3
+
+    * RubyGems 3.4.1
+    * abbrev 0.1.1
+    * benchmark 0.2.1
+    * bigdecimal 3.1.3
+    * bundler 2.4.1
+    * cgi 0.3.6
+    * csv 3.2.6
+    * date 3.3.3
+    * delegate 0.3.0
+    * did_you_mean 1.6.3
+    * digest 3.1.1
+    * drb 2.1.1
+    * english 0.7.2
+    * erb 4.0.2
+    * error_highlight 0.5.1
+    * etc 1.4.2
+    * fcntl 1.0.2
+    * fiddle 1.1.1
+    * fileutils 1.7.0
+    * forwardable 1.3.3
+    * getoptlong 0.2.0
+    * io-console 0.6.0
+    * io-nonblock 0.2.0
+    * io-wait 0.3.0
+    * ipaddr 1.2.5
+    * irb 1.6.2
+    * json 2.6.3
+    * logger 1.5.3
+    * mutex_m 0.1.2
+    * net-http 0.4.0
+    * net-protocol 0.2.1
+    * nkf 0.1.2
+    * open-uri 0.3.0
+    * open3 0.1.2
+    * openssl 3.1.0
+    * optparse 0.3.1
     * ostruct 0.5.5
-    * psych 5.0.0.dev
-    * reline 0.3.1
-    * securerandom 0.2.0
+    * pathname 0.2.1
+    * pp 0.4.0
+    * pstore 0.1.2
+    * psych 5.0.1
+    * racc 1.6.2
+    * rdoc 6.5.0
+    * readline-ext 0.1.5
+    * reline 0.3.2
+    * resolv 0.2.2
+    * resolv-replace 0.1.1
+    * securerandom 0.2.2
     * set 1.0.3
-    * stringio 3.0.3
-    * syntax_suggest 0.0.1
-    * timeout 0.3.0
+    * stringio 3.0.4
+    * strscan 3.0.5
+    * syntax_suggest 1.0.2
+    * syslog 0.1.1
+    * tempfile 0.1.3
+    * time 0.2.1
+    * timeout 0.3.1
+    * tmpdir 0.1.3
+    * tsort 0.1.1
+    * un 0.2.1
+    * uri 0.12.0
+    * weakref 0.1.2
+    * win32ole 1.8.9
+    * yaml 0.2.1
+    * zlib 3.0.0
+
 *   The following bundled gems are updated.
+
     * minitest 5.16.3
-    * test-unit 3.5.5
-    * net-imap 0.3.1
+    * power_assert 2.0.3
+    * test-unit 3.5.7
+    * net-ftp 0.2.0
+    * net-imap 0.3.4
     * net-pop 0.1.2
-    * net-smtp 0.3.2
-    * rbs 2.6.0
+    * net-smtp 0.3.3
+    * rbs 2.8.2
     * typeprof 0.21.3
-    * debug 1.6.2
-*   The following default gems are now bundled gems.
+    * debug 1.7.1
+
+See GitHub releases like [GitHub Releases of Logger](https://github.com/ruby/logger/releases) or changelog for details of the default gems or bundled gems.
+
+## Supported platforms
+
+* WebAssembly/WASI is added. See [wasm/README.md] and [ruby.wasm] for more details. [[Feature #18462]]
 
 ## Compatibility issues
 
-Note: Excluding feature bug fixes.
+* `String#to_c` currently treat a sequence of underscores as an end of Complex
+  string. [[Bug #19087]]
+
+* Now `ENV.clone` raises `TypeError` as well as `ENV.dup` [[Bug #17767]]
 
 ### Removed constants
 
@@ -252,16 +592,77 @@ The following deprecated methods are removed.
   [[Feature #16131]]
 * `Kernel#trust`, `Kernel#untrust`, `Kernel#untrusted?`
   [[Feature #16131]]
+* `Method#public?`, `Method#private?`, `Method#protected?`,
+  `UnboundMethod#public?`, `UnboundMethod#private?`, `UnboundMethod#protected?`
+  [[Bug #18729]] [[Bug #18751]] [[Bug #18435]]
+
+### Source code incompatibility of extension libraries
+
+* Extension libraries provide PRNG, subclasses of Random, need updates.
+  See [PRNG update] below for more information. [[Bug #19100]]
+
+### Error printer
+
+* Ruby no longer escapes control characters and backslashes in an
+  error message. [[Feature #18367]]
+
+### Constant lookup when defining a class/module
+
+* When defining a class/module directly under the Object class by class/module
+  statement, if there is already a class/module defined by `Module#include`
+  with the same name, the statement was handled as "open class" in Ruby 3.1 or before.
+  Since Ruby 3.2, a new class is defined instead. [[Feature #18832]]
 
 ## Stdlib compatibility issues
 
-* `Psych` no longer bundles libyaml sources.
-  And also `Fiddle` no longer bundles libffi sources.
+* Psych no longer bundles libyaml sources.
+  And also Fiddle no longer bundles libffi sources.
   Users need to install the libyaml/libffi library themselves via the package
-  system. [[Feature #18571]]
+  manager like apt, yum, brew, etc.
+
+    Psych and fiddle supported the static build with specific version of libyaml
+    and libffi sources. You can build psych with libyaml-0.2.5 like this.
+
+    ```bash
+    $ ./configure --with-libyaml-source-dir=/path/to/libyaml-0.2.5
+    ```
+
+    And you can build fiddle with libffi-3.4.4 like this.
+
+    ```bash
+    $ ./configure --with-libffi-source-dir=/path/to/libffi-3.4.4
+    ```
+
+    [[Feature #18571]]
+
+* Check cookie name/path/domain characters in `CGI::Cookie`. [[CVE-2021-33621]]
+
+* `URI.parse` return empty string in host instead of nil. [[sec-156615]]
 
 ## C API updates
 
+### Updated C APIs
+
+The following APIs are updated.
+
+* PRNG update
+
+    `rb_random_interface_t` in ruby/random.h updated and versioned.
+    Extension libraries which use this interface and built for older
+    versions need to rebuild with adding `init_int32` function.
+
+### Added C APIs
+
+* `VALUE rb_hash_new_capa(long capa)` was added to created hashes with the desired capacity.
+* `rb_internal_thread_add_event_hook` and `rb_internal_thread_add_event_hook` were added to instrument threads scheduling.
+  The following events are available:
+    * `RUBY_INTERNAL_THREAD_EVENT_STARTED`
+    * `RUBY_INTERNAL_THREAD_EVENT_READY`
+    * `RUBY_INTERNAL_THREAD_EVENT_RESUMED`
+    * `RUBY_INTERNAL_THREAD_EVENT_SUSPENDED`
+    * `RUBY_INTERNAL_THREAD_EVENT_EXITED`
+* `rb_debug_inspector_current_depth` and `rb_debug_inspector_frame_depth` are added for debuggers.
+
 ### Removed C APIs
 
 The following deprecated APIs are removed.
@@ -271,64 +672,149 @@ The following deprecated APIs are removed.
 
 ## Implementation improvements
 
-* Fixed several race conditions in `Kernel#autoload`. [[Bug #18782]]
+* Fixed several race conditions in Kernel#autoload. [[Bug #18782]]
+* Cache invalidation for expressions referencing constants is now
+  more fine-grained. `RubyVM.stat(:global_constant_state)` was
+  removed because it was closely tied to the previous caching scheme
+  where setting any constant invalidates all caches in the system.
+  New keys, `:constant_cache_invalidations` and `:constant_cache_misses`,
+  were introduced to help with use cases for `:global_constant_state`.
+  [[Feature #18589]]
+* The cache-based optimization for Regexp matching is introduced.
+  [[Feature #19104]]
+* [Variable Width Allocation](https://shopify.engineering/ruby-variable-width-allocation)
+  is now enabled by default. [[Feature #18239]]
+* Added a new instance variable caching mechanism, called object shapes, which
+  improves inline cache hits for most objects and allows us to generate very
+  efficient JIT code. Objects whose instance variables are defined in a
+  consistent order will see the most performance benefits.
+  [[Feature #18776]]
+* Speed up marking instruction sequences by using a bitmap to find "markable"
+  objects.  This change results in faster major collections.
+  [[Feature #18875]]
 
 ## JIT
 
 ### YJIT
 
-* Support arm64 / aarch64 on UNIX platforms.
-* Building YJIT requires Rust 1.58.1+. [[Feature #18481]]
+* YJIT is no longer experimental
+    * Has been tested on production workloads for over a year and proven to be quite stable.
+* YJIT now supports both x86-64 and arm64/aarch64 CPUs on Linux, MacOS, BSD and other UNIX platforms.
+    * This release brings support for Mac M1/M2, AWS Graviton and Raspberry Pi 4.
+* Building YJIT now requires Rust 1.58.0+. [[Feature #18481]]
+    * In order to ensure that CRuby is built with YJIT, please install `rustc` >= 1.58.0
+      before running `./configure`
+    * Please reach out to the YJIT team should you run into any issues.
+* Physical memory for JIT code is lazily allocated. Unlike Ruby 3.1,
+  the RSS of a Ruby process is minimized because virtual memory pages
+  allocated by `--yjit-exec-mem-size` will not be mapped to physical
+  memory pages until actually utilized by JIT code.
+* Introduce Code GC that frees all code pages when the memory consumption
+  by JIT code reaches `--yjit-exec-mem-size`.
+    * `RubyVM::YJIT.runtime_stats` returns Code GC metrics in addition to
+      existing `inline_code_size` and `outlined_code_size` keys:
+      `code_gc_count`, `live_page_count`, `freed_page_count`, and `freed_code_size`.
+* Most of the statistics produced by `RubyVM::YJIT.runtime_stats` are now available in release builds.
+    * Simply run ruby with `--yjit-stats` to compute and dump stats (incurs some run-time overhead).
+* YJIT is now optimized to take advantage of object shapes. [[Feature #18776]]
+* Take advantage of finer-grained constant invalidation to invalidate less code when defining new constants. [[Feature #18589]]
+* The default `--yjit-exec-mem-size` is changed to 64 (MiB).
+* The default `--yjit-call-threshold` is changed to 30.
 
 ### MJIT
 
-## Static analysis
-
-### RBS
-
-### TypeProf
-
-## Debugger
-
-## error_highlight
-
-## IRB Autocomplete and Document Display
-
-## Miscellaneous changes
-
-[Feature #12005]: https://bugs.ruby-lang.org/issues/12005
-[Feature #12655]: https://bugs.ruby-lang.org/issues/12655
-[Feature #12737]: https://bugs.ruby-lang.org/issues/12737
-[Feature #13110]: https://bugs.ruby-lang.org/issues/13110
-[Feature #14332]: https://bugs.ruby-lang.org/issues/14332
-[Feature #15231]: https://bugs.ruby-lang.org/issues/15231
-[Feature #15357]: https://bugs.ruby-lang.org/issues/15357
-[Bug #15928]:     https://bugs.ruby-lang.org/issues/15928
-[Feature #16131]: https://bugs.ruby-lang.org/issues/16131
-[Bug #16466]:     https://bugs.ruby-lang.org/issues/16466
-[Feature #16806]: https://bugs.ruby-lang.org/issues/16806
-[Bug #16889]:     https://bugs.ruby-lang.org/issues/16889
-[Bug #16908]:     https://bugs.ruby-lang.org/issues/16908
-[Feature #16989]: https://bugs.ruby-lang.org/issues/16989
-[Feature #17351]: https://bugs.ruby-lang.org/issues/17351
-[Feature #17391]: https://bugs.ruby-lang.org/issues/17391
-[Bug #17545]:     https://bugs.ruby-lang.org/issues/17545
-[Feature #17881]: https://bugs.ruby-lang.org/issues/17881
-[Feature #18037]: https://bugs.ruby-lang.org/issues/18037
-[Feature #18159]: https://bugs.ruby-lang.org/issues/18159
-[Feature #18351]: https://bugs.ruby-lang.org/issues/18351
-[Bug #18487]:     https://bugs.ruby-lang.org/issues/18487
-[Feature #18571]: https://bugs.ruby-lang.org/issues/18571
-[Feature #18585]: https://bugs.ruby-lang.org/issues/18585
-[Feature #18598]: https://bugs.ruby-lang.org/issues/18598
-[Bug #18625]:     https://bugs.ruby-lang.org/issues/18625
-[Bug #18633]:     https://bugs.ruby-lang.org/issues/18633
-[Feature #18685]: https://bugs.ruby-lang.org/issues/18685
-[Bug #18782]:     https://bugs.ruby-lang.org/issues/18782
-[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
-[Feature #19026]: https://bugs.ruby-lang.org/issues/19026
-[Feature #16122]: https://bugs.ruby-lang.org/issues/16122
+* The MJIT compiler is re-implemented in Ruby as `ruby_vm/mjit/compiler`.
+* MJIT compiler is executed under a forked Ruby process instead of
+  doing it in a native thread called MJIT worker. [[Feature #18968]]
+    * As a result, Microsoft Visual Studio (MSWIN) is no longer supported.
+* MinGW is no longer supported. [[Feature #18824]]
+* Rename `--mjit-min-calls` to `--mjit-call-threshold`.
+* Change default `--mjit-max-cache` back from 10000 to 100.
+
+[Feature #12005]:     https://bugs.ruby-lang.org/issues/12005
+[Feature #12084]:     https://bugs.ruby-lang.org/issues/12084
+[Feature #12655]:     https://bugs.ruby-lang.org/issues/12655
+[Feature #12737]:     https://bugs.ruby-lang.org/issues/12737
+[Feature #13110]:     https://bugs.ruby-lang.org/issues/13110
+[Feature #14332]:     https://bugs.ruby-lang.org/issues/14332
+[Feature #15231]:     https://bugs.ruby-lang.org/issues/15231
+[Feature #15357]:     https://bugs.ruby-lang.org/issues/15357
+[Bug #15928]:         https://bugs.ruby-lang.org/issues/15928
+[Feature #16122]:     https://bugs.ruby-lang.org/issues/16122
+[Feature #16131]:     https://bugs.ruby-lang.org/issues/16131
+[Bug #16466]:         https://bugs.ruby-lang.org/issues/16466
+[Feature #16663]:     https://bugs.ruby-lang.org/issues/16663
+[Feature #16806]:     https://bugs.ruby-lang.org/issues/16806
+[Bug #16889]:         https://bugs.ruby-lang.org/issues/16889
+[Bug #16908]:         https://bugs.ruby-lang.org/issues/16908
+[Feature #16989]:     https://bugs.ruby-lang.org/issues/16989
+[Feature #17351]:     https://bugs.ruby-lang.org/issues/17351
+[Feature #17391]:     https://bugs.ruby-lang.org/issues/17391
+[Bug #17545]:         https://bugs.ruby-lang.org/issues/17545
+[Bug #17767]:         https://bugs.ruby-lang.org/issues/17767
+[Feature #17837]:     https://bugs.ruby-lang.org/issues/17837
+[Feature #17881]:     https://bugs.ruby-lang.org/issues/17881
+[Feature #18033]:     https://bugs.ruby-lang.org/issues/18033
+[Feature #18159]:     https://bugs.ruby-lang.org/issues/18159
+[Feature #18239]:     https://bugs.ruby-lang.org/issues/18239#note-17
+[Feature #18351]:     https://bugs.ruby-lang.org/issues/18351
+[Feature #18367]:     https://bugs.ruby-lang.org/issues/18367
+[Bug #18435]:         https://bugs.ruby-lang.org/issues/18435
+[Feature #18462]:     https://bugs.ruby-lang.org/issues/18462
+[Feature #18481]:     https://bugs.ruby-lang.org/issues/18481
+[Bug #18487]:         https://bugs.ruby-lang.org/issues/18487
+[Feature #18564]:     https://bugs.ruby-lang.org/issues/18564
+[Feature #18571]:     https://bugs.ruby-lang.org/issues/18571
+[Feature #18585]:     https://bugs.ruby-lang.org/issues/18585
+[Feature #18589]:     https://bugs.ruby-lang.org/issues/18589
+[Feature #18595]:     https://bugs.ruby-lang.org/issues/18595
+[Feature #18598]:     https://bugs.ruby-lang.org/issues/18598
+[Bug #18625]:         https://bugs.ruby-lang.org/issues/18625
+[Feature #18630]:     https://bugs.ruby-lang.org/issues/18630
+[Bug #18633]:         https://bugs.ruby-lang.org/issues/18633
+[Feature #18639]:     https://bugs.ruby-lang.org/issues/18639
+[Feature #18685]:     https://bugs.ruby-lang.org/issues/18685
+[Bug #18729]:         https://bugs.ruby-lang.org/issues/18729
+[Bug #18751]:         https://bugs.ruby-lang.org/issues/18751
+[Feature #18774]:     https://bugs.ruby-lang.org/issues/18774
+[Feature #18776]:     https://bugs.ruby-lang.org/issues/18776
+[Bug #18782]:         https://bugs.ruby-lang.org/issues/18782
+[Feature #18788]:     https://bugs.ruby-lang.org/issues/18788
+[Feature #18798]:     https://bugs.ruby-lang.org/issues/18798
+[Feature #18809]:     https://bugs.ruby-lang.org/issues/18809
+[Feature #18821]:     https://bugs.ruby-lang.org/issues/18821
+[Feature #18822]:     https://bugs.ruby-lang.org/issues/18822
+[Feature #18824]:     https://bugs.ruby-lang.org/issues/18824
+[Feature #18832]:     https://bugs.ruby-lang.org/issues/18832
+[Feature #18875]:     https://bugs.ruby-lang.org/issues/18875
+[Feature #18925]:     https://bugs.ruby-lang.org/issues/18925
+[Feature #18944]:     https://bugs.ruby-lang.org/issues/18944
+[Feature #18949]:     https://bugs.ruby-lang.org/issues/18949
+[Feature #18968]:     https://bugs.ruby-lang.org/issues/18968
+[Feature #19008]:     https://bugs.ruby-lang.org/issues/19008
+[Feature #19013]:     https://bugs.ruby-lang.org/issues/19013
+[Feature #19026]:     https://bugs.ruby-lang.org/issues/19026
+[Feature #19036]:     https://bugs.ruby-lang.org/issues/19036
+[Feature #19060]:     https://bugs.ruby-lang.org/issues/19060
+[Feature #19070]:     https://bugs.ruby-lang.org/issues/19070
+[Feature #19071]:     https://bugs.ruby-lang.org/issues/19071
+[Feature #19078]:     https://bugs.ruby-lang.org/issues/19078
+[Bug #19087]:         https://bugs.ruby-lang.org/issues/19087
+[Bug #19100]:         https://bugs.ruby-lang.org/issues/19100
+[Feature #19104]:     https://bugs.ruby-lang.org/issues/19104
+[Feature #19135]:     https://bugs.ruby-lang.org/issues/19135
+[Feature #19138]:     https://bugs.ruby-lang.org/issues/19138
+[Feature #19194]:     https://bugs.ruby-lang.org/issues/19194
+[Molinillo]:          https://github.com/CocoaPods/Molinillo
+[PubGrub]:            https://github.com/jhawthorn/pub_grub
+[GH-net-protocol-14]: https://github.com/ruby/net-protocol/pull/14
+[GH-pathname-20]:     https://github.com/ruby/pathname/pull/20
+[GH-6791]:            https://github.com/ruby/ruby/pull/6791
+[GH-6868]:            https://github.com/ruby/ruby/pull/6868
+[GH-rubygems-4475]:   https://github.com/rubygems/rubygems/pull/4475
+[GH-rubygems-6149]:   https://github.com/rubygems/rubygems/pull/6149
+[GH-rubygems-6167]:   https://github.com/rubygems/rubygems/pull/6167
+[sec-156615]:         https://hackerone.com/reports/156615
+[CVE-2021-33621]:     https://www.ruby-lang.org/en/news/2022/11/22/http-response-splitting-in-cgi-cve-2021-33621/
+[wasm/README.md]:     https://github.com/ruby/ruby/blob/master/wasm/README.md
+[ruby.wasm]:          https://github.com/ruby/ruby.wasm
diff --git a/README.ja.md b/README.ja.md
index bb69c09055..93c0131690 100644
--- a/README.ja.md
+++ b/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とは
 
diff --git a/README.md b/README.md
index 35ef2d9e89..c445448c71 100644
--- a/README.md
+++ b/README.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)
 
 # What is Ruby?
 
diff --git a/addr2line.c b/addr2line.c
index fe4ad84423..e5f25293e2 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -159,12 +159,15 @@ typedef struct obj_info {
     struct dwarf_section debug_info;
     struct dwarf_section debug_line;
     struct dwarf_section debug_ranges;
+    struct dwarf_section debug_str_offsets;
+    struct dwarf_section debug_addr;
     struct dwarf_section debug_rnglists;
     struct dwarf_section debug_str;
+    struct dwarf_section debug_line_str;
     struct obj_info *next;
 } obj_info_t;
 
-#define DWARF_SECTION_COUNT 6
+#define DWARF_SECTION_COUNT 9
 
 static struct dwarf_section *
 obj_dwarf_section_at(obj_info_t *obj, int n)
@@ -174,8 +177,11 @@ obj_dwarf_section_at(obj_info_t *obj, int n)
         &obj->debug_info,
         &obj->debug_line,
         &obj->debug_ranges,
+        &obj->debug_str_offsets,
+        &obj->debug_addr,
         &obj->debug_rnglists,
-        &obj->debug_str
+        &obj->debug_str,
+        &obj->debug_line_str
     };
     if (n < 0 || DWARF_SECTION_COUNT <= n) {
         abort();
@@ -248,39 +254,51 @@ get_nth_dirname(unsigned long dir, const char *p)
     return p;
 }
 
+static const char *parse_ver5_debug_line_header(const char *p, int idx, uint8_t format, obj_info_t *obj, const char **out_path, uint64_t *out_directory_index);
+
 static void
-fill_filename(int file, const char *include_directories, const char *filenames, line_info_t *line, obj_info_t *obj)
+fill_filename(int file, uint8_t format, uint16_t version, const char *include_directories, const char *filenames, line_info_t *line, obj_info_t *obj)
 {
     int i;
     const char *p = filenames;
     const char *filename;
     unsigned long dir;
-    for (i = 1; i <= file; i++) {
-	filename = p;
-	if (!*p) {
-	    /* Need to output binary file name? */
-	    kprintf("Unexpected file number %d in %s at %tx\n",
-		    file, binary_filename, filenames - obj->mapped);
-	    return;
-	}
-	while (*p) p++;
-	p++;
-	dir = uleb128(&p);
-	/* last modified. */
-	uleb128(&p);
-	/* size of the file. */
-	uleb128(&p);
-
-	if (i == file) {
-	    line->filename = filename;
-	    line->dirname = get_nth_dirname(dir, include_directories);
-	}
+    if (version >= 5) {
+        const char *path;
+        uint64_t directory_index = -1;
+        parse_ver5_debug_line_header(filenames, file, format, obj, &path, &directory_index);
+        line->filename = path;
+        parse_ver5_debug_line_header(include_directories, (int)directory_index, format, obj, &path, NULL);
+        line->dirname = path;
+    }
+    else {
+        for (i = 1; i <= file; i++) {
+            filename = p;
+            if (!*p) {
+                /* Need to output binary file name? */
+                kprintf("Unexpected file number %d in %s at %tx\n",
+                        file, binary_filename, filenames - obj->mapped);
+                return;
+            }
+            while (*p) p++;
+            p++;
+            dir = uleb128(&p);
+            /* last modified. */
+            uleb128(&p);
+            /* size of the file. */
+            uleb128(&p);
+
+            if (i == file) {
+                line->filename = filename;
+                line->dirname = get_nth_dirname(dir, include_directories);
+            }
+        }
     }
 }
 
 static void
 fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
-	  const char *include_directories, const char *filenames,
+	  uint8_t format, uint16_t version, const char *include_directories, const char *filenames,
 	  obj_info_t *obj, line_info_t *lines, int offset)
 {
     int i;
@@ -290,7 +308,7 @@ fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
 	/* We assume one line code doesn't result >100 bytes of native code.
        We may want more reliable way eventually... */
 	if (addr < a && a < addr + 100) {
-	    fill_filename(file, include_directories, filenames, &lines[i], obj);
+	    fill_filename(file, format, version, include_directories, filenames, &lines[i], obj);
 	    lines[i].line = line;
 	}
     }
@@ -315,7 +333,7 @@ struct LineNumberProgramHeader {
 };
 
 static int
-parse_debug_line_header(const char **pp, struct LineNumberProgramHeader *header)
+parse_debug_line_header(obj_info_t *obj, const char **pp, struct LineNumberProgramHeader *header)
 {
     const char *p = *pp;
     header->unit_length = *(uint32_t *)p;
@@ -332,7 +350,13 @@ parse_debug_line_header(const char **pp, struct LineNumberProgramHeader *header)
 
     header->version = *(uint16_t *)p;
     p += sizeof(uint16_t);
-    if (header->version > 4) return -1;
+    if (header->version > 5) return -1;
+
+    if (header->version >= 5) {
+        /* address_size = *(uint8_t *)p++; */
+        /* segment_selector_size = *(uint8_t *)p++; */
+        p += 2;
+    }
 
     header->header_length = header->format == 4 ? *(uint32_t *)p : *(uint64_t *)p;
     p += header->format;
@@ -353,20 +377,27 @@ parse_debug_line_header(const char **pp, struct LineNumberProgramHeader *header)
     /* header->standard_opcode_lengths = (uint8_t *)p - 1; */
     p += header->opcode_base - 1;
 
-    header->include_directories = p;
+    if (header->version >= 5) {
+        header->include_directories = p;
+        p = parse_ver5_debug_line_header(p, -1, header->format, obj, NULL, NULL);
+        header->filenames = p;
+    }
+    else {
+        header->include_directories = p;
 
-    /* temporary measure for compress-debug-sections */
-    if (p >= header->cu_end) return -1;
+        /* temporary measure for compress-debug-sections */
+        if (p >= header->cu_end) return -1;
 
-    /* skip include directories */
-    while (*p) {
-	p = memchr(p, '\0', header->cu_end - p);
-	if (!p) return -1;
-	p++;
-    }
-    p++;
+        /* skip include directories */
+        while (*p) {
+            p = memchr(p, '\0', header->cu_end - p);
+            if (!p) return -1;
+            p++;
+        }
+        p++;
 
-    header->filenames = p;
+        header->filenames = p;
+    }
 
     *pp = header->cu_start;
 
@@ -392,13 +423,15 @@ parse_debug_line_cu(int num_traces, void **traces, const char **debug_line,
     /* int epilogue_begin = 0; */
     /* unsigned int isa = 0; */
 
-    if (parse_debug_line_header(&p, &header))
+    if (parse_debug_line_header(obj, &p, &header))
         return -1;
     is_stmt = header.default_is_stmt;
 
 #define FILL_LINE()						    \
     do {							    \
 	fill_line(num_traces, traces, addr, file, line,		    \
+                  header.format,                                    \
+                  header.version,                                   \
                   header.include_directories,                       \
                   header.filenames,                                 \
 		  obj, lines, offset);				    \
@@ -827,16 +860,23 @@ enum {
     VAL_cstr = 1,
     VAL_data = 2,
     VAL_uint = 3,
-    VAL_int = 4
+    VAL_int = 4,
+    VAL_addr = 5
 };
 
 # define ABBREV_TABLE_SIZE 256
 typedef struct {
     obj_info_t *obj;
     const char *file;
+    uint8_t current_version;
     const char *current_cu;
     uint64_t current_low_pc;
+    uint64_t current_str_offsets_base;
+    uint64_t current_addr_base;
+    uint64_t current_rnglists_base;
     const char *debug_line_cu_end;
+    uint8_t debug_line_format;
+    uint16_t debug_line_version;
     const char *debug_line_files;
     const char *debug_line_directories;
     const char *p;
@@ -861,6 +901,7 @@ typedef struct {
         const char *ptr;
         uint64_t uint64;
         int64_t int64;
+        uint64_t addr_idx;
     } as;
     uint64_t off;
     uint64_t at;
@@ -869,8 +910,11 @@ typedef struct {
     int type;
 } DebugInfoValue;
 
-/* TODO: Big Endian */
+#if defined(WORDS_BIGENDIAN)
+#define MERGE_2INTS(a,b,sz) (((uint64_t)(a)<<sz)|(b))
+#else
 #define MERGE_2INTS(a,b,sz) (((uint64_t)(b)<<sz)|(a))
+#endif
 
 static uint16_t
 get_uint16(const uint8_t *p)
@@ -973,6 +1017,9 @@ debug_info_reader_init(DebugInfoReader *reader, obj_info_t *obj)
     reader->pend = obj->debug_info.ptr + obj->debug_info.size;
     reader->debug_line_cu_end = obj->debug_line.ptr;
     reader->current_low_pc = 0;
+    reader->current_str_offsets_base = 0;
+    reader->current_addr_base = 0;
+    reader->current_rnglists_base = 0;
 }
 
 static void
@@ -1017,10 +1064,12 @@ di_read_debug_line_cu(DebugInfoReader *reader)
     struct LineNumberProgramHeader header;
 
     p = (const char *)reader->debug_line_cu_end;
-    if (parse_debug_line_header(&p, &header))
+    if (parse_debug_line_header(reader->obj, &p, &header))
         return -1;
 
     reader->debug_line_cu_end = (char *)header.cu_end;
+    reader->debug_line_format = header.format;
+    reader->debug_line_version = header.version;
     reader->debug_line_directories = (char *)header.include_directories;
     reader->debug_line_files = (char *)header.filenames;
 
@@ -1028,6 +1077,13 @@ di_read_debug_line_cu(DebugInfoReader *reader)
 }
 
 static void
+set_addr_idx_value(DebugInfoValue *v, uint64_t n)
+{
+    v->as.addr_idx = n;
+    v->type = VAL_addr;
+}
+
+static void
 set_uint_value(DebugInfoValue *v, uint64_t n)
 {
     v->as.uint64 = n;
@@ -1074,19 +1130,39 @@ get_cstr_value(DebugInfoValue *v)
     }
 }
 
+static const char *
+resolve_strx(DebugInfoReader *reader, uint64_t idx)
+{
+    const char *p = reader->obj->debug_str_offsets.ptr + reader->current_str_offsets_base;
+    uint64_t off;
+    if (reader->format == 4) {
+        off = ((uint32_t *)p)[idx];
+    }
+    else {
+        off = ((uint64_t *)p)[idx];
+    }
+    return reader->obj->debug_str.ptr + off;
+}
+
+static void
+debug_info_reader_read_addr_value(DebugInfoReader *reader, DebugInfoValue *v)
+{
+    if (reader->address_size == 4) {
+        set_uint_value(v, read_uint32(&reader->p));
+    } else if (reader->address_size == 8) {
+        set_uint_value(v, read_uint64(&reader->p));
+    } else {
+        fprintf(stderr,"unknown address_size:%d", reader->address_size);
+        abort();
+    }
+}
+
 static void
 debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v)
 {
     switch (form) {
       case DW_FORM_addr:
-        if (reader->address_size == 4) {
-            set_uint_value(v, read_uint32(&reader->p));
-        } else if (reader->address_size == 8) {
-            set_uint_value(v, read_uint64(&reader->p));
-        } else {
-            fprintf(stderr,"unknown address_size:%d", reader->address_size);
-            abort();
-        }
+        debug_info_reader_read_addr_value(reader, v);
         break;
       case DW_FORM_block2:
         v->size = read_uint16(&reader->p);
@@ -1138,13 +1214,19 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa
         set_uint_value(v, read_uleb128(reader));
         break;
       case DW_FORM_ref_addr:
-        if (reader->format == 4) {
-            set_uint_value(v, read_uint32(&reader->p));
-        } else if (reader->format == 8) {
-            set_uint_value(v, read_uint64(&reader->p));
+        if (reader->current_version <= 2) {
+            // DWARF Version 2 specifies that references have
+            // the same size as an address on the target system
+            debug_info_reader_read_addr_value(reader, v);
         } else {
-            fprintf(stderr,"unknown format:%d", reader->format);
-            abort();
+            if (reader->format == 4) {
+                set_uint_value(v, read_uint32(&reader->p));
+            } else if (reader->format == 8) {
+                set_uint_value(v, read_uint64(&reader->p));
+            } else {
+                fprintf(stderr,"unknown format:%d", reader->format);
+                abort();
+            }
         }
         break;
       case DW_FORM_ref1:
@@ -1186,11 +1268,10 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa
         set_uint_value(v, 1);
         break;
       case DW_FORM_strx:
-        set_uint_value(v, uleb128(&reader->p));
+        set_cstr_value(v, resolve_strx(reader, uleb128(&reader->p)));
         break;
       case DW_FORM_addrx:
-        /* TODO: read .debug_addr */
-        set_uint_value(v, uleb128(&reader->p));
+        set_addr_idx_value(v, uleb128(&reader->p));
         break;
       case DW_FORM_ref_sup4:
         set_uint_value(v, read_uint32(&reader->p));
@@ -1205,8 +1286,7 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa
         reader->p += v->size;
         break;
       case DW_FORM_line_strp:
-        set_uint_value(v, read_uint(reader));
-        /* *p = reader->file + reader->line->sh_offset + ret; */
+        set_cstrp_value(v, reader->obj->debug_line_str.ptr, read_uint(reader));
         break;
       case DW_FORM_ref_sig8:
         set_uint_value(v, read_uint64(&reader->p));
@@ -1224,28 +1304,28 @@ debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoVa
         set_uint_value(v, read_uint64(&reader->p));
         break;
       case DW_FORM_strx1:
-        set_uint_value(v, read_uint8(&reader->p));
+        set_cstr_value(v, resolve_strx(reader, read_uint8(&reader->p)));
         break;
       case DW_FORM_strx2:
-        set_uint_value(v, read_uint16(&reader->p));
+        set_cstr_value(v, resolve_strx(reader, read_uint16(&reader->p)));
         break;
       case DW_FORM_strx3:
-        set_uint_value(v, read_uint24(&reader->p));
+        set_cstr_value(v, resolve_strx(reader, read_uint24(&reader->p)));
         break;
       case DW_FORM_strx4:
-        set_uint_value(v, read_uint32(&reader->p));
+        set_cstr_value(v, resolve_strx(reader, read_uint32(&reader->p)));
         break;
       case DW_FORM_addrx1:
-        set_uint_value(v, read_uint8(&reader->p));
+        set_addr_idx_value(v, read_uint8(&reader->p));
         break;
       case DW_FORM_addrx2:
-        set_uint_value(v, read_uint16(&reader->p));
+        set_addr_idx_value(v, read_uint16(&reader->p));
         break;
       case DW_FORM_addrx3:
-        set_uint_value(v, read_uint24(&reader->p));
+        set_addr_idx_value(v, read_uint24(&reader->p));
         break;
       case DW_FORM_addrx4:
-        set_uint_value(v, read_uint32(&reader->p));
+        set_addr_idx_value(v, read_uint32(&reader->p));
         break;
       case 0:
         goto fail;
@@ -1373,6 +1453,76 @@ di_skip_records(DebugInfoReader *reader)
     }
 }
 
+typedef struct addr_header {
+    const char *ptr;
+    uint64_t unit_length;
+    uint8_t format;
+    uint8_t address_size;
+    /* uint8_t segment_selector_size; */
+} addr_header_t;
+
+static void
+addr_header_init(obj_info_t *obj, addr_header_t *header) {
+    const char *p = obj->debug_addr.ptr;
+
+    header->ptr = p;
+
+    if (!p) return;
+
+    header->unit_length = *(uint32_t *)p;
+    p += sizeof(uint32_t);
+
+    header->format = 4;
+    if (header->unit_length == 0xffffffff) {
+        header->unit_length = *(uint64_t *)p;
+        p += sizeof(uint64_t);
+        header->format = 8;
+    }
+
+    p += 2; /* version */
+    header->address_size = *p++;
+    p++; /* segment_selector_size */
+}
+
+static uint64_t
+read_addr(addr_header_t *header, uint64_t addr_base, uint64_t idx) {
+    if (header->address_size == 4) {
+        return ((uint32_t*)(header->ptr + addr_base))[idx];
+    }
+    else {
+        return ((uint64_t*)(header->ptr + addr_base))[idx];
+    }
+}
+
+typedef struct rnglists_header {
+    uint64_t unit_length;
+    uint8_t format;
+    uint8_t address_size;
+    uint32_t offset_entry_count;
+} rnglists_header_t;
+
+static void
+rnglists_header_init(obj_info_t *obj, rnglists_header_t *header) {
+    const char *p = obj->debug_rnglists.ptr;
+
+    if (!p) return;
+
+    header->unit_length = *(uint32_t *)p;
+    p += sizeof(uint32_t);
+
+    header->format = 4;
+    if (header->unit_length == 0xffffffff) {
+        header->unit_length = *(uint64_t *)p;
+        p += sizeof(uint64_t);
+        header->format = 8;
+    }
+
+    p += 2; /* version */
+    header->address_size = *p++;
+    p++; /* segment_selector_size */
+    header->offset_entry_count = *(uint32_t *)p;
+}
+
 typedef struct {
     uint64_t low_pc;
     uint64_t high_pc;
@@ -1383,24 +1533,31 @@ typedef struct {
 } ranges_t;
 
 static void
-ranges_set(ranges_t *ptr, DebugInfoValue *v)
+ranges_set(ranges_t *ptr, DebugInfoValue *v, addr_header_t *addr_header, uint64_t addr_base)
 {
+    uint64_t n = 0;
+    if (v->type == VAL_uint) {
+        n = v->as.uint64;
+    }
+    else if (v->type == VAL_addr) {
+        n = read_addr(addr_header, addr_base, v->as.addr_idx);
+    }
     switch (v->at) {
       case DW_AT_low_pc:
-        ptr->low_pc = v->as.uint64;
+        ptr->low_pc = n;
         ptr->low_pc_set = true;
         break;
       case DW_AT_high_pc:
         if (v->form == DW_FORM_addr) {
-            ptr->high_pc = v->as.uint64;
+            ptr->high_pc = n;
         }
         else {
-            ptr->high_pc = ptr->low_pc + v->as.uint64;
+            ptr->high_pc = ptr->low_pc + n;
         }
         ptr->high_pc_set = true;
         break;
       case DW_AT_ranges:
-        ptr->ranges = v->as.uint64;
+        ptr->ranges = n;
         ptr->ranges_set = true;
         break;
     }
@@ -1422,7 +1579,7 @@ read_dw_form_addr(DebugInfoReader *reader, const char **ptr)
 }
 
 static uintptr_t
-ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr)
+ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr, rnglists_header_t *rnglists_header)
 {
     if (ptr->high_pc_set) {
         if (ptr->ranges_set || !ptr->low_pc_set) {
@@ -1437,8 +1594,21 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr)
         const char *p;
         uint64_t base = ptr->low_pc_set ? ptr->low_pc : reader->current_low_pc;
         bool base_valid = true;
-        if (reader->obj->debug_rnglists.ptr) {
-            p = reader->obj->debug_rnglists.ptr + ptr->ranges;
+        if (reader->current_version >= 5) {
+            if (rnglists_header->offset_entry_count == 0) {
+                // DW_FORM_sec_offset
+                p = reader->obj->debug_rnglists.ptr + ptr->ranges + reader->current_rnglists_base;
+            }
+            else {
+                // DW_FORM_rnglistx
+                const char *offset_array = reader->obj->debug_rnglists.ptr + reader->current_rnglists_base;
+                if (rnglists_header->format == 4) {
+                    p = offset_array + ((uint32_t *)offset_array)[ptr->ranges];
+                }
+                else {
+                    p = offset_array + ((uint64_t *)offset_array)[ptr->ranges];
+                }
+            }
             for (;;) {
                 uint8_t rle = read_uint8(&p);
                 uintptr_t from = 0, to = 0;
@@ -1548,6 +1718,7 @@ di_read_cu(DebugInfoReader *reader)
     }
     reader->cu_end = reader->p + unit_length;
     version = read_uint16(&reader->p);
+    reader->current_version = version;
     if (version > 5) {
         return -1;
     }
@@ -1580,16 +1751,45 @@ di_read_cu(DebugInfoReader *reader)
             break;
         }
 
+        reader->current_str_offsets_base = 0;
+        reader->current_addr_base = 0;
+        reader->current_rnglists_base = 0;
+
+        DebugInfoValue low_pc = {{}};
         /* enumerate abbrev */
         for (;;) {
             DebugInfoValue v = {{}};
             if (!di_read_record(reader, &v)) break;
             switch (v.at) {
               case DW_AT_low_pc:
-                reader->current_low_pc = v.as.uint64;
+                // clang may output DW_AT_addr_base after DW_AT_low_pc.
+                // We need to resolve the DW_FORM_addr* after DW_AT_addr_base is parsed.
+                low_pc = v;
+                break;
+              case DW_AT_str_offsets_base:
+                reader->current_str_offsets_base = v.as.uint64;
+                break;
+              case DW_AT_addr_base:
+                reader->current_addr_base = v.as.uint64;
+                break;
+              case DW_AT_rnglists_base:
+                reader->current_rnglists_base = v.as.uint64;
                 break;
             }
         }
+        // Resolve the DW_FORM_addr of DW_AT_low_pc
+        switch (low_pc.type) {
+            case VAL_uint:
+                reader->current_low_pc = low_pc.as.uint64;
+                break;
+            case VAL_addr:
+                {
+                    addr_header_t header;
+                    addr_header_init(reader->obj, &header);
+                    reader->current_low_pc = read_addr(&header, reader->current_addr_base, low_pc.as.addr_idx);
+                }
+                break;
+        }
     } while (0);
 #endif
     return 0;
@@ -1643,6 +1843,13 @@ read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_o
 static void
 debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
          line_info_t *lines, int offset) {
+
+    addr_header_t addr_header = {};
+    addr_header_init(reader->obj, &addr_header);
+
+    rnglists_header_t rnglists_header = {};
+    rnglists_header_init(reader->obj, &rnglists_header);
+
     while (reader->p < reader->cu_end) {
         DIE die;
         ranges_t ranges = {};
@@ -1669,7 +1876,7 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
                 line.sname = get_cstr_value(&v);
                 break;
               case DW_AT_call_file:
-                fill_filename((int)v.as.uint64, reader->debug_line_directories, reader->debug_line_files, &line, reader->obj);
+                fill_filename((int)v.as.uint64, reader->debug_line_format, reader->debug_line_version, reader->debug_line_directories, reader->debug_line_files, &line, reader->obj);
                 break;
               case DW_AT_call_line:
                 line.line = (int)v.as.uint64;
@@ -1677,7 +1884,7 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
               case DW_AT_low_pc:
               case DW_AT_high_pc:
               case DW_AT_ranges:
-                ranges_set(&ranges, &v);
+                ranges_set(&ranges, &v, &addr_header, reader->current_addr_base);
                 break;
               case DW_AT_declaration:
                 goto skip_die;
@@ -1694,9 +1901,9 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
         for (int i=offset; i < num_traces; i++) {
             uintptr_t addr = (uintptr_t)traces[i];
             uintptr_t offset = addr - reader->obj->base_addr + reader->obj->vmaddr;
-            uintptr_t saddr = ranges_include(reader, &ranges, offset);
+            uintptr_t saddr = ranges_include(reader, &ranges, offset, &rnglists_header);
             if (saddr) {
-                /* fprintf(stderr, "%d:%tx: %d %lx->%lx %x %s: %s/%s %d %s %s %s\n",__LINE__,die.pos, i,addr,offset, die.tag,line.sname,line.dirname,line.filename,line.line,reader->obj->path,line.sname,lines[i].sname); */
+                /* fprintf(stdout, "%d:%tx: %d %lx->%lx %x %s: %s/%s %d %s %s %s\n",__LINE__,die.pos, i,addr,offset, die.tag,line.sname,line.dirname,line.filename,line.line,reader->obj->path,line.sname,lines[i].sname); */
                 if (lines[i].sname) {
                     line_info_t *lp = malloc(sizeof(line_info_t));
                     memcpy(lp, &lines[i], sizeof(line_info_t));
@@ -1715,6 +1922,54 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
     }
 }
 
+// This function parses the following attributes of Line Number Program Header in DWARF 5:
+//
+// * directory_entry_format_count
+// * directory_entry_format
+// * directories_count
+// * directories
+//
+// or
+//
+// * file_name_entry_format_count
+// * file_name_entry_format
+// * file_names_count
+// * file_names
+//
+// It records DW_LNCT_path and DW_LNCT_directory_index at the index "idx".
+static const char *
+parse_ver5_debug_line_header(const char *p, int idx, uint8_t format, obj_info_t *obj, const char **out_path, uint64_t *out_directory_index) {
+    int i, j;
+    int entry_format_count = *(uint8_t *)p++;
+    const char *entry_format = p;
+
+    /* skip the part of entry_format */
+    for (i = 0; i < entry_format_count * 2; i++) uleb128(&p);
+
+    int entry_count = (int)uleb128(&p);
+
+    DebugInfoReader reader;
+    debug_info_reader_init(&reader, obj);
+    reader.format = format;
+    reader.p = p;
+    for (j = 0; j < entry_count; j++) {
+        const char *format = entry_format;
+        for (i = 0; i < entry_format_count; i++) {
+            DebugInfoValue v = {{}};
+            unsigned long dw_lnct = uleb128(&format);
+            unsigned long dw_form = uleb128(&format);
+            debug_info_reader_read_value(&reader, dw_form, &v);
+            if (dw_lnct == 1 /* DW_LNCT_path */ && v.type == VAL_cstr && out_path)
+                *out_path = v.as.ptr + v.off;
+            if (dw_lnct == 2 /* DW_LNCT_directory_index */ && v.type == VAL_uint && out_directory_index)
+                *out_directory_index = v.as.uint64;
+        }
+        if (j == idx) return 0;
+    }
+
+    return reader.p;
+}
+
 #ifdef USE_ELF
 static unsigned long
 uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
@@ -1843,8 +2098,11 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
                     ".debug_info",
                     ".debug_line",
                     ".debug_ranges",
+                    ".debug_str_offsets",
+                    ".debug_addr",
                     ".debug_rnglists",
-                    ".debug_str"
+                    ".debug_str",
+                    ".debug_line_str"
                 };
 
                 for (j=0; j < DWARF_SECTION_COUNT; j++) {
@@ -2100,8 +2358,11 @@ found_mach_header:
                     "__debug_info",
                     "__debug_line",
                     "__debug_ranges",
+                    "__debug_str_offsets",
+                    "__debug_addr",
                     "__debug_rnglists",
-                    "__debug_str"
+                    "__debug_str",
+                    "__debug_line_str",
                 };
                 struct LP(segment_command) *scmd = (struct LP(segment_command) *)lcmd;
                 if (strcmp(scmd->segname, "__TEXT") == 0) {
@@ -2299,6 +2560,7 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
     obj_info_t *obj = NULL;
     /* 2 is NULL + main executable */
     void **dladdr_fbases = (void **)calloc(num_traces+2, sizeof(void *));
+
 #ifdef HAVE_MAIN_EXE_PATH
     char *main_path = NULL; /* used on printing backtrace */
     ssize_t len;
diff --git a/array.c b/array.c
index 73e8a3c9ce..b76e9a64a3 100644
--- a/array.c
+++ b/array.c
@@ -226,8 +226,15 @@ ary_embeddable_p(long capa)
 bool
 rb_ary_embeddable_p(VALUE ary)
 {
-    // if the array is shared or a shared root then it's not moveable
-    return !(ARY_SHARED_P(ary) || ARY_SHARED_ROOT_P(ary));
+    /* An array cannot be turned embeddable when the array is:
+     *  - Shared root: other objects may point to the buffer of this array
+     *    so we cannot make it embedded.
+     *  - Frozen: this array may also be a shared root without the shared root
+     *    flag.
+     *  - Shared: we don't want to re-embed an array that points to a shared
+     *    root (to save memory).
+     */
+    return !(ARY_SHARED_ROOT_P(ary) || OBJ_FROZEN(ary) || ARY_SHARED_P(ary));
 }
 
 size_t
@@ -242,7 +249,7 @@ rb_ary_size_as_embedded(VALUE ary)
         real_size = ary_embed_size(ARY_HEAP_CAPA(ary));
     }
     else {
-        real_size = sizeof(struct RString);
+        real_size = sizeof(struct RArray);
     }
     return real_size;
 }
@@ -837,11 +844,11 @@ ary_new(VALUE klass, long capa)
     }
     else {
         ary = ary_alloc_heap(klass);
+        ARY_SET_CAPA(ary, capa);
         assert(!ARY_EMBED_P(ary));
 
         ptr = ary_heap_alloc(ary, capa);
         ARY_SET_PTR(ary, ptr);
-        ARY_SET_CAPA(ary, capa);
         ARY_SET_HEAP_LEN(ary, 0);
     }
 
@@ -945,11 +952,11 @@ ec_ary_new(rb_execution_context_t *ec, VALUE klass, long capa)
     }
     else {
         ary = ec_ary_alloc_heap(ec, klass);
+        ARY_SET_CAPA(ary, capa);
         assert(!ARY_EMBED_P(ary));
 
         ptr = ary_heap_alloc(ary, capa);
         ARY_SET_PTR(ary, ptr);
-        ARY_SET_CAPA(ary, capa);
         ARY_SET_HEAP_LEN(ary, 0);
     }
 
@@ -1056,6 +1063,7 @@ ary_make_shared(VALUE ary)
         /* Shared roots cannot be embedded because the reference count
          * (refcnt) is stored in as.heap.aux.capa. */
         VALUE shared = ary_alloc_heap(0);
+        FL_SET_SHARED_ROOT(shared);
 
         if (ARY_EMBED_P(ary)) {
             /* Cannot use ary_heap_alloc because we don't want to allocate
@@ -1074,7 +1082,6 @@ ary_make_shared(VALUE ary)
 
         ARY_SET_LEN(shared, capa);
         ary_mem_clear(shared, len, capa - len);
-        FL_SET_SHARED_ROOT(shared);
         ARY_SET_SHARED_ROOT_REFCNT(shared, 1);
         FL_SET_SHARED(ary);
         RB_DEBUG_COUNTER_INC(obj_ary_shared_create);
@@ -1348,11 +1355,11 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
         return result;
     }
     else {
+        VALUE shared = ary_make_shared(ary);
+
         VALUE result = ary_alloc_heap(klass);
         assert(!ARY_EMBED_P(result));
 
-        VALUE shared = ary_make_shared(ary);
-
         ARY_SET_PTR(result, RARRAY_CONST_PTR_TRANSIENT(ary));
         ARY_SET_LEN(result, RARRAY_LEN(ary));
         rb_ary_set_shared(result, shared);
@@ -1389,7 +1396,7 @@ ary_make_partial_step(VALUE ary, VALUE klass, long offset, long len, long step)
     }
 
     long ustep = (step < 0) ? -step : step;
-    len = (len + ustep - 1) / ustep;
+    len = roomof(len, ustep);
 
     long i;
     long j = offset + ((step > 0) ? 0 : (orig_len - 1));
@@ -2086,7 +2093,7 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
  *
  *  If +self+ is empty, returns +nil+.
  *
- *  When non-negative \Innteger argument +n+ is given,
+ *  When non-negative \Integer argument +n+ is given,
  *  returns the last +n+ elements in a new \Array:
  *
  *    a = [:foo, 'bar', 2]
@@ -3456,7 +3463,6 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 struct ary_sort_data {
     VALUE ary;
     VALUE receiver;
-    struct cmp_opt_data cmp_opt;
 };
 
 static VALUE
@@ -3502,15 +3508,15 @@ sort_2(const void *ap, const void *bp, void *dummy)
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Integer)) {
+    if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(INTEGER)) {
         if ((long)a > (long)b) return 1;
         if ((long)a < (long)b) return -1;
         return 0;
     }
-    if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) {
+    if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(STRING)) {
         return rb_str_cmp(a, b);
     }
-    if (RB_FLOAT_TYPE_P(a) && CMP_OPTIMIZABLE(data->cmp_opt, Float)) {
+    if (RB_FLOAT_TYPE_P(a) && CMP_OPTIMIZABLE(FLOAT)) {
         return rb_float_cmp(a, b);
     }
 
@@ -3574,8 +3580,6 @@ rb_ary_sort_bang(VALUE ary)
         RBASIC_CLEAR_CLASS(tmp);
         data.ary = tmp;
         data.receiver = ary;
-        data.cmp_opt.opt_methods = 0;
-        data.cmp_opt.opt_inited = 0;
         RARRAY_PTR_USE(tmp, ptr, {
             ruby_qsort(ptr, len, sizeof(VALUE),
                        rb_block_given_p()?sort_1:sort_2, &data);
@@ -3732,8 +3736,8 @@ rb_ary_bsearch_index(VALUE ary)
             const VALUE zero = INT2FIX(0);
             switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) {
               case 0: return INT2FIX(mid);
-              case 1: smaller = 1; break;
-              case -1: smaller = 0;
+              case 1: smaller = 0; break;
+              case -1: smaller = 1;
             }
         }
         else {
@@ -4555,7 +4559,7 @@ take_items(VALUE obj, long n)
     if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
     result = rb_ary_new2(n);
     args[0] = result; args[1] = (VALUE)n;
-    if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef)
+    if (UNDEF_P(rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args)))
         rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
                  rb_obj_class(obj));
     return result;
@@ -5048,7 +5052,7 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
         ARY_SET_LEN(ary, end);
     }
 
-    if (item == Qundef) {
+    if (UNDEF_P(item)) {
         VALUE v;
         long i;
 
@@ -5505,7 +5509,7 @@ rb_ary_cmp(VALUE ary1, VALUE ary2)
     if (NIL_P(ary2)) return Qnil;
     if (ary1 == ary2) return INT2FIX(0);
     v = rb_exec_recursive_paired(recursive_cmp, ary1, ary2, ary2);
-    if (v != Qundef) return v;
+    if (!UNDEF_P(v)) return v;
     len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2);
     if (len == 0) return INT2FIX(0);
     if (len > 0) return INT2FIX(1);
@@ -6056,7 +6060,6 @@ ary_max_opt_string(VALUE ary, long i, VALUE vmax)
 static VALUE
 rb_ary_max(int argc, VALUE *argv, VALUE ary)
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     VALUE result = Qundef, v;
     VALUE num;
     long i;
@@ -6068,7 +6071,7 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
     if (rb_block_given_p()) {
         for (i = 0; i < RARRAY_LEN(ary); i++) {
            v = RARRAY_AREF(ary, i);
-           if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) {
+           if (UNDEF_P(result) || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) {
                result = v;
            }
         }
@@ -6076,13 +6079,13 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
     else if (n > 0) {
         result = RARRAY_AREF(ary, 0);
         if (n > 1) {
-            if (FIXNUM_P(result) && CMP_OPTIMIZABLE(cmp_opt, Integer)) {
+            if (FIXNUM_P(result) && CMP_OPTIMIZABLE(INTEGER)) {
                 return ary_max_opt_fixnum(ary, 1, result);
             }
-            else if (STRING_P(result) && CMP_OPTIMIZABLE(cmp_opt, String)) {
+            else if (STRING_P(result) && CMP_OPTIMIZABLE(STRING)) {
                 return ary_max_opt_string(ary, 1, result);
             }
-            else if (RB_FLOAT_TYPE_P(result) && CMP_OPTIMIZABLE(cmp_opt, Float)) {
+            else if (RB_FLOAT_TYPE_P(result) && CMP_OPTIMIZABLE(FLOAT)) {
                 return ary_max_opt_float(ary, 1, result);
             }
             else {
@@ -6090,7 +6093,7 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
             }
         }
     }
-    if (result == Qundef) return Qnil;
+    if (UNDEF_P(result)) return Qnil;
     return result;
 }
 
@@ -6225,7 +6228,6 @@ ary_min_opt_string(VALUE ary, long i, VALUE vmin)
 static VALUE
 rb_ary_min(int argc, VALUE *argv, VALUE ary)
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     VALUE result = Qundef, v;
     VALUE num;
     long i;
@@ -6237,7 +6239,7 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
     if (rb_block_given_p()) {
         for (i = 0; i < RARRAY_LEN(ary); i++) {
            v = RARRAY_AREF(ary, i);
-           if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) {
+           if (UNDEF_P(result) || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) {
                result = v;
            }
         }
@@ -6245,13 +6247,13 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
     else if (n > 0) {
         result = RARRAY_AREF(ary, 0);
         if (n > 1) {
-            if (FIXNUM_P(result) && CMP_OPTIMIZABLE(cmp_opt, Integer)) {
+            if (FIXNUM_P(result) && CMP_OPTIMIZABLE(INTEGER)) {
                 return ary_min_opt_fixnum(ary, 1, result);
             }
-            else if (STRING_P(result) && CMP_OPTIMIZABLE(cmp_opt, String)) {
+            else if (STRING_P(result) && CMP_OPTIMIZABLE(STRING)) {
                 return ary_min_opt_string(ary, 1, result);
             }
-            else if (RB_FLOAT_TYPE_P(result) && CMP_OPTIMIZABLE(cmp_opt, Float)) {
+            else if (RB_FLOAT_TYPE_P(result) && CMP_OPTIMIZABLE(FLOAT)) {
                 return ary_min_opt_float(ary, 1, result);
             }
             else {
@@ -6259,7 +6261,7 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
             }
         }
     }
-    if (result == Qundef) return Qnil;
+    if (UNDEF_P(result)) return Qnil;
     return result;
 }
 
@@ -8148,7 +8150,7 @@ finish_exact_sum(long n, VALUE r, VALUE v, int z)
 {
     if (n != 0)
         v = rb_fix_plus(LONG2FIX(n), v);
-    if (r != Qundef) {
+    if (!UNDEF_P(r)) {
         v = rb_rational_plus(r, v);
     }
     else if (!n && z) {
@@ -8227,7 +8229,7 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
         else if (RB_BIGNUM_TYPE_P(e))
             v = rb_big_plus(e, v);
         else if (RB_TYPE_P(e, T_RATIONAL)) {
-            if (r == Qundef)
+            if (UNDEF_P(r))
                 r = e;
             else
                 r = rb_rational_plus(r, e);
@@ -8737,7 +8739,7 @@ rb_ary_deconstruct(VALUE ary)
  *
  *  - #pop: Removes and returns the last element.
  *  - #shift:  Removes and returns the first element.
- *  - #compact!: Removes all non-+nil+ elements.
+ *  - #compact!: Removes all +nil+ elements.
  *  - #delete: Removes elements equal to a given object.
  *  - #delete_at: Removes the element at a given offset.
  *  - #delete_if: Removes elements specified by a given block.
diff --git a/ast.c b/ast.c
index 42d4126a5b..adb7287ed3 100644
--- a/ast.c
+++ b/ast.c
@@ -64,8 +64,8 @@ ast_new_internal(rb_ast_t *ast, const NODE *node)
     return obj;
 }
 
-static VALUE rb_ast_parse_str(VALUE str, VALUE keep_script_lines);
-static VALUE rb_ast_parse_file(VALUE path, VALUE keep_script_lines);
+static VALUE rb_ast_parse_str(VALUE str, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens);
+static VALUE rb_ast_parse_file(VALUE path, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens);
 
 static VALUE
 ast_parse_new(void)
@@ -85,31 +85,33 @@ ast_parse_done(rb_ast_t *ast)
 }
 
 static VALUE
-ast_s_parse(rb_execution_context_t *ec, VALUE module, VALUE str, VALUE keep_script_lines)
+ast_s_parse(rb_execution_context_t *ec, VALUE module, VALUE str, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
-    return rb_ast_parse_str(str, keep_script_lines);
+    return rb_ast_parse_str(str, keep_script_lines, error_tolerant, keep_tokens);
 }
 
 static VALUE
-rb_ast_parse_str(VALUE str, VALUE keep_script_lines)
+rb_ast_parse_str(VALUE str, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
     rb_ast_t *ast = 0;
 
     StringValue(str);
     VALUE vparser = ast_parse_new();
     if (RTEST(keep_script_lines)) rb_parser_keep_script_lines(vparser);
+    if (RTEST(error_tolerant)) rb_parser_error_tolerant(vparser);
+    if (RTEST(keep_tokens)) rb_parser_keep_tokens(vparser);
     ast = rb_parser_compile_string_path(vparser, Qnil, str, 1);
     return ast_parse_done(ast);
 }
 
 static VALUE
-ast_s_parse_file(rb_execution_context_t *ec, VALUE module, VALUE path, VALUE keep_script_lines)
+ast_s_parse_file(rb_execution_context_t *ec, VALUE module, VALUE path, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
-    return rb_ast_parse_file(path, keep_script_lines);
+    return rb_ast_parse_file(path, keep_script_lines, error_tolerant, keep_tokens);
 }
 
 static VALUE
-rb_ast_parse_file(VALUE path, VALUE keep_script_lines)
+rb_ast_parse_file(VALUE path, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
     VALUE f;
     rb_ast_t *ast = 0;
@@ -120,6 +122,8 @@ rb_ast_parse_file(VALUE path, VALUE keep_script_lines)
     rb_funcall(f, rb_intern("set_encoding"), 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
     VALUE vparser = ast_parse_new();
     if (RTEST(keep_script_lines)) rb_parser_keep_script_lines(vparser);
+    if (RTEST(error_tolerant))  rb_parser_error_tolerant(vparser);
+    if (RTEST(keep_tokens))  rb_parser_keep_tokens(vparser);
     ast = rb_parser_compile_file_path(vparser, Qnil, f, 1);
     rb_io_close(f);
     return ast_parse_done(ast);
@@ -139,13 +143,15 @@ lex_array(VALUE array, int index)
 }
 
 static VALUE
-rb_ast_parse_array(VALUE array, VALUE keep_script_lines)
+rb_ast_parse_array(VALUE array, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
     rb_ast_t *ast = 0;
 
     array = rb_check_array_type(array);
     VALUE vparser = ast_parse_new();
     if (RTEST(keep_script_lines)) rb_parser_keep_script_lines(vparser);
+    if (RTEST(error_tolerant)) rb_parser_error_tolerant(vparser);
+    if (RTEST(keep_tokens)) rb_parser_keep_tokens(vparser);
     ast = rb_parser_compile_generic(vparser, lex_array, Qnil, array, 1);
     return ast_parse_done(ast);
 }
@@ -193,7 +199,24 @@ script_lines(VALUE path)
 }
 
 static VALUE
-ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body, VALUE keep_script_lines)
+node_id_for_backtrace_location(rb_execution_context_t *ec, VALUE module, VALUE location)
+{
+    int node_id;
+
+    if (!rb_frame_info_p(location)) {
+        rb_raise(rb_eTypeError, "Thread::Backtrace::Location object expected");
+    }
+
+    node_id = rb_get_node_id_from_frame_info(location);
+    if (node_id == -1) {
+        return Qnil;
+    }
+
+    return INT2NUM(node_id);
+}
+
+static VALUE
+ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body, VALUE keep_script_lines, VALUE error_tolerant, VALUE keep_tokens)
 {
     VALUE node, lines = Qnil;
     const rb_iseq_t *iseq;
@@ -232,13 +255,13 @@ ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body, VALUE keep_script
     }
 
     if (!NIL_P(lines) || !NIL_P(lines = script_lines(path))) {
-        node = rb_ast_parse_array(lines, keep_script_lines);
+        node = rb_ast_parse_array(lines, keep_script_lines, error_tolerant, keep_tokens);
     }
     else if (e_option) {
-        node = rb_ast_parse_str(rb_e_script, keep_script_lines);
+        node = rb_ast_parse_str(rb_e_script, keep_script_lines, error_tolerant, keep_tokens);
     }
     else {
-        node = rb_ast_parse_file(path, keep_script_lines);
+        node = rb_ast_parse_file(path, keep_script_lines, error_tolerant, keep_tokens);
     }
 
     return node_find(node, node_id);
@@ -645,6 +668,8 @@ node_children(rb_ast_t *ast, const NODE *node)
                                         NEW_CHILD(ast, node->nd_pkwargs),
                                         kwrest);
         }
+      case NODE_ERROR:
+        return rb_ary_new_from_node_args(ast, 0);
       case NODE_ARGS_AUX:
       case NODE_LAST:
         break;
@@ -699,6 +724,15 @@ ast_node_last_column(rb_execution_context_t *ec, VALUE self)
 }
 
 static VALUE
+ast_node_all_tokens(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return rb_ast_tokens(data->ast);
+}
+
+static VALUE
 ast_node_inspect(rb_execution_context_t *ec, VALUE self)
 {
     VALUE str;
diff --git a/ast.rb b/ast.rb
index f866bd23e5..f3f72c747f 100644
--- a/ast.rb
+++ b/ast.rb
@@ -20,21 +20,47 @@
 module RubyVM::AbstractSyntaxTree
 
   #  call-seq:
-  #     RubyVM::AbstractSyntaxTree.parse(string) -> RubyVM::AbstractSyntaxTree::Node
+  #     RubyVM::AbstractSyntaxTree.parse(string, keep_script_lines: false, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node
   #
   #  Parses the given _string_ into an abstract syntax tree,
   #  returning the root node of that tree.
   #
-  #  SyntaxError is raised if the given _string_ is invalid syntax.
-  #
   #    RubyVM::AbstractSyntaxTree.parse("x = 1 + 2")
   #    # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-1:9>
-  def self.parse string, keep_script_lines: false
-    Primitive.ast_s_parse string, keep_script_lines
+  #
+  #  If <tt>keep_script_lines: true</tt> option is provided, the text of the parsed
+  #  source is associated with nodes and is available via Node#script_lines.
+  #
+  #  If <tt>keep_tokens: true</tt> option is provided, Node#tokens are populated.
+  #
+  #  SyntaxError is raised if the given _string_ is invalid syntax. To overwrite this
+  #  behavior, <tt>error_tolerant: true</tt> can be provided. In this case, the parser
+  #  will produce a tree where expressions with syntax errors would be represented by
+  #  Node with <tt>type=:ERROR</tt>.
+  #
+  #     root = RubyVM::AbstractSyntaxTree.parse("x = 1; p(x; y=2")
+  #     # <internal:ast>:33:in `parse': syntax error, unexpected ';', expecting ')' (SyntaxError)
+  #     # x = 1; p(x; y=2
+  #     #           ^
+  #
+  #     root = RubyVM::AbstractSyntaxTree.parse("x = 1; p(x; y=2", error_tolerant: true)
+  #     # (SCOPE@1:0-1:15
+  #     #  tbl: [:x, :y]
+  #     #  args: nil
+  #     #  body: (BLOCK@1:0-1:15 (LASGN@1:0-1:5 :x (LIT@1:4-1:5 1)) (ERROR@1:7-1:11) (LASGN@1:12-1:15 :y (LIT@1:14-1:15 2))))
+  #     root.children.last.children
+  #     # [(LASGN@1:0-1:5 :x (LIT@1:4-1:5 1)),
+  #     #  (ERROR@1:7-1:11),
+  #     #  (LASGN@1:12-1:15 :y (LIT@1:14-1:15 2))]
+  #
+  #  Note that parsing continues even after the errored expresion.
+  #
+  def self.parse string, keep_script_lines: false, error_tolerant: false, keep_tokens: false
+    Primitive.ast_s_parse string, keep_script_lines, error_tolerant, keep_tokens
   end
 
   #  call-seq:
-  #     RubyVM::AbstractSyntaxTree.parse_file(pathname) -> RubyVM::AbstractSyntaxTree::Node
+  #     RubyVM::AbstractSyntaxTree.parse_file(pathname, keep_script_lines: false, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node
   #
   #   Reads the file from _pathname_, then parses it like ::parse,
   #   returning the root node of the abstract syntax tree.
@@ -44,13 +70,15 @@ module RubyVM::AbstractSyntaxTree
   #
   #     RubyVM::AbstractSyntaxTree.parse_file("my-app/app.rb")
   #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-31:3>
-  def self.parse_file pathname, keep_script_lines: false
-    Primitive.ast_s_parse_file pathname, keep_script_lines
+  #
+  #   See ::parse for explanation of keyword argument meaning and usage.
+  def self.parse_file pathname, keep_script_lines: false, error_tolerant: false, keep_tokens: false
+    Primitive.ast_s_parse_file pathname, keep_script_lines, error_tolerant, keep_tokens
   end
 
   #  call-seq:
-  #     RubyVM::AbstractSyntaxTree.of(proc)   -> RubyVM::AbstractSyntaxTree::Node
-  #     RubyVM::AbstractSyntaxTree.of(method) -> RubyVM::AbstractSyntaxTree::Node
+  #     RubyVM::AbstractSyntaxTree.of(proc, keep_script_lines: false, error_tolerant: false, keep_tokens: false)   -> RubyVM::AbstractSyntaxTree::Node
+  #     RubyVM::AbstractSyntaxTree.of(method, keep_script_lines: false, error_tolerant: false, keep_tokens: false) -> RubyVM::AbstractSyntaxTree::Node
   #
   #   Returns AST nodes of the given _proc_ or _method_.
   #
@@ -63,8 +91,25 @@ module RubyVM::AbstractSyntaxTree
   #
   #     RubyVM::AbstractSyntaxTree.of(method(:hello))
   #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-3:3>
-  def self.of body, keep_script_lines: false
-    Primitive.ast_s_of body, keep_script_lines
+  #
+  #   See ::parse for explanation of keyword argument meaning and usage.
+  def self.of body, keep_script_lines: false, error_tolerant: false, keep_tokens: false
+    Primitive.ast_s_of body, keep_script_lines, error_tolerant, keep_tokens
+  end
+
+  #  call-seq:
+  #     RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(backtrace_location)   -> integer
+  #
+  #   Returns the node id for the given backtrace location.
+  #
+  #     begin
+  #       raise
+  #     rescue =>  e
+  #       loc = e.backtrace_locations.first
+  #       RubyVM::AbstractSyntaxTree.node_id_for_backtrace_location(loc)
+  #     end # => 0
+  def self.node_id_for_backtrace_location backtrace_location
+    Primitive.node_id_for_backtrace_location backtrace_location
   end
 
   # RubyVM::AbstractSyntaxTree::Node instances are created by parse methods in
@@ -122,6 +167,47 @@ module RubyVM::AbstractSyntaxTree
     end
 
     #  call-seq:
+    #     node.tokens -> array
+    #
+    #  Returns tokens corresponding to the location of the node.
+    #  Returns +nil+ if +keep_tokens+ is not enabled when #parse method is called.
+    #
+    #    root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2", keep_tokens: true)
+    #    root.tokens # => [[0, :tIDENTIFIER, "x", [1, 0, 1, 1]], [1, :tSP, " ", [1, 1, 1, 2]], ...]
+    #    root.tokens.map{_1[2]}.join # => "x = 1 + 2"
+    #
+    #  Token is an array of:
+    #
+    #  - id
+    #  - token type
+    #  - source code text
+    #  - location [ first_lineno, first_column, last_lineno, last_column ]
+    def tokens
+      return nil unless all_tokens
+
+      all_tokens.each_with_object([]) do |token, a|
+        loc = token.last
+        if ([first_lineno, first_column] <=> [loc[0], loc[1]]) <= 0 &&
+           ([last_lineno, last_column]   <=> [loc[2], loc[3]]) >= 0
+           a << token
+        end
+      end
+    end
+
+    #  call-seq:
+    #     node.all_tokens -> array
+    #
+    #  Returns all tokens for the input script regardless the receiver node.
+    #  Returns +nil+ if +keep_tokens+ is not enabled when #parse method is called.
+    #
+    #    root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2", keep_tokens: true)
+    #    root.all_tokens # => [[0, :tIDENTIFIER, "x", [1, 0, 1, 1]], [1, :tSP, " ", [1, 1, 1, 2]], ...]
+    #    root.children[-1].all_tokens # => [[0, :tIDENTIFIER, "x", [1, 0, 1, 1]], [1, :tSP, " ", [1, 1, 1, 2]], ...]
+    def all_tokens
+      Primitive.ast_node_all_tokens
+    end
+
+    #  call-seq:
     #     node.children -> array
     #
     #  Returns AST nodes under this one.  Each kind of node
diff --git a/benchmark/array_sort_int.yml b/benchmark/array_sort_int.yml
new file mode 100644
index 0000000000..7b9027ebf7
--- /dev/null
+++ b/benchmark/array_sort_int.yml
@@ -0,0 +1,15 @@
+prelude: |
+  ary2 = 2.times.to_a.shuffle
+  ary10 = 10.times.to_a.shuffle
+  ary100 = 100.times.to_a.shuffle
+  ary1000 = 1000.times.to_a.shuffle
+  ary10000 = 10000.times.to_a.shuffle
+
+benchmark:
+  ary2.sort: ary2.sort
+  ary10.sort: ary10.sort
+  ary100.sort: ary100.sort
+  ary1000.sort: ary1000.sort
+  ary10000.sort: ary10000.sort
+
+loop_count: 10000
diff --git a/benchmark/cgi_escape_html.yml b/benchmark/cgi_escape_html.yml
index af6abd08ac..655be9d7d8 100644
--- a/benchmark/cgi_escape_html.yml
+++ b/benchmark/cgi_escape_html.yml
@@ -1,32 +1,23 @@
-prelude: require 'cgi/escape'
+prelude: |
+  # frozen_string_literal: true
+  require 'cgi/escape'
 benchmark:
-  - name: escape_html_blank
-    prelude: str = ""
-    script: CGI.escapeHTML(str)
+  - script: CGI.escapeHTML("")
     loop_count: 20000000
-  - name: escape_html_short_none
-    prelude: str = "abcde"
-    script: CGI.escapeHTML(str)
+  - script: CGI.escapeHTML("abcde")
     loop_count: 20000000
-  - name: escape_html_short_one
-    prelude: str = "abcd<"
-    script: CGI.escapeHTML(str)
+  - script: CGI.escapeHTML("abcd<")
     loop_count: 20000000
-  - name: escape_html_short_all
-    prelude: str = "'&\"<>"
-    script: CGI.escapeHTML(str)
+  - script: CGI.escapeHTML("'&\"<>")
     loop_count: 5000000
-  - name: escape_html_long_none
-    prelude: str = "abcde" * 300
-    script: CGI.escapeHTML(str)
+  - prelude: long_no_escape = "abcde" * 300
+    script: CGI.escapeHTML(long_no_escape)
     loop_count: 1000000
-  - name: escape_html_long_all
-    prelude: str = "'&\"<>" * 10
-    script: CGI.escapeHTML(str)
+  - prelude: long_all_escape = "'&\"<>" * 10
+    script: CGI.escapeHTML(long_all_escape)
     loop_count: 1000000
-  - name: escape_html_real
-    prelude: | # http://example.com/
-      str = <<~HTML
+  - prelude: | # http://example.com/
+      example_html = <<~HTML
         <body>
         <div>
             <h1>Example Domain</h1>
@@ -36,5 +27,5 @@ benchmark:
         </div>
         </body>
       HTML
-    script: CGI.escapeHTML(str)
+    script: CGI.escapeHTML(example_html)
     loop_count: 1000000
diff --git a/benchmark/enum_minmax.yml b/benchmark/enum_minmax.yml
new file mode 100644
index 0000000000..9d01731abb
--- /dev/null
+++ b/benchmark/enum_minmax.yml
@@ -0,0 +1,25 @@
+prelude: |
+  set2 = 2.times.to_a.shuffle.to_set
+  set10 = 10.times.to_a.shuffle.to_set
+  set100 = 100.times.to_a.shuffle.to_set
+  set1000 = 1000.times.to_a.shuffle.to_set
+  set10000 = 10000.times.to_a.shuffle.to_set
+
+benchmark:
+  set2.min: set2.min
+  set10.min: set10.min
+  set100.min: set100.min
+  set1000.min: set1000.min
+  set10000.min: set10000.min
+  set2.max: set2.max
+  set10.max: set10.max
+  set100.max: set100.max
+  set1000.max: set1000.max
+  set10000.max: set10000.max
+  set2.minmax: set2.minmax
+  set10.minmax: set10.minmax
+  set100.minmax: set100.minmax
+  set1000.minmax: set1000.minmax
+  set10000.minmax: set10000.minmax
+
+loop_count: 10000
diff --git a/benchmark/enum_sort.yml b/benchmark/enum_sort.yml
new file mode 100644
index 0000000000..6f26e748c6
--- /dev/null
+++ b/benchmark/enum_sort.yml
@@ -0,0 +1,15 @@
+prelude: |
+  set2 = 2.times.to_a.shuffle.to_set
+  set10 = 10.times.to_a.shuffle.to_set
+  set100 = 100.times.to_a.shuffle.to_set
+  set1000 = 1000.times.to_a.shuffle.to_set
+  set10000 = 10000.times.to_a.shuffle.to_set
+
+benchmark:
+  set2.sort_by: set2.sort_by { 0 }
+  set10.sort_by: set10.sort_by { 0 }
+  set100.sort_by: set100.sort_by { 0 }
+  set1000.sort_by: set1000.sort_by { 0 }
+  set10000.sort_by: set10000.sort_by { 0 }
+
+loop_count: 10000
diff --git a/benchmark/erb_escape_html.yml b/benchmark/erb_escape_html.yml
new file mode 100644
index 0000000000..ca28d756e7
--- /dev/null
+++ b/benchmark/erb_escape_html.yml
@@ -0,0 +1,31 @@
+prelude: |
+  # frozen_string_literal: true
+  require 'erb'
+benchmark:
+  - script: ERB::Util.html_escape("")
+    loop_count: 20000000
+  - script: ERB::Util.html_escape("abcde")
+    loop_count: 20000000
+  - script: ERB::Util.html_escape("abcd<")
+    loop_count: 20000000
+  - script: ERB::Util.html_escape("'&\"<>")
+    loop_count: 5000000
+  - prelude: long_no_escape = "abcde" * 300
+    script: ERB::Util.html_escape(long_no_escape)
+    loop_count: 1000000
+  - prelude: long_all_escape = "'&\"<>" * 10
+    script: ERB::Util.html_escape(long_all_escape)
+    loop_count: 1000000
+  - prelude: | # http://example.com/
+      example_html = <<~HTML
+        <body>
+        <div>
+            <h1>Example Domain</h1>
+            <p>This domain is established to be used for illustrative examples in documents. You may use this
+            domain in examples without prior coordination or asking for permission.</p>
+            <p><a href="http://www.iana.org/domains/example">More information...</a></p>
+        </div>
+        </body>
+      HTML
+    script: ERB::Util.html_escape(example_html)
+    loop_count: 1000000
diff --git a/benchmark/lib/benchmark_driver/runner/mjit.rb b/benchmark/lib/benchmark_driver/runner/mjit.rb
index 1d4693e8be..3a58a620de 100644
--- a/benchmark/lib/benchmark_driver/runner/mjit.rb
+++ b/benchmark/lib/benchmark_driver/runner/mjit.rb
@@ -16,7 +16,7 @@ class BenchmarkDriver::Runner::Mjit < BenchmarkDriver::Runner::Ips
         job.prelude = "#{job.prelude}\n#{<<~EOS}"
           if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
             __bmdv_ruby_i = 0
-            while __bmdv_ruby_i < 10000 # jit_min_calls
+            while __bmdv_ruby_i < 10000 # MJIT call threshold
               #{job.script}
               __bmdv_ruby_i += 1
             end
diff --git a/benchmark/numeric_methods.yml b/benchmark/numeric_methods.yml
index 433c2268a3..1384902935 100644
--- a/benchmark/numeric_methods.yml
+++ b/benchmark/numeric_methods.yml
@@ -10,4 +10,20 @@ benchmark:
     int.finite?
   infinite?: |
     int.infinite?
+  integer_real: |
+    int.real
+  float_real: |
+    flo.real
+  integr_imag: |
+    int.imag
+  float_imag: |
+    flo.imag
+  integer_conj: |
+    int.conj
+  float_conj: |
+    flo.conj
+  integer_numerator: |
+    int.numerator
+  integer_denominator: |
+    int.denominator
 loop_count: 20000000
diff --git a/benchmark/range_min.yml b/benchmark/range_min.yml
new file mode 100644
index 0000000000..9e60dd7308
--- /dev/null
+++ b/benchmark/range_min.yml
@@ -0,0 +1,2 @@
+benchmark:
+  - (1..10).min
diff --git a/benchmark/time_parse.yml b/benchmark/time_parse.yml
index a6d6948b9c..6060b58bc6 100644
--- a/benchmark/time_parse.yml
+++ b/benchmark/time_parse.yml
@@ -6,3 +6,5 @@ benchmark:
   - Time.iso8601(iso8601)
   - Time.parse(iso8601)
   - Time.parse(inspect)
+  - Time.new(iso8601) rescue Time.iso8601(iso8601)
+  - Time.new(inspect) rescue Time.parse(inspect)
diff --git a/bignum.c b/bignum.c
index 9901a807b1..cb2c3b6f07 100644
--- a/bignum.c
+++ b/bignum.c
@@ -977,7 +977,7 @@ integer_unpack_num_bdigits_small(size_t numwords, size_t wordsize, size_t nails,
 {
     /* nlp_bits stands for number of leading padding bits */
     size_t num_bits = (wordsize * CHAR_BIT - nails) * numwords;
-    size_t num_bdigits = (num_bits + BITSPERDIG - 1) / BITSPERDIG;
+    size_t num_bdigits = roomof(num_bits, BITSPERDIG);
     *nlp_bits_ret = (int)(num_bdigits * BITSPERDIG - num_bits);
     return num_bdigits;
 }
@@ -987,7 +987,7 @@ integer_unpack_num_bdigits_generic(size_t numwords, size_t wordsize, size_t nail
 {
     /* BITSPERDIG = SIZEOF_BDIGIT * CHAR_BIT */
     /* num_bits = (wordsize * CHAR_BIT - nails) * numwords */
-    /* num_bdigits = (num_bits + BITSPERDIG - 1) / BITSPERDIG */
+    /* num_bdigits = roomof(num_bits, BITSPERDIG) */
 
     /* num_bits = CHAR_BIT * (wordsize * numwords) - nails * numwords = CHAR_BIT * num_bytes1 - nails * numwords */
     size_t num_bytes1 = wordsize * numwords;
@@ -4184,7 +4184,6 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
         }
         if (!c || ISSPACE(c)) --str;
         if (end) len = end - str;
-        ASSERT_LEN();
     }
     c = *str;
     c = conv_digit(c);
@@ -4587,11 +4586,14 @@ big_shift3(VALUE x, int lshift_p, size_t shift_numdigits, int shift_numbits)
 
     if (lshift_p) {
         if (LONG_MAX < shift_numdigits) {
-            rb_raise(rb_eArgError, "too big number");
+          too_big:
+            rb_raise(rb_eRangeError, "shift width too big");
         }
         s1 = shift_numdigits;
         s2 = shift_numbits;
+        if ((size_t)s1 != shift_numdigits) goto too_big;
         xn = BIGNUM_LEN(x);
+        if (LONG_MAX/SIZEOF_BDIGIT <= xn+s1) goto too_big;
         z = bignew(xn+s1+1, BIGNUM_SIGN(x));
         zds = BDIGITS(z);
         BDIGITS_ZERO(zds, s1);
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 1d219be71e..f9b3e919b8 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -108,10 +108,16 @@ BT = Class.new(bt) do
 
   def wn=(wn)
     unless wn == 1
-      if /(?:\A|\s)--jobserver-(?:auth|fds)=\K(\d+),(\d+)/ =~ ENV.delete("MAKEFLAGS")
+      if /(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:((?:\\.|\S)+))/ =~ ENV.delete("MAKEFLAGS")
         begin
-          r = IO.for_fd($1.to_i(10), "rb", autoclose: false)
-          w = IO.for_fd($2.to_i(10), "wb", autoclose: false)
+          if fifo = $3
+            fifo.gsub!(/\\(?=.)/, '')
+            r = File.open(fifo, IO::RDONLY|IO::NONBLOCK|IO::BINARY)
+            w = File.open(fifo, IO::WRONLY|IO::NONBLOCK|IO::BINARY)
+          else
+            r = IO.for_fd($1.to_i(10), "rb", autoclose: false)
+            w = IO.for_fd($2.to_i(10), "wb", autoclose: false)
+          end
         rescue => e
           r.close if r
         else
diff --git a/bootstraptest/test_attr.rb b/bootstraptest/test_attr.rb
index 721a847145..3cb9d3eb39 100644
--- a/bootstraptest/test_attr.rb
+++ b/bootstraptest/test_attr.rb
@@ -34,3 +34,19 @@ assert_equal %{ok}, %{
     print "ok"
   end
 }, '[ruby-core:15120]'
+
+assert_equal %{ok}, %{
+  class Big
+    attr_reader :foo
+    def initialize
+      @foo = "ok"
+    end
+  end
+
+  obj = Big.new
+  100.times do |i|
+    obj.instance_variable_set(:"@ivar_\#{i}", i)
+  end
+
+  Big.new.foo
+}
diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb
index b29db7ab0e..67e66b03ee 100644
--- a/bootstraptest/test_ractor.rb
+++ b/bootstraptest/test_ractor.rb
@@ -283,8 +283,9 @@ assert_equal 30.times.map { 'ok' }.to_s, %q{
   30.times.map{|i|
     test i
   }
-} unless ENV['RUN_OPTS'] =~ /--jit-min-calls=5/ || # This always fails with --jit-wait --jit-min-calls=5
-  (ENV.key?('TRAVIS') && ENV['TRAVIS_CPU_ARCH'] == 'arm64') # https://bugs.ruby-lang.org/issues/17878
+} unless ENV['RUN_OPTS'] =~ /--mjit-call-threshold=5/ || # This always fails with --mjit-wait --mjit-call-threshold=5
+  (ENV.key?('TRAVIS') && ENV['TRAVIS_CPU_ARCH'] == 'arm64') || # https://bugs.ruby-lang.org/issues/17878
+  true # too flaky everywhere http://ci.rvm.jp/results/trunk@ruby-sp1/4321096
 
 # Exception for empty select
 assert_match /specify at least one ractor/, %q{
@@ -501,7 +502,7 @@ assert_equal '[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]', %q{
     rs.delete r
     n
   }.sort
-}
+} unless /mswin/ =~ RUBY_PLATFORM # randomly hangs on mswin https://github.com/ruby/ruby/actions/runs/3753871445/jobs/6377551069#step:20:131
 
 # Ractor.select also support multiple take, receive and yield
 assert_equal '[true, true, true]', %q{
@@ -1472,7 +1473,7 @@ assert_equal "#{N}#{N}", %Q{
 }
 
 # enc_table
-assert_equal "#{N/10}", %Q{
+assert_equal "100", %Q{
   Ractor.new do
     loop do
       Encoding.find("test-enc-#{rand(5_000)}").inspect
@@ -1481,7 +1482,7 @@ assert_equal "#{N/10}", %Q{
   end
 
   src = Encoding.find("UTF-8")
-  #{N/10}.times{|i|
+  100.times{|i|
     src.replicate("test-enc-\#{i}")
   }
 }
@@ -1579,4 +1580,49 @@ assert_equal "ok", %q{
   end
 }
 
+assert_equal "ok", %q{
+  module M
+    def foo
+      @foo
+    end
+  end
+
+  class A
+    include M
+
+    def initialize
+      100.times { |i| instance_variable_set(:"@var_#{i}", "bad: #{i}") }
+      @foo = 2
+    end
+  end
+
+  class B
+    include M
+
+    def initialize
+      @foo = 1
+    end
+  end
+
+  Ractor.new do
+    b = B.new
+    100_000.times do
+      raise unless b.foo == 1
+    end
+  end
+
+  a = A.new
+  100_000.times do
+    raise unless a.foo == 2
+  end
+
+  "ok"
+}
+
+assert_match /\Atest_ractor\.rb:1:\s+warning:\s+Ractor is experimental/, %q{
+  Warning[:experimental] = $VERBOSE = true
+  STDERR.reopen(STDOUT)
+  eval("Ractor.new{}.take", nil, "test_ractor.rb", 1)
+}
+
 end # if !ENV['GITHUB_WORKFLOW']
diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb
index 2dc460c628..5c655b8f25 100644
--- a/bootstraptest/test_yjit.rb
+++ b/bootstraptest/test_yjit.rb
@@ -1,3 +1,33 @@
+# Regression test for yielding with autosplat to block with
+# optional parameters. https://github.com/Shopify/yjit/issues/313
+assert_equal '[:a, :b, :a, :b]', %q{
+  def yielder(arg) = yield(arg) + yield(arg)
+
+  yielder([:a, :b]) do |c = :c, d = :d|
+    [c, d]
+  end
+}
+
+# Regression test for GC mishap while doing shape transition
+assert_equal '[:ok]', %q{
+  # [Bug #19601]
+  class RegressionTest
+    def initialize
+      @a = @b = @fourth_ivar_does_shape_transition = nil
+    end
+
+    def extender
+      @first_extended_ivar = [:ok]
+    end
+  end
+
+  GC.stress = true
+
+  # Used to crash due to GC run in rb_ensure_iv_list_size()
+  # not marking the newly allocated [:ok].
+  RegressionTest.new.extender.itself
+}
+
 assert_equal 'true', %q{
   # regression test for tracking type of locals for too long
   def local_setting_cmp(five)
@@ -45,6 +75,29 @@ assert_normal_exit %q{
   Object.send(:remove_const, :Foo)
 }
 
+assert_normal_exit %q{
+  # Test to ensure send on overriden c functions
+  # doesn't corrupt the stack
+  class Bar
+    def bar(x)
+      x
+    end
+  end
+
+  class Foo
+    def bar
+      Bar.new
+    end
+  end
+
+  foo = Foo.new
+  # before this change, this line would error
+  # because "s" would still be on the stack
+  # String.to_s is the overridden method here
+  p foo.bar.bar("s".__send__(:to_s))
+}
+
+
 assert_equal '[nil, nil, nil, nil, nil, nil]', %q{
   [NilClass, TrueClass, FalseClass, Integer, Float, Symbol].each do |klass|
     klass.class_eval("def foo = @foo")
@@ -198,6 +251,8 @@ assert_equal 'string', %q{
 
 # Check that exceptions work when getting global variable
 assert_equal 'rescued', %q{
+  Warning[:deprecated] = true
+
   module Warning
     def warn(message)
       raise
@@ -1118,6 +1173,38 @@ assert_equal '42', %q{
   run
 }
 
+# splatting an empty array on a specialized method
+assert_equal 'ok', %q{
+  def run
+    "ok".to_s(*[])
+  end
+
+  run
+  run
+}
+
+# splatting an single element array on a specialized method
+assert_equal '[1]', %q{
+  def run
+    [].<<(*[1])
+  end
+
+  run
+  run
+}
+
+# specialized method with wrong args
+assert_equal 'ok', %q{
+  def run(x)
+    "bad".to_s(123) if x
+  rescue
+    :ok
+  end
+
+  run(false)
+  run(true)
+}
+
 # getinstancevariable on Symbol
 assert_equal '[nil, nil]', %q{
   # @foo to exercise the getinstancevariable instruction
@@ -2150,7 +2237,7 @@ assert_equal '[[:c_return, :String, :string_alias, "events_to_str"]]', %q{
   events.compiled(events)
 
   events
-}
+} unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # MJIT calls extra Ruby methods
 
 # test enabling a TracePoint that targets a particular line in a C method call
 assert_equal '[true]', %q{
@@ -2232,7 +2319,7 @@ assert_equal '[[:c_call, :itself]]', %q{
   tp.enable { shouldnt_compile }
 
   events
-}
+} unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # MJIT calls extra Ruby methods
 
 # test enabling c_return tracing before compiling
 assert_equal '[[:c_return, :itself, main]]', %q{
@@ -2247,6 +2334,26 @@ assert_equal '[[:c_return, :itself, main]]', %q{
   tp.enable { shouldnt_compile }
 
   events
+} unless defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # MJIT calls extra Ruby methods
+
+# test c_call invalidation
+assert_equal '[[:c_call, :itself]]', %q{
+  # enable the event once to make sure invalidation
+  # happens the second time we enable it
+  TracePoint.new(:c_call) {}.enable{}
+
+  def compiled
+    itself
+  end
+
+  # assume first call compiles
+  compiled
+
+  events = []
+  tp = TracePoint.new(:c_call) { |tp| events << [tp.event, tp.method_id] }
+  tp.enable { compiled }
+
+  events
 }
 
 # test enabling tracing for a suspended fiber
@@ -3337,3 +3444,87 @@ assert_equal '[[1, nil, 2]]', %q{
 
   5.times.map { opt_and_kwargs(1, c: 2) }.uniq
 }
+
+# bmethod with forwarded block
+assert_equal '2', %q{
+  define_method(:foo) do |&block|
+    block.call
+  end
+
+  def bar(&block)
+    foo(&block)
+  end
+
+  bar { 1 }
+  bar { 2 }
+}
+
+# bmethod with forwarded block and arguments
+assert_equal '5', %q{
+  define_method(:foo) do |n, &block|
+    n + block.call
+  end
+
+  def bar(n, &block)
+    foo(n, &block)
+  end
+
+  bar(0) { 1 }
+  bar(3) { 2 }
+}
+
+# bmethod with forwarded unwanted block
+assert_equal '1', %q{
+  one = 1
+  define_method(:foo) do
+    one
+  end
+
+  def bar(&block)
+    foo(&block)
+  end
+
+  bar { }
+  bar { }
+}
+
+# test for return stub lifetime issue
+assert_equal '1', %q{
+  def foo(n)
+    if n == 2
+      return 1.times { Object.define_method(:foo) {} }
+    end
+
+    foo(n + 1)
+  end
+
+  foo(1)
+}
+
+# case-when with redefined ===
+assert_equal 'ok', %q{
+  class Symbol
+    def ===(a)
+      true
+    end
+  end
+
+  def cw(arg)
+    case arg
+    when :b
+      :ok
+    when 4
+      :ng
+    end
+  end
+
+  cw(4)
+}
+
+assert_normal_exit %{
+  class Bug20997
+    def foo(&) = self.class.name(&)
+
+    new.foo
+  end
+}
diff --git a/builtin.h b/builtin.h
index 7ad52f44f4..38ad5a1629 100644
--- a/builtin.h
+++ b/builtin.h
@@ -13,7 +13,7 @@ struct rb_builtin_function {
     const char * const name;
 
     // for jit
-    void (*compiler)(FILE *, long, unsigned, bool);
+    void (*compiler)(VALUE, long, unsigned, bool);
 };
 
 #define RB_BUILTIN_FUNCTION(_i, _name, _fname, _arity, _compiler) {\
diff --git a/ccan/check_type/check_type.h b/ccan/check_type/check_type.h
index e795ad71d0..659e1a5a83 100644
--- a/ccan/check_type/check_type.h
+++ b/ccan/check_type/check_type.h
@@ -44,7 +44,7 @@
  *		 ((encl_type *)						\
  *		  ((char *)(mbr_ptr) - offsetof(enclosing_type, mbr))))
  */
-#if HAVE_TYPEOF
+#if defined(HAVE_TYPEOF) && HAVE_TYPEOF
 #define ccan_check_type(expr, type)			\
 	((typeof(expr) *)0 != (type *)0)
 
diff --git a/ccan/container_of/container_of.h b/ccan/container_of/container_of.h
index b30c347d57..872bb6ea6e 100644
--- a/ccan/container_of/container_of.h
+++ b/ccan/container_of/container_of.h
@@ -112,7 +112,7 @@ static inline char *container_of_or_null_(void *member_ptr, size_t offset)
  *		return i;
  *	}
  */
-#if HAVE_TYPEOF
+#if defined(HAVE_TYPEOF) && HAVE_TYPEOF
 #define ccan_container_of_var(member_ptr, container_var, member) \
 	ccan_container_of(member_ptr, typeof(*container_var), member)
 #else
@@ -131,7 +131,7 @@ static inline char *container_of_or_null_(void *member_ptr, size_t offset)
  * structure memory layout.
  *
  */
-#if HAVE_TYPEOF
+#if defined(HAVE_TYPEOF) && HAVE_TYPEOF
 #define ccan_container_off_var(var, member)		\
 	ccan_container_off(typeof(*var), member)
 #else
diff --git a/ccan/list/list.h b/ccan/list/list.h
index 91787bfdb3..30b2af04e9 100644
--- a/ccan/list/list.h
+++ b/ccan/list/list.h
@@ -770,7 +770,7 @@ static inline struct ccan_list_node *ccan_list_node_from_off_(void *ptr, size_t
 	(ccan_container_off_var(var, member) +		\
 	 ccan_check_type(var->member, struct ccan_list_node))
 
-#if HAVE_TYPEOF
+#if defined(HAVE_TYPEOF) && HAVE_TYPEOF
 #define ccan_list_typeof(var) typeof(var)
 #else
 #define ccan_list_typeof(var) void *
diff --git a/class.c b/class.c
index 3a83a7f052..cf0b7b821f 100644
--- a/class.c
+++ b/class.c
@@ -64,7 +64,7 @@ push_subclass_entry_to_list(VALUE super, VALUE klass)
 void
 rb_class_subclass_add(VALUE super, VALUE klass)
 {
-    if (super && super != Qundef) {
+    if (super && !UNDEF_P(super)) {
         rb_subclass_entry_t *entry = push_subclass_entry_to_list(super, klass);
         RCLASS_SUBCLASS_ENTRY(klass) = entry;
     }
@@ -197,7 +197,7 @@ class_alloc(VALUE flags, VALUE klass)
 {
     size_t alloc_size = sizeof(struct RClass);
 
-#if USE_RVARGC
+#if RCLASS_EXT_EMBEDDED
     alloc_size += sizeof(rb_classext_t);
 #endif
 
@@ -206,17 +206,13 @@ class_alloc(VALUE flags, VALUE klass)
     if (RGENGC_WB_PROTECTED_CLASS) flags |= FL_WB_PROTECTED;
     RVARGC_NEWOBJ_OF(obj, struct RClass, klass, flags, alloc_size);
 
-#if USE_RVARGC
+#if RCLASS_EXT_EMBEDDED
     memset(RCLASS_EXT(obj), 0, sizeof(rb_classext_t));
-# if SIZEOF_SERIAL_T != SIZEOF_VALUE
-    RCLASS(obj)->class_serial_ptr = ZALLOC(rb_serial_t);
-# endif
 #else
     obj->ptr = ZALLOC(rb_classext_t);
 #endif
 
     /* ZALLOC
-      RCLASS_IV_TBL(obj) = 0;
       RCLASS_CONST_TBL(obj) = 0;
       RCLASS_M_TBL(obj) = 0;
       RCLASS_IV_INDEX_TBL(obj) = 0;
@@ -226,7 +222,6 @@ class_alloc(VALUE flags, VALUE klass)
       RCLASS_MODULE_SUBCLASSES(obj) = NULL;
      */
     RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj);
-    RCLASS_SERIAL(obj) = rb_next_class_serial();
     RB_OBJ_WRITE(obj, &RCLASS_REFINED_CLASS(obj), Qnil);
     RCLASS_ALLOCATOR(obj) = 0;
 
@@ -282,7 +277,7 @@ rb_class_update_superclasses(VALUE klass)
     VALUE super = RCLASS_SUPER(klass);
 
     if (!RB_TYPE_P(klass, T_CLASS)) return;
-    if (super == Qundef) return;
+    if (UNDEF_P(super)) return;
 
     // If the superclass array is already built
     if (RCLASS_SUPERCLASSES(klass))
@@ -331,7 +326,13 @@ rb_class_new(VALUE super)
 {
     Check_Type(super, T_CLASS);
     rb_check_inheritable(super);
-    return rb_class_boot(super);
+    VALUE klass = rb_class_boot(super);
+
+    if (super != rb_cObject && super != rb_cBasicObject) {
+        RCLASS_EXT(klass)->max_iv_count = RCLASS_EXT(super)->max_iv_count;
+    }
+
+    return klass;
 }
 
 VALUE
@@ -403,26 +404,57 @@ class_init_copy_check(VALUE clone, VALUE orig)
     }
 }
 
+struct cvc_table_copy_ctx {
+    VALUE clone;
+    struct rb_id_table * new_table;
+};
+
+static enum rb_id_table_iterator_result
+cvc_table_copy(ID id, VALUE val, void *data) {
+    struct cvc_table_copy_ctx *ctx = (struct cvc_table_copy_ctx *)data;
+    struct rb_cvar_class_tbl_entry * orig_entry;
+    orig_entry = (struct rb_cvar_class_tbl_entry *)val;
+
+    struct rb_cvar_class_tbl_entry *ent;
+
+    ent = ALLOC(struct rb_cvar_class_tbl_entry);
+    ent->class_value = ctx->clone;
+    ent->cref = orig_entry->cref;
+    ent->global_cvar_state = orig_entry->global_cvar_state;
+    rb_id_table_insert(ctx->new_table, id, (VALUE)ent);
+
+    RB_OBJ_WRITTEN(ctx->clone, Qundef, ent->cref);
+
+    return ID_TABLE_CONTINUE;
+}
+
 static void
 copy_tables(VALUE clone, VALUE orig)
 {
-    if (RCLASS_IV_TBL(clone)) {
-        st_free_table(RCLASS_IV_TBL(clone));
-        RCLASS_IV_TBL(clone) = 0;
-    }
     if (RCLASS_CONST_TBL(clone)) {
         rb_free_const_table(RCLASS_CONST_TBL(clone));
         RCLASS_CONST_TBL(clone) = 0;
     }
+    if (RCLASS_CVC_TBL(orig)) {
+        struct rb_id_table *rb_cvc_tbl = RCLASS_CVC_TBL(orig);
+        struct rb_id_table *rb_cvc_tbl_dup = rb_id_table_create(rb_id_table_size(rb_cvc_tbl));
+
+        struct cvc_table_copy_ctx ctx;
+        ctx.clone = clone;
+        ctx.new_table = rb_cvc_tbl_dup;
+        rb_id_table_foreach(rb_cvc_tbl, cvc_table_copy, &ctx);
+        RCLASS_CVC_TBL(clone) = rb_cvc_tbl_dup;
+    }
+    rb_id_table_free(RCLASS_M_TBL(clone));
     RCLASS_M_TBL(clone) = 0;
-    if (RCLASS_IV_TBL(orig)) {
+    if (!RB_TYPE_P(clone, T_ICLASS)) {
         st_data_t id;
 
         rb_iv_tbl_copy(clone, orig);
         CONST_ID(id, "__tmp_classpath__");
-        st_delete(RCLASS_IV_TBL(clone), &id, 0);
+        rb_attr_delete(clone, id);
         CONST_ID(id, "__classpath__");
-        st_delete(RCLASS_IV_TBL(clone), &id, 0);
+        rb_attr_delete(clone, id);
     }
     if (RCLASS_CONST_TBL(orig)) {
         struct clone_const_arg arg;
@@ -524,7 +556,6 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
             prev_clone_p = clone_p;
             RCLASS_M_TBL(clone_p) = RCLASS_M_TBL(p);
             RCLASS_CONST_TBL(clone_p) = RCLASS_CONST_TBL(p);
-            RCLASS_IV_TBL(clone_p) = RCLASS_IV_TBL(p);
             RCLASS_ALLOCATOR(clone_p) = RCLASS_ALLOCATOR(p);
             if (RB_TYPE_P(clone, T_CLASS)) {
                 RCLASS_SET_INCLUDER(clone_p, clone);
@@ -611,16 +642,14 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 
         RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass));
         RCLASS_ALLOCATOR(clone) = RCLASS_ALLOCATOR(klass);
-        if (RCLASS_IV_TBL(klass)) {
-            rb_iv_tbl_copy(clone, klass);
-        }
+        rb_iv_tbl_copy(clone, klass);
         if (RCLASS_CONST_TBL(klass)) {
             struct clone_const_arg arg;
             arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
             arg.klass = clone;
             rb_id_table_foreach(RCLASS_CONST_TBL(klass), clone_const_i, &arg);
         }
-        if (attach != Qundef) {
+        if (!UNDEF_P(attach)) {
             rb_singleton_class_attached(clone, attach);
         }
         RCLASS_M_TBL_INIT(clone);
@@ -929,7 +958,7 @@ rb_define_class_under(VALUE outer, const char *name, VALUE super)
 }
 
 VALUE
-rb_define_class_id_under(VALUE outer, ID id, VALUE super)
+rb_define_class_id_under_no_pin(VALUE outer, ID id, VALUE super)
 {
     VALUE klass;
 
@@ -946,8 +975,6 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
                      " (%"PRIsVALUE" is given but was %"PRIsVALUE")",
                      outer, rb_id2str(id), RCLASS_SUPER(klass), super);
         }
-        /* Class may have been defined in Ruby and not pin-rooted */
-        rb_vm_add_root_module(klass);
 
         return klass;
     }
@@ -959,12 +986,19 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
     rb_set_class_path_string(klass, outer, rb_id2str(id));
     rb_const_set(outer, id, klass);
     rb_class_inherited(super, klass);
-    rb_vm_add_root_module(klass);
 
     return klass;
 }
 
 VALUE
+rb_define_class_id_under(VALUE outer, ID id, VALUE super)
+{
+    VALUE klass = rb_define_class_id_under_no_pin(outer, id, super);
+    rb_vm_add_root_module(klass);
+    return klass;
+}
+
+VALUE
 rb_module_s_alloc(VALUE klass)
 {
     VALUE mod = class_alloc(T_MODULE, klass);
@@ -1066,13 +1100,10 @@ rb_include_class_new(VALUE module, VALUE super)
         module = METACLASS_OF(module);
     }
     RUBY_ASSERT(!RB_TYPE_P(module, T_ICLASS));
-    if (!RCLASS_IV_TBL(module)) {
-        RCLASS_IV_TBL(module) = st_init_numtable();
-    }
     if (!RCLASS_CONST_TBL(module)) {
         RCLASS_CONST_TBL(module) = rb_id_table_create(0);
     }
-    RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
+
     RCLASS_CVC_TBL(klass) = RCLASS_CVC_TBL(module);
     RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
 
@@ -1114,8 +1145,8 @@ rb_include_module(VALUE klass, VALUE module)
             iclass = iclass->next;
         }
 
-        int do_include = 1;
         while (iclass) {
+            int do_include = 1;
             VALUE check_class = iclass->klass;
             /* During lazy sweeping, iclass->klass could be a dead object that
              * has not yet been swept. */
@@ -1182,7 +1213,7 @@ static int
 do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super, bool check_cyclic)
 {
     VALUE p, iclass, origin_stack = 0;
-    int method_changed = 0, add_subclass;
+    int method_changed = 0;
     long origin_len;
     VALUE klass_origin = RCLASS_ORIGIN(klass);
     VALUE original_klass = klass;
@@ -1246,7 +1277,6 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super
         iclass = rb_include_class_new(module, super_class);
         c = RCLASS_SET_SUPER(c, iclass);
         RCLASS_SET_INCLUDER(iclass, klass);
-        add_subclass = TRUE;
         if (module != RCLASS_ORIGIN(module)) {
             if (!origin_stack) origin_stack = rb_ary_hidden_new(2);
             VALUE origin[2] = {iclass, RCLASS_ORIGIN(module)};
@@ -1257,14 +1287,11 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super
             RCLASS_SET_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), iclass);
             RICLASS_SET_ORIGIN_SHARED_MTBL(iclass);
             rb_ary_resize(origin_stack, origin_len);
-            add_subclass = FALSE;
         }
 
-        if (add_subclass) {
-            VALUE m = module;
-            if (BUILTIN_TYPE(m) == T_ICLASS) m = METACLASS_OF(m);
-            rb_module_add_to_subclasses_list(m, iclass);
-        }
+        VALUE m = module;
+        if (BUILTIN_TYPE(m) == T_ICLASS) m = METACLASS_OF(m);
+        rb_module_add_to_subclasses_list(m, iclass);
 
         if (BUILTIN_TYPE(klass) == T_MODULE && FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
             VALUE refined_class =
@@ -1581,6 +1608,27 @@ class_descendants(VALUE klass, bool immediate_only)
  *     A.subclasses        #=> [D, B]
  *     B.subclasses        #=> [C]
  *     C.subclasses        #=> []
+ *
+ *  Anonymous subclasses (not associated with a constant) are
+ *  returned, too:
+ *
+ *     c = Class.new(A)
+ *     A.subclasses        # => [#<Class:0x00007f003c77bd78>, D, B]
+ *
+ *  Note that the parent does not hold references to subclasses
+ *  and doesn't prevent them from being garbage collected. This
+ *  means that the subclass might disappear when all references
+ *  to it are dropped:
+ *
+ *     # drop the reference to subclass, it can be garbage-collected now
+ *     c = nil
+ *
+ *     A.subclasses
+ *     # It can be
+ *     #  => [#<Class:0x00007f003c77bd78>, D, B]
+ *     # ...or just
+ *     #  => [D, B]
+ *     # ...depending on whether garbage collector was run
  */
 
 VALUE
@@ -1589,6 +1637,33 @@ rb_class_subclasses(VALUE klass)
     return class_descendants(klass, true);
 }
 
+/*
+ *  call-seq:
+ *     attached_object -> object
+ *
+ *  Returns the object for which the receiver is the singleton class.
+ *
+ *  Raises an TypeError if the class is not a singleton class.
+ *
+ *     class Foo; end
+ *
+ *     Foo.singleton_class.attached_object        #=> Foo
+ *     Foo.attached_object                        #=> TypeError: `Foo' is not a singleton class
+ *     Foo.new.singleton_class.attached_object    #=> #<Foo:0x000000010491a370>
+ *     TrueClass.attached_object                  #=> TypeError: `TrueClass' is not a singleton class
+ *     NilClass.attached_object                   #=> TypeError: `NilClass' is not a singleton class
+ */
+
+VALUE
+rb_class_attached_object(VALUE klass)
+{
+    if (!FL_TEST(klass, FL_SINGLETON)) {
+        rb_raise(rb_eTypeError, "`%"PRIsVALUE"' is not a singleton class", klass);
+    }
+
+    return rb_attr_get(klass, id_attached);
+}
+
 static void
 ins_methods_push(st_data_t name, st_data_t ary)
 {
@@ -1639,10 +1714,7 @@ ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
 static int
 ins_methods_undef_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    if ((rb_method_visibility_t)type == METHOD_VISI_UNDEF) {
-        ins_methods_push(name, ary);
-    }
-    return ST_CONTINUE;
+    return ins_methods_type_i(name, type, ary, METHOD_VISI_UNDEF);
 }
 
 struct method_entry_arg {
@@ -2119,9 +2191,7 @@ singleton_class_of(VALUE obj)
     klass = METACLASS_OF(obj);
     if (!(FL_TEST(klass, FL_SINGLETON) &&
           rb_attr_get(klass, id_attached) == obj)) {
-        rb_serial_t serial = RCLASS_SERIAL(klass);
         klass = rb_make_metaclass(obj, klass);
-        RCLASS_SERIAL(klass) = serial;
     }
 
     RB_FL_SET_RAW(klass, RB_OBJ_FROZEN_RAW(obj));
@@ -2135,7 +2205,7 @@ rb_freeze_singleton_class(VALUE x)
     /* should not propagate to meta-meta-class, and so on */
     if (!(RBASIC(x)->flags & FL_SINGLETON)) {
         VALUE klass = RBASIC_CLASS(x);
-        if (klass && (klass = RCLASS_ORIGIN(klass)) != 0 &&
+        if (klass && // no class when hidden from ObjectSpace
             FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
             OBJ_FREEZE_RAW(klass);
         }
diff --git a/common.mk b/common.mk
index c56817d957..126053c9c8 100644
--- a/common.mk
+++ b/common.mk
@@ -18,7 +18,7 @@ mflags = $(MFLAGS)
 gnumake_recursive =
 enable_shared = $(ENABLE_SHARED:no=)
 
-UNICODE_VERSION = 14.0.0
+UNICODE_VERSION = 15.0.0
 UNICODE_EMOJI_VERSION_0 = $(UNICODE_VERSION)///
 UNICODE_EMOJI_VERSION_1 = $(UNICODE_EMOJI_VERSION_0:.0///=)
 UNICODE_EMOJI_VERSION = $(UNICODE_EMOJI_VERSION_1:///=)
@@ -43,14 +43,14 @@ RUN_OPTS      = --disable-gems
 
 # GITPULLOPTIONS = --no-tags
 
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR) $(incflags)
 
 GEM_HOME =
 GEM_PATH =
 GEM_VENDOR =
 
 BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver
-BENCHMARK_DRIVER_GIT_REF = v0.15.18
+BENCHMARK_DRIVER_GIT_REF = v0.16.0
 SIMPLECOV_GIT_URL = https://github.com/colszowka/simplecov.git
 SIMPLECOV_GIT_REF = v0.17.0
 SIMPLECOV_HTML_GIT_URL = https://github.com/colszowka/simplecov-html.git
@@ -115,7 +115,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		math.$(OBJEXT) \
 		memory_view.$(OBJEXT) \
 		mjit.$(OBJEXT) \
-		mjit_compiler.$(OBJEXT) \
+		mjit_c.$(OBJEXT) \
 		node.$(OBJEXT) \
 		numeric.$(OBJEXT) \
 		object.$(OBJEXT) \
@@ -136,6 +136,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		regsyntax.$(OBJEXT) \
 		ruby.$(OBJEXT) \
 		scheduler.$(OBJEXT) \
+		shape.$(OBJEXT) \
 		signal.$(OBJEXT) \
 		sprintf.$(OBJEXT) \
 		st.$(OBJEXT) \
@@ -223,6 +224,7 @@ MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
 YJIT_RUSTC_ARGS = --crate-name=yjit \
 	--crate-type=staticlib \
 	--edition=2021 \
+	-g \
 	-C opt-level=3 \
 	-C overflow-checks=on \
 	'--out-dir=$(CARGO_TARGET_DIR)/release/' \
@@ -233,9 +235,9 @@ all: $(SHOWFLAGS) main docs
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
-main: $(srcdir)/lib/mjit/instruction.rb
-srcs: $(srcdir)/lib/mjit/instruction.rb
-$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/mjit/instruction.rb.erb $(srcdir)/insns.def
+main: $(srcdir)/lib/ruby_vm/mjit/instruction.rb
+srcs: $(srcdir)/lib/ruby_vm/mjit/instruction.rb
+$(srcdir)/lib/ruby_vm/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb $(srcdir)/insns.def
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb --basedir="$(srcdir)" $(INSNS2VMOPT) $@
 
@@ -248,19 +250,7 @@ mjit_config.h: Makefile
 
 .PHONY: mjit-bindgen
 mjit-bindgen:
-	$(Q)$(XRUBY) -C $(srcdir) -Ilib \
-		-e 'ENV["GEM_HOME"] = File.expand_path(".bundle")' \
-		-e 'ENV["BUNDLE_APP_CONFIG"] = File.expand_path(".bundle")' \
-		-e 'ENV["BUNDLE_PATH__SYSTEM"] = "true"' \
-		-e 'ENV["BUNDLE_WITHOUT"] = "lint doc"' \
-		-e 'load "spec/bundler/support/bundle.rb"' -- install --gemfile=tool/mjit/Gemfile
-	$(Q)$(XRUBY) -C $(srcdir) -Ilib \
-		-e 'ENV["GEM_HOME"] = File.expand_path(".bundle")' \
-		-e 'ENV["BUNDLE_APP_CONFIG"] = File.expand_path(".bundle")' \
-		-e 'ENV["BUNDLE_GEMFILE"] = "tool/mjit/Gemfile"' \
-		-e 'ENV["BUNDLE_PATH__SYSTEM"] = "true"' \
-		-e 'ENV["BUNDLE_WITHOUT"] = "lint doc"' \
-		-e 'load "spec/bundler/support/bundle.rb"' -- exec tool/mjit/bindgen.rb $(CURDIR)
+	$(Q) $(BASERUBY) -rrubygems -C $(srcdir)/tool/mjit bindgen.rb $(CURDIR)
 
 # These rules using MJIT_HEADER_SUFFIX must be in common.mk, not
 # Makefile.in, in order to override the macro in defs/universal.mk.
@@ -302,6 +292,8 @@ showflags:
 	"	LC_ALL = $(LC_ALL)" \
 	"	LC_CTYPE = $(LC_CTYPE)" \
 	"	MFLAGS = $(MFLAGS)" \
+	"	RUSTC = $(RUSTC)" \
+	"	YJIT_RUSTC_ARGS = $(YJIT_RUSTC_ARGS)" \
 	$(MESSAGE_END)
 	-@$(CC_VERSION)
 
@@ -642,12 +634,13 @@ clear-installed-list: PHONY
 
 clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-local clean-platform clean-spec
 clean-local:: clean-runnable
-	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(INITOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time
 	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) $(COROUTINE_H:/Context.h=/.time)
 	$(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp ChangeLog $(STATIC_RUBY)$(EXEEXT)
 	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D) builtin_binary.inc
-	-$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine 2> $(NULL) || $(NULLCMD)
+	-$(Q)$(RMALL) yjit/target
+	-$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine yjit 2> $(NULL) || $(NULLCMD)
 
 bin/clean-runnable:: PHONY
 	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || $(NULLCMD)
@@ -773,7 +766,7 @@ clean-spec: PHONY
 	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
 	-$(Q) $(RMALL) rubyspec_temp
 
-check: main test test-tool test-all test-spec
+check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all
 	$(ECHO) check succeeded
 	-$(Q) : : "run only on sh"; \
 	if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
@@ -797,10 +790,11 @@ $(arch:noarch=ignore)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_
 	$(ECHO) generating $@
 	$(Q) $(CPP) -DRUBY_EXPORT $(INCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \
 	$(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \
-		i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)"
+	    i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)" \
+	    LIBPATHENV="$(LIBPATHENV)" PRELOADENV="$(PRELOADENV)" LIBRUBY_SO="$(LIBRUBY_SO)"
 
 noarch-fake.rb: # prerequisite of yes-fake
-	touch $@
+	$(Q) exit > $@
 
 btest: $(TEST_RUNNABLE)-btest
 no-btest: PHONY
@@ -851,7 +845,7 @@ yes-test-tool: prog PHONY
 no-test-tool: PHONY
 
 test-sample: test-basic # backward compatibility for mswin-build
-test-short: btest-ruby test-knownbug test-basic
+test-short: btest-ruby $(DOT_WAIT) test-knownbug $(DOT_WAIT) test-basic
 test: test-short
 
 # $ make test-all TESTOPTS="--help" displays more detail
@@ -881,7 +875,7 @@ extconf: $(PREP)
 rbconfig.rb: $(RBCONFIG)
 
 $(HAVE_BASERUBY:no=)$(RBCONFIG)$(HAVE_BASERUBY:no=): $(PREP)
-$(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
+$(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h $(srcdir)/common.mk
 	$(Q)$(BOOTSTRAPRUBY) -n \
 	-e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \
 	-e 'END{abort "UNICODE version mismatch: #{mis}" unless mis.empty?}' \
@@ -899,7 +893,7 @@ $(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
 test-rubyspec: test-spec
 yes-test-rubyspec: yes-test-spec
 
-test-spec-precheck: programs
+test-spec-precheck: programs yes-fake
 
 test-spec: $(TEST_RUNNABLE)-test-spec
 yes-test-spec: test-spec-precheck
@@ -909,6 +903,8 @@ yes-test-spec: test-spec-precheck
 	$(ACTIONS_ENDGROUP)
 no-test-spec:
 
+check: $(DOT_WAIT) test-spec
+
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY
 	$(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT)
@@ -953,8 +949,6 @@ PHONY:
 {$(srcdir)}.y.c:
 	$(ECHO) generating $@
 	$(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) > parse.tmp.y
-	$(Q)$(BASERUBY) $(tooldir)/pure_parser.rb parse.tmp.y $(YACC)
-	$(Q)$(RM) parse.tmp.y.bak
 	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
 	$(Q)$(RM) parse.tmp.y
 	$(Q)sed -f $(tooldir)/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
@@ -1084,7 +1078,7 @@ $(srcs_vpath)insns_info.inc: $(tooldir)/ruby_vm/views/insns_info.inc.erb $(inc_c
 $(srcs_vpath)vmtc.inc: $(tooldir)/ruby_vm/views/vmtc.inc.erb $(inc_common_headers)
 $(srcs_vpath)vm.inc: $(tooldir)/ruby_vm/views/vm.inc.erb $(inc_common_headers) \
   $(tooldir)/ruby_vm/views/_insn_entry.erb $(tooldir)/ruby_vm/views/_trace_instruction.erb
-$(srcs_vpath)mjit_compile_attr.inc: $(tooldir)/ruby_vm/views/mjit_compile_attr.inc.erb
+$(srcs_vpath)mjit_sp_inc.inc: $(tooldir)/ruby_vm/views/mjit_sp_inc.inc.erb
 
 BUILTIN_RB_SRCS = \
 		$(srcdir)/ast.rb \
@@ -1095,13 +1089,13 @@ BUILTIN_RB_SRCS = \
 		$(srcdir)/marshal.rb \
 		$(srcdir)/mjit.rb \
 		$(srcdir)/mjit_c.rb \
-		$(srcdir)/mjit_compiler.rb \
 		$(srcdir)/pack.rb \
 		$(srcdir)/trace_point.rb \
 		$(srcdir)/warning.rb \
 		$(srcdir)/array.rb \
 		$(srcdir)/kernel.rb \
 		$(srcdir)/ractor.rb \
+		$(srcdir)/symbol.rb \
 		$(srcdir)/timev.rb \
 		$(srcdir)/thread_sync.rb \
 		$(srcdir)/nilclass.rb \
@@ -1225,22 +1219,19 @@ builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary
 
 $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
 
-$(srcdir)/revision.h: $(REVISION_H)
-
-revision.$(HAVE_BASERUBY:no=tmp)::
-	$(Q) $(NULLCMD) > $@
-revision.$(HAVE_BASERUBY:yes=tmp):: $(srcdir)/version.h $(tooldir)/file2lastrev.rb $(REVISION_FORCE)
-	$(Q) $(BASERUBY) $(tooldir)/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" > $@
+$(srcdir)/revision.h$(no_baseruby:no=~disabled~): $(REVISION_H)
 
-$(REVISION_H): revision.tmp
-	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
+$(REVISION_H)$(no_baseruby:no=~disabled~):
+	$(Q) $(BASERUBY) $(tooldir)/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" --output=revision.h --timestamp=$@
+$(REVISION_H)$(yes_baseruby:yes=~disabled~):
+	$(Q) exit > $@
 
 $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y $(srcdir)/defs/id.def $(srcdir)/ext/ripper/depend
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && \
-	sed -e "s/{\$$([^(){}]*)[^{}]*}//g" -e /AUTOGENERATED/q depend | \
+	$(CAT_DEPEND) depend | \
 	$(exec) $(MAKE) -f - $(mflags) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH=../.. \
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" BISON="$(YACC)" top_srcdir=../.. srcdir=. VPATH=../.. \
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C
 
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk
@@ -1257,7 +1248,7 @@ $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
 		$(tooldir)/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && \
-	sed /AUTOGENERATED/q depend | \
+	$(CAT_DEPEND) depend | \
 	$(exec) $(MAKE) -f - $(mflags) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F)
 
@@ -1265,19 +1256,19 @@ $(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \
 		$(tooldir)/generic_erb.rb $(srcdir)/template/limits.c.tmpl
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && \
-	sed /AUTOGENERATED/q depend | \
+	$(CAT_DEPEND) depend | \
 	$(exec) $(MAKE) -f - $(mflags) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F)
 
 $(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend
 	$(Q) $(CHDIR) $(@D) && \
-	sed /AUTOGENERATED/q depend | \
+	$(CAT_DEPEND) depend | \
 	$(exec) $(MAKE) -f - $(mflags) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
 
 $(srcdir)/ext/etc/constdefs.h: $(srcdir)/ext/etc/depend
 	$(Q) $(CHDIR) $(@D) && \
-	sed /AUTOGENERATED/q depend | \
+	$(CAT_DEPEND) depend | \
 	$(exec) $(MAKE) -f - $(mflags) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
 
@@ -1367,6 +1358,10 @@ after-update:: $(REVISION_H)
 after-update:: extract-extlibs
 after-update:: extract-gems
 
+update-src::
+	$(Q) $(RM) $(REVISION_H) revision.h "$(srcdir)/$(REVISION_H)" "$(srcdir)/revision.h"
+	$(Q) exit > "$(srcdir)/revision.h"
+
 update-remote:: update-src update-download
 update-download:: $(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
 update-download:: update-gems
@@ -1381,6 +1376,7 @@ update-config_files: PHONY
 
 refresh-gems: update-bundled_gems prepare-gems
 prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
+extract-gems: $(HAVE_BASERUBY:yes=update-gems)
 
 update-gems$(gnumake:yes=-sequential): PHONY
 	$(ECHO) Downloading bundled gem files...
@@ -1412,6 +1408,9 @@ extract-gems$(gnumake:yes=-sequential): PHONY
 	    -e 'end' \
 	    gems/bundled_gems
 
+outdate-bundled-gems: PHONY
+	$(Q) $(BASERUBY) $(tooldir)/$@.rb --make="$(MAKE)" --mflags="$(MFLAGS)" "$(srcdir)"
+
 update-bundled_gems: PHONY
 	$(Q) $(RUNRUBY) -rrubygems \
 	     $(tooldir)/update-bundled_gems.rb \
@@ -1438,7 +1437,7 @@ no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
 yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
 	$(ACTIONS_GROUP)
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "yard" "pry" "packnga" "rexml" "json-schema" "test-unit-rr"
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "rexml" "json-schema:5.1.0" "test-unit-rr"
 	$(ACTIONS_ENDGROUP)
 
 PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
@@ -1457,6 +1456,7 @@ test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck
 no-test-syntax-suggest-precheck:
 yes-test-syntax-suggest-precheck: main
 
+test-syntax-suggest-prepare: $(TEST_RUNNABLE)-test-syntax-suggest-prepare
 no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck
 yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
 	$(ACTIONS_GROUP)
@@ -1466,12 +1466,15 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
 
 RSPECOPTS =
 SYNTAX_SUGGEST_SPECS =
+PREPARE_SYNTAX_SUGGEST = test-syntax-suggest-prepare
 test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest
-yes-test-syntax-suggest: yes-test-syntax-suggest-prepare
+yes-test-syntax-suggest: yes-$(PREPARE_SYNTAX_SUGGEST)
 	$(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \
 		--require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS)
 no-test-syntax-suggest:
 
+check: $(DOT_WAIT) $(TEST_RUNNABLE)-$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest
+
 test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck
 no-test-bundler-precheck:
 yes-test-bundler-precheck: main $(arch)-fake.rb
@@ -1584,31 +1587,31 @@ UNICODE_EMOJI_DOWNLOAD = \
 	    -d $(UNICODE_SRC_EMOJI_DATA_DIR) \
 	    -p emoji/$(UNICODE_EMOJI_VERSION)
 
-$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES): update-unicode-files
-update-unicode-files:
+update-unicode-files: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data and property files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
 	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
 
-$(UNICODE_AUXILIARY_FILES): update-unicode-auxiliary-files
-update-unicode-auxiliary-files:
+update-unicode-auxiliary-files: $(UNICODE_AUXILIARY_FILES)
+$(UNICODE_AUXILIARY_FILES):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
 	$(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $(UNICODE_AUXILIARY_FILES)
 
-$(UNICODE_UCD_EMOJI_FILES): update-unicode-ucd-emoji-files
-update-unicode-ucd-emoji-files:
+update-unicode-ucd-emoji-files: $(UNICODE_UCD_EMOJI_FILES)
+$(UNICODE_UCD_EMOJI_FILES):
 	$(ECHO) Downloading Unicode UCD emoji $(UNICODE_EMOJI_VERSION) files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/emoji"
 	$(Q) $(UNICODE_UCD_EMOJI_DOWNLOAD) $(UNICODE_UCD_EMOJI_FILES)
 
-$(UNICODE_EMOJI_FILES): update-unicode-emoji-files
-update-unicode-emoji-files:
+update-unicode-emoji-files: $(UNICODE_EMOJI_FILES)
+$(UNICODE_EMOJI_FILES):
 	$(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
 	$(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES)
 
-$(srcdir)/lib/unicode_normalize/$(ALWAYS_UPDATE_UNICODE:yes=tables.rb): \
+$(srcdir)/lib/unicode_normalize/tables.rb: \
 	$(UNICODE_SRC_DATA_DIR)/$(HAVE_BASERUBY:yes=.unicode-tables.time)
 
 $(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): \
@@ -1617,13 +1620,25 @@ $(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): \
 
 touch-unicode-files:
 	$(MAKEDIRS) $(UNICODE_SRC_DATA_DIR)
-	touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
+	$(Q) $(TOUCH) $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
+
+UNICODE_TABLES_DATA_FILES = \
+	$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
+	$(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \
+	$(empty)
 
+UNICODE_TABLES_DEPENDENTS_1 = none$(ALWAYS_UPDATE_UNICODE)
+UNICODE_TABLES_DEPENDENTS = $(UNICODE_TABLES_DEPENDENTS_1:noneyes=force)
 UNICODE_TABLES_TIMESTAMP = yes
-$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(tooldir)/generic_erb.rb \
+$(UNICODE_SRC_DATA_DIR)/.unicode-tables.$(UNICODE_TABLES_DEPENDENTS:none=time):
+	$(Q) $(MAKEDIRS) $(@D)
+	$(Q) exit > $(@) || $(NULLCMD)
+$(UNICODE_SRC_DATA_DIR)/.unicode-tables.$(UNICODE_TABLES_DEPENDENTS:force=time): \
+		$(tooldir)/generic_erb.rb \
 		$(srcdir)/template/unicode_norm_gen.tmpl \
-		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
-	$(Q) $(MAKE) $(@D)
+		$(UNICODE_TABLES_DATA_FILES) \
+	$(order_only) \
+		$(UNICODE_SRC_DATA_DIR)
 	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb \
 		-c $(UNICODE_TABLES_TIMESTAMP:yes=-t$@) \
 		-o $(srcdir)/lib/unicode_normalize/tables.rb \
@@ -1817,6 +1832,7 @@ addr2line.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 addr2line.$(OBJEXT): {$(VPATH)}missing.h
 array.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 array.$(OBJEXT): $(top_srcdir)/internal/array.h
+array.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 array.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 array.$(OBJEXT): $(top_srcdir)/internal/bits.h
 array.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -1832,6 +1848,7 @@ array.$(OBJEXT): $(top_srcdir)/internal/proc.h
 array.$(OBJEXT): $(top_srcdir)/internal/rational.h
 array.$(OBJEXT): $(top_srcdir)/internal/serial.h
 array.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+array.$(OBJEXT): $(top_srcdir)/internal/variable.h
 array.$(OBJEXT): $(top_srcdir)/internal/vm.h
 array.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 array.$(OBJEXT): {$(VPATH)}array.c
@@ -1848,6 +1865,7 @@ array.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 array.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 array.$(OBJEXT): {$(VPATH)}builtin.h
 array.$(OBJEXT): {$(VPATH)}config.h
+array.$(OBJEXT): {$(VPATH)}constant.h
 array.$(OBJEXT): {$(VPATH)}debug_counter.h
 array.$(OBJEXT): {$(VPATH)}defines.h
 array.$(OBJEXT): {$(VPATH)}encoding.h
@@ -2010,6 +2028,7 @@ array.$(OBJEXT): {$(VPATH)}oniguruma.h
 array.$(OBJEXT): {$(VPATH)}probes.dmyh
 array.$(OBJEXT): {$(VPATH)}probes.h
 array.$(OBJEXT): {$(VPATH)}ruby_assert.h
+array.$(OBJEXT): {$(VPATH)}shape.h
 array.$(OBJEXT): {$(VPATH)}st.h
 array.$(OBJEXT): {$(VPATH)}subst.h
 array.$(OBJEXT): {$(VPATH)}transient_heap.h
@@ -2021,6 +2040,7 @@ ast.$(OBJEXT): $(CCAN_DIR)/str/str.h
 ast.$(OBJEXT): $(hdrdir)/ruby.h
 ast.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 ast.$(OBJEXT): $(top_srcdir)/internal/array.h
+ast.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 ast.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 ast.$(OBJEXT): $(top_srcdir)/internal/gc.h
 ast.$(OBJEXT): $(top_srcdir)/internal/imemo.h
@@ -2028,6 +2048,7 @@ ast.$(OBJEXT): $(top_srcdir)/internal/parse.h
 ast.$(OBJEXT): $(top_srcdir)/internal/serial.h
 ast.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 ast.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+ast.$(OBJEXT): $(top_srcdir)/internal/variable.h
 ast.$(OBJEXT): $(top_srcdir)/internal/vm.h
 ast.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 ast.$(OBJEXT): {$(VPATH)}assert.h
@@ -2045,9 +2066,11 @@ ast.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 ast.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 ast.$(OBJEXT): {$(VPATH)}builtin.h
 ast.$(OBJEXT): {$(VPATH)}config.h
+ast.$(OBJEXT): {$(VPATH)}constant.h
 ast.$(OBJEXT): {$(VPATH)}defines.h
 ast.$(OBJEXT): {$(VPATH)}encoding.h
 ast.$(OBJEXT): {$(VPATH)}id.h
+ast.$(OBJEXT): {$(VPATH)}id_table.h
 ast.$(OBJEXT): {$(VPATH)}intern.h
 ast.$(OBJEXT): {$(VPATH)}internal.h
 ast.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -2207,6 +2230,7 @@ ast.$(OBJEXT): {$(VPATH)}onigmo.h
 ast.$(OBJEXT): {$(VPATH)}oniguruma.h
 ast.$(OBJEXT): {$(VPATH)}ruby_assert.h
 ast.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+ast.$(OBJEXT): {$(VPATH)}shape.h
 ast.$(OBJEXT): {$(VPATH)}st.h
 ast.$(OBJEXT): {$(VPATH)}subst.h
 ast.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -2390,6 +2414,7 @@ bignum.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 bignum.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 bignum.$(OBJEXT): {$(VPATH)}missing.h
 bignum.$(OBJEXT): {$(VPATH)}ruby_assert.h
+bignum.$(OBJEXT): {$(VPATH)}shape.h
 bignum.$(OBJEXT): {$(VPATH)}st.h
 bignum.$(OBJEXT): {$(VPATH)}subst.h
 bignum.$(OBJEXT): {$(VPATH)}thread.h
@@ -2400,11 +2425,13 @@ builtin.$(OBJEXT): $(CCAN_DIR)/list/list.h
 builtin.$(OBJEXT): $(CCAN_DIR)/str/str.h
 builtin.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/array.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/gc.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/serial.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/variable.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/vm.h
 builtin.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 builtin.$(OBJEXT): {$(VPATH)}assert.h
@@ -2422,8 +2449,10 @@ builtin.$(OBJEXT): {$(VPATH)}builtin.c
 builtin.$(OBJEXT): {$(VPATH)}builtin.h
 builtin.$(OBJEXT): {$(VPATH)}builtin_binary.inc
 builtin.$(OBJEXT): {$(VPATH)}config.h
+builtin.$(OBJEXT): {$(VPATH)}constant.h
 builtin.$(OBJEXT): {$(VPATH)}defines.h
 builtin.$(OBJEXT): {$(VPATH)}id.h
+builtin.$(OBJEXT): {$(VPATH)}id_table.h
 builtin.$(OBJEXT): {$(VPATH)}intern.h
 builtin.$(OBJEXT): {$(VPATH)}internal.h
 builtin.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -2572,6 +2601,7 @@ builtin.$(OBJEXT): {$(VPATH)}missing.h
 builtin.$(OBJEXT): {$(VPATH)}node.h
 builtin.$(OBJEXT): {$(VPATH)}ruby_assert.h
 builtin.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+builtin.$(OBJEXT): {$(VPATH)}shape.h
 builtin.$(OBJEXT): {$(VPATH)}st.h
 builtin.$(OBJEXT): {$(VPATH)}subst.h
 builtin.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -2584,6 +2614,7 @@ class.$(OBJEXT): $(CCAN_DIR)/list/list.h
 class.$(OBJEXT): $(CCAN_DIR)/str/str.h
 class.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 class.$(OBJEXT): $(top_srcdir)/internal/array.h
+class.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 class.$(OBJEXT): $(top_srcdir)/internal/class.h
 class.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 class.$(OBJEXT): $(top_srcdir)/internal/eval.h
@@ -2774,6 +2805,7 @@ class.$(OBJEXT): {$(VPATH)}onigmo.h
 class.$(OBJEXT): {$(VPATH)}oniguruma.h
 class.$(OBJEXT): {$(VPATH)}ruby_assert.h
 class.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+class.$(OBJEXT): {$(VPATH)}shape.h
 class.$(OBJEXT): {$(VPATH)}st.h
 class.$(OBJEXT): {$(VPATH)}subst.h
 class.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -2781,6 +2813,7 @@ class.$(OBJEXT): {$(VPATH)}thread_native.h
 class.$(OBJEXT): {$(VPATH)}vm_core.h
 class.$(OBJEXT): {$(VPATH)}vm_opts.h
 compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compar.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 compar.$(OBJEXT): $(top_srcdir)/internal/compar.h
 compar.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 compar.$(OBJEXT): $(top_srcdir)/internal/error.h
@@ -2965,6 +2998,7 @@ compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
 compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
 compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 compile.$(OBJEXT): $(top_srcdir)/internal/array.h
+compile.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 compile.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 compile.$(OBJEXT): $(top_srcdir)/internal/bits.h
 compile.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -3177,6 +3211,7 @@ compile.$(OBJEXT): {$(VPATH)}re.h
 compile.$(OBJEXT): {$(VPATH)}regex.h
 compile.$(OBJEXT): {$(VPATH)}ruby_assert.h
 compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+compile.$(OBJEXT): {$(VPATH)}shape.h
 compile.$(OBJEXT): {$(VPATH)}st.h
 compile.$(OBJEXT): {$(VPATH)}subst.h
 compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -3186,8 +3221,13 @@ compile.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 compile.$(OBJEXT): {$(VPATH)}vm_core.h
 compile.$(OBJEXT): {$(VPATH)}vm_debug.h
 compile.$(OBJEXT): {$(VPATH)}vm_opts.h
+complex.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+complex.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+complex.$(OBJEXT): $(CCAN_DIR)/list/list.h
+complex.$(OBJEXT): $(CCAN_DIR)/str/str.h
 complex.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 complex.$(OBJEXT): $(top_srcdir)/internal/array.h
+complex.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 complex.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 complex.$(OBJEXT): $(top_srcdir)/internal/bits.h
 complex.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -3195,15 +3235,18 @@ complex.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 complex.$(OBJEXT): $(top_srcdir)/internal/complex.h
 complex.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 complex.$(OBJEXT): $(top_srcdir)/internal/gc.h
+complex.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 complex.$(OBJEXT): $(top_srcdir)/internal/math.h
 complex.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 complex.$(OBJEXT): $(top_srcdir)/internal/object.h
 complex.$(OBJEXT): $(top_srcdir)/internal/rational.h
 complex.$(OBJEXT): $(top_srcdir)/internal/serial.h
 complex.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+complex.$(OBJEXT): $(top_srcdir)/internal/variable.h
 complex.$(OBJEXT): $(top_srcdir)/internal/vm.h
 complex.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 complex.$(OBJEXT): {$(VPATH)}assert.h
+complex.$(OBJEXT): {$(VPATH)}atomic.h
 complex.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 complex.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 complex.$(OBJEXT): {$(VPATH)}backward/2/bool.h
@@ -3215,6 +3258,7 @@ complex.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 complex.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 complex.$(OBJEXT): {$(VPATH)}complex.c
 complex.$(OBJEXT): {$(VPATH)}config.h
+complex.$(OBJEXT): {$(VPATH)}constant.h
 complex.$(OBJEXT): {$(VPATH)}defines.h
 complex.$(OBJEXT): {$(VPATH)}id.h
 complex.$(OBJEXT): {$(VPATH)}id_table.h
@@ -3360,10 +3404,18 @@ complex.$(OBJEXT): {$(VPATH)}internal/value_type.h
 complex.$(OBJEXT): {$(VPATH)}internal/variable.h
 complex.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 complex.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+complex.$(OBJEXT): {$(VPATH)}method.h
 complex.$(OBJEXT): {$(VPATH)}missing.h
+complex.$(OBJEXT): {$(VPATH)}node.h
 complex.$(OBJEXT): {$(VPATH)}ruby_assert.h
+complex.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+complex.$(OBJEXT): {$(VPATH)}shape.h
 complex.$(OBJEXT): {$(VPATH)}st.h
 complex.$(OBJEXT): {$(VPATH)}subst.h
+complex.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+complex.$(OBJEXT): {$(VPATH)}thread_native.h
+complex.$(OBJEXT): {$(VPATH)}vm_core.h
+complex.$(OBJEXT): {$(VPATH)}vm_opts.h
 cont.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 cont.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 cont.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -3371,14 +3423,18 @@ cont.$(OBJEXT): $(CCAN_DIR)/str/str.h
 cont.$(OBJEXT): $(hdrdir)/ruby.h
 cont.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 cont.$(OBJEXT): $(top_srcdir)/internal/array.h
+cont.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 cont.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 cont.$(OBJEXT): $(top_srcdir)/internal/cont.h
+cont.$(OBJEXT): $(top_srcdir)/internal/error.h
 cont.$(OBJEXT): $(top_srcdir)/internal/gc.h
 cont.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 cont.$(OBJEXT): $(top_srcdir)/internal/proc.h
 cont.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 cont.$(OBJEXT): $(top_srcdir)/internal/serial.h
 cont.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+cont.$(OBJEXT): $(top_srcdir)/internal/string.h
+cont.$(OBJEXT): $(top_srcdir)/internal/variable.h
 cont.$(OBJEXT): $(top_srcdir)/internal/vm.h
 cont.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
@@ -3394,9 +3450,11 @@ cont.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 cont.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 cont.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 cont.$(OBJEXT): {$(VPATH)}config.h
+cont.$(OBJEXT): {$(VPATH)}constant.h
 cont.$(OBJEXT): {$(VPATH)}cont.c
 cont.$(OBJEXT): {$(VPATH)}debug_counter.h
 cont.$(OBJEXT): {$(VPATH)}defines.h
+cont.$(OBJEXT): {$(VPATH)}encoding.h
 cont.$(OBJEXT): {$(VPATH)}eval_intern.h
 cont.$(OBJEXT): {$(VPATH)}fiber/scheduler.h
 cont.$(OBJEXT): {$(VPATH)}gc.h
@@ -3474,6 +3532,15 @@ cont.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
 cont.$(OBJEXT): {$(VPATH)}internal/ctype.h
 cont.$(OBJEXT): {$(VPATH)}internal/dllexport.h
 cont.$(OBJEXT): {$(VPATH)}internal/dosish.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+cont.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
 cont.$(OBJEXT): {$(VPATH)}internal/error.h
 cont.$(OBJEXT): {$(VPATH)}internal/eval.h
 cont.$(OBJEXT): {$(VPATH)}internal/event.h
@@ -3544,14 +3611,18 @@ cont.$(OBJEXT): {$(VPATH)}internal/value_type.h
 cont.$(OBJEXT): {$(VPATH)}internal/variable.h
 cont.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 cont.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+cont.$(OBJEXT): {$(VPATH)}iseq.h
 cont.$(OBJEXT): {$(VPATH)}method.h
 cont.$(OBJEXT): {$(VPATH)}missing.h
 cont.$(OBJEXT): {$(VPATH)}mjit.h
 cont.$(OBJEXT): {$(VPATH)}node.h
+cont.$(OBJEXT): {$(VPATH)}onigmo.h
+cont.$(OBJEXT): {$(VPATH)}oniguruma.h
 cont.$(OBJEXT): {$(VPATH)}ractor.h
 cont.$(OBJEXT): {$(VPATH)}ractor_core.h
 cont.$(OBJEXT): {$(VPATH)}ruby_assert.h
 cont.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+cont.$(OBJEXT): {$(VPATH)}shape.h
 cont.$(OBJEXT): {$(VPATH)}st.h
 cont.$(OBJEXT): {$(VPATH)}subst.h
 cont.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -3559,12 +3630,15 @@ cont.$(OBJEXT): {$(VPATH)}thread_native.h
 cont.$(OBJEXT): {$(VPATH)}vm_core.h
 cont.$(OBJEXT): {$(VPATH)}vm_debug.h
 cont.$(OBJEXT): {$(VPATH)}vm_opts.h
+cont.$(OBJEXT): {$(VPATH)}vm_sync.h
+cont.$(OBJEXT): {$(VPATH)}yjit.h
 debug.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 debug.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 debug.$(OBJEXT): $(CCAN_DIR)/list/list.h
 debug.$(OBJEXT): $(CCAN_DIR)/str/str.h
 debug.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 debug.$(OBJEXT): $(top_srcdir)/internal/array.h
+debug.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 debug.$(OBJEXT): $(top_srcdir)/internal/class.h
 debug.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 debug.$(OBJEXT): $(top_srcdir)/internal/gc.h
@@ -3572,6 +3646,7 @@ debug.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 debug.$(OBJEXT): $(top_srcdir)/internal/serial.h
 debug.$(OBJEXT): $(top_srcdir)/internal/signal.h
 debug.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+debug.$(OBJEXT): $(top_srcdir)/internal/variable.h
 debug.$(OBJEXT): $(top_srcdir)/internal/vm.h
 debug.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 debug.$(OBJEXT): {$(VPATH)}assert.h
@@ -3586,6 +3661,7 @@ debug.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 debug.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 debug.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 debug.$(OBJEXT): {$(VPATH)}config.h
+debug.$(OBJEXT): {$(VPATH)}constant.h
 debug.$(OBJEXT): {$(VPATH)}debug.c
 debug.$(OBJEXT): {$(VPATH)}debug_counter.h
 debug.$(OBJEXT): {$(VPATH)}defines.h
@@ -3756,6 +3832,7 @@ debug.$(OBJEXT): {$(VPATH)}ractor.h
 debug.$(OBJEXT): {$(VPATH)}ractor_core.h
 debug.$(OBJEXT): {$(VPATH)}ruby_assert.h
 debug.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+debug.$(OBJEXT): {$(VPATH)}shape.h
 debug.$(OBJEXT): {$(VPATH)}st.h
 debug.$(OBJEXT): {$(VPATH)}subst.h
 debug.$(OBJEXT): {$(VPATH)}symbol.h
@@ -3940,6 +4017,7 @@ dir.$(OBJEXT): $(top_srcdir)/internal/object.h
 dir.$(OBJEXT): $(top_srcdir)/internal/serial.h
 dir.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 dir.$(OBJEXT): $(top_srcdir)/internal/string.h
+dir.$(OBJEXT): $(top_srcdir)/internal/variable.h
 dir.$(OBJEXT): $(top_srcdir)/internal/vm.h
 dir.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 dir.$(OBJEXT): {$(VPATH)}assert.h
@@ -3954,6 +4032,7 @@ dir.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 dir.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 dir.$(OBJEXT): {$(VPATH)}builtin.h
 dir.$(OBJEXT): {$(VPATH)}config.h
+dir.$(OBJEXT): {$(VPATH)}constant.h
 dir.$(OBJEXT): {$(VPATH)}defines.h
 dir.$(OBJEXT): {$(VPATH)}dir.c
 dir.$(OBJEXT): {$(VPATH)}dir.rbinc
@@ -4116,6 +4195,7 @@ dir.$(OBJEXT): {$(VPATH)}io.h
 dir.$(OBJEXT): {$(VPATH)}missing.h
 dir.$(OBJEXT): {$(VPATH)}onigmo.h
 dir.$(OBJEXT): {$(VPATH)}oniguruma.h
+dir.$(OBJEXT): {$(VPATH)}shape.h
 dir.$(OBJEXT): {$(VPATH)}st.h
 dir.$(OBJEXT): {$(VPATH)}subst.h
 dir.$(OBJEXT): {$(VPATH)}thread.h
@@ -5441,6 +5521,7 @@ encoding.$(OBJEXT): $(top_srcdir)/internal/object.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/serial.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/string.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/variable.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/vm.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 encoding.$(OBJEXT): {$(VPATH)}assert.h
@@ -5454,6 +5535,7 @@ encoding.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 encoding.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 encoding.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 encoding.$(OBJEXT): {$(VPATH)}config.h
+encoding.$(OBJEXT): {$(VPATH)}constant.h
 encoding.$(OBJEXT): {$(VPATH)}debug_counter.h
 encoding.$(OBJEXT): {$(VPATH)}defines.h
 encoding.$(OBJEXT): {$(VPATH)}encindex.h
@@ -5616,6 +5698,7 @@ encoding.$(OBJEXT): {$(VPATH)}onigmo.h
 encoding.$(OBJEXT): {$(VPATH)}oniguruma.h
 encoding.$(OBJEXT): {$(VPATH)}regenc.h
 encoding.$(OBJEXT): {$(VPATH)}ruby_assert.h
+encoding.$(OBJEXT): {$(VPATH)}shape.h
 encoding.$(OBJEXT): {$(VPATH)}st.h
 encoding.$(OBJEXT): {$(VPATH)}subst.h
 encoding.$(OBJEXT): {$(VPATH)}util.h
@@ -5623,6 +5706,7 @@ encoding.$(OBJEXT): {$(VPATH)}vm_debug.h
 encoding.$(OBJEXT): {$(VPATH)}vm_sync.h
 enum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enum.$(OBJEXT): $(top_srcdir)/internal/array.h
+enum.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 enum.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 enum.$(OBJEXT): $(top_srcdir)/internal/bits.h
 enum.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -5640,6 +5724,7 @@ enum.$(OBJEXT): $(top_srcdir)/internal/rational.h
 enum.$(OBJEXT): $(top_srcdir)/internal/re.h
 enum.$(OBJEXT): $(top_srcdir)/internal/serial.h
 enum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+enum.$(OBJEXT): $(top_srcdir)/internal/variable.h
 enum.$(OBJEXT): $(top_srcdir)/internal/vm.h
 enum.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 enum.$(OBJEXT): {$(VPATH)}assert.h
@@ -5653,6 +5738,7 @@ enum.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 enum.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 enum.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 enum.$(OBJEXT): {$(VPATH)}config.h
+enum.$(OBJEXT): {$(VPATH)}constant.h
 enum.$(OBJEXT): {$(VPATH)}defines.h
 enum.$(OBJEXT): {$(VPATH)}encoding.h
 enum.$(OBJEXT): {$(VPATH)}enum.c
@@ -5813,14 +5899,21 @@ enum.$(OBJEXT): {$(VPATH)}missing.h
 enum.$(OBJEXT): {$(VPATH)}onigmo.h
 enum.$(OBJEXT): {$(VPATH)}oniguruma.h
 enum.$(OBJEXT): {$(VPATH)}ruby_assert.h
+enum.$(OBJEXT): {$(VPATH)}shape.h
 enum.$(OBJEXT): {$(VPATH)}st.h
 enum.$(OBJEXT): {$(VPATH)}subst.h
 enum.$(OBJEXT): {$(VPATH)}symbol.h
 enum.$(OBJEXT): {$(VPATH)}util.h
+enumerator.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+enumerator.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+enumerator.$(OBJEXT): $(CCAN_DIR)/list/list.h
+enumerator.$(OBJEXT): $(CCAN_DIR)/str/str.h
 enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/array.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/bits.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/class.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/enumerator.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/error.h
@@ -5838,6 +5931,7 @@ enumerator.$(OBJEXT): $(top_srcdir)/internal/struct.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/vm.h
 enumerator.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 enumerator.$(OBJEXT): {$(VPATH)}assert.h
+enumerator.$(OBJEXT): {$(VPATH)}atomic.h
 enumerator.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 enumerator.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 enumerator.$(OBJEXT): {$(VPATH)}backward/2/bool.h
@@ -5852,6 +5946,7 @@ enumerator.$(OBJEXT): {$(VPATH)}defines.h
 enumerator.$(OBJEXT): {$(VPATH)}encoding.h
 enumerator.$(OBJEXT): {$(VPATH)}enumerator.c
 enumerator.$(OBJEXT): {$(VPATH)}id.h
+enumerator.$(OBJEXT): {$(VPATH)}id_table.h
 enumerator.$(OBJEXT): {$(VPATH)}intern.h
 enumerator.$(OBJEXT): {$(VPATH)}internal.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -6003,18 +6098,27 @@ enumerator.$(OBJEXT): {$(VPATH)}internal/value_type.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/variable.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 enumerator.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+enumerator.$(OBJEXT): {$(VPATH)}method.h
 enumerator.$(OBJEXT): {$(VPATH)}missing.h
+enumerator.$(OBJEXT): {$(VPATH)}node.h
 enumerator.$(OBJEXT): {$(VPATH)}onigmo.h
 enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h
 enumerator.$(OBJEXT): {$(VPATH)}ruby_assert.h
+enumerator.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+enumerator.$(OBJEXT): {$(VPATH)}shape.h
 enumerator.$(OBJEXT): {$(VPATH)}st.h
 enumerator.$(OBJEXT): {$(VPATH)}subst.h
+enumerator.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+enumerator.$(OBJEXT): {$(VPATH)}thread_native.h
+enumerator.$(OBJEXT): {$(VPATH)}vm_core.h
+enumerator.$(OBJEXT): {$(VPATH)}vm_opts.h
 error.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 error.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 error.$(OBJEXT): $(CCAN_DIR)/list/list.h
 error.$(OBJEXT): $(CCAN_DIR)/str/str.h
 error.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 error.$(OBJEXT): $(top_srcdir)/internal/array.h
+error.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 error.$(OBJEXT): $(top_srcdir)/internal/class.h
 error.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 error.$(OBJEXT): $(top_srcdir)/internal/error.h
@@ -6212,6 +6316,7 @@ error.$(OBJEXT): {$(VPATH)}onigmo.h
 error.$(OBJEXT): {$(VPATH)}oniguruma.h
 error.$(OBJEXT): {$(VPATH)}ruby_assert.h
 error.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+error.$(OBJEXT): {$(VPATH)}shape.h
 error.$(OBJEXT): {$(VPATH)}st.h
 error.$(OBJEXT): {$(VPATH)}subst.h
 error.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -6226,8 +6331,10 @@ eval.$(OBJEXT): $(CCAN_DIR)/str/str.h
 eval.$(OBJEXT): $(hdrdir)/ruby.h
 eval.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 eval.$(OBJEXT): $(top_srcdir)/internal/array.h
+eval.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 eval.$(OBJEXT): $(top_srcdir)/internal/class.h
 eval.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+eval.$(OBJEXT): $(top_srcdir)/internal/cont.h
 eval.$(OBJEXT): $(top_srcdir)/internal/error.h
 eval.$(OBJEXT): $(top_srcdir)/internal/eval.h
 eval.$(OBJEXT): $(top_srcdir)/internal/gc.h
@@ -6433,6 +6540,7 @@ eval.$(OBJEXT): {$(VPATH)}ractor.h
 eval.$(OBJEXT): {$(VPATH)}ractor_core.h
 eval.$(OBJEXT): {$(VPATH)}ruby_assert.h
 eval.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+eval.$(OBJEXT): {$(VPATH)}shape.h
 eval.$(OBJEXT): {$(VPATH)}st.h
 eval.$(OBJEXT): {$(VPATH)}subst.h
 eval.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -6473,6 +6581,7 @@ file.$(OBJEXT): $(top_srcdir)/internal/serial.h
 file.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 file.$(OBJEXT): $(top_srcdir)/internal/string.h
 file.$(OBJEXT): $(top_srcdir)/internal/thread.h
+file.$(OBJEXT): $(top_srcdir)/internal/variable.h
 file.$(OBJEXT): $(top_srcdir)/internal/vm.h
 file.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 file.$(OBJEXT): {$(VPATH)}assert.h
@@ -6486,6 +6595,7 @@ file.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 file.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 file.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 file.$(OBJEXT): {$(VPATH)}config.h
+file.$(OBJEXT): {$(VPATH)}constant.h
 file.$(OBJEXT): {$(VPATH)}defines.h
 file.$(OBJEXT): {$(VPATH)}dln.h
 file.$(OBJEXT): {$(VPATH)}encindex.h
@@ -6648,6 +6758,7 @@ file.$(OBJEXT): {$(VPATH)}io.h
 file.$(OBJEXT): {$(VPATH)}missing.h
 file.$(OBJEXT): {$(VPATH)}onigmo.h
 file.$(OBJEXT): {$(VPATH)}oniguruma.h
+file.$(OBJEXT): {$(VPATH)}shape.h
 file.$(OBJEXT): {$(VPATH)}st.h
 file.$(OBJEXT): {$(VPATH)}subst.h
 file.$(OBJEXT): {$(VPATH)}thread.h
@@ -6659,6 +6770,7 @@ gc.$(OBJEXT): $(CCAN_DIR)/str/str.h
 gc.$(OBJEXT): $(hdrdir)/ruby.h
 gc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 gc.$(OBJEXT): $(top_srcdir)/internal/array.h
+gc.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 gc.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 gc.$(OBJEXT): $(top_srcdir)/internal/bits.h
 gc.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -6707,7 +6819,6 @@ gc.$(OBJEXT): {$(VPATH)}encoding.h
 gc.$(OBJEXT): {$(VPATH)}eval_intern.h
 gc.$(OBJEXT): {$(VPATH)}gc.c
 gc.$(OBJEXT): {$(VPATH)}gc.h
-gc.$(OBJEXT): {$(VPATH)}gc.rb
 gc.$(OBJEXT): {$(VPATH)}gc.rbinc
 gc.$(OBJEXT): {$(VPATH)}id.h
 gc.$(OBJEXT): {$(VPATH)}id_table.h
@@ -6864,6 +6975,7 @@ gc.$(OBJEXT): {$(VPATH)}internal/variable.h
 gc.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 gc.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 gc.$(OBJEXT): {$(VPATH)}io.h
+gc.$(OBJEXT): {$(VPATH)}iseq.h
 gc.$(OBJEXT): {$(VPATH)}method.h
 gc.$(OBJEXT): {$(VPATH)}missing.h
 gc.$(OBJEXT): {$(VPATH)}mjit.h
@@ -6880,6 +6992,7 @@ gc.$(OBJEXT): {$(VPATH)}regex.h
 gc.$(OBJEXT): {$(VPATH)}regint.h
 gc.$(OBJEXT): {$(VPATH)}ruby_assert.h
 gc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+gc.$(OBJEXT): {$(VPATH)}shape.h
 gc.$(OBJEXT): {$(VPATH)}st.h
 gc.$(OBJEXT): {$(VPATH)}subst.h
 gc.$(OBJEXT): {$(VPATH)}symbol.h
@@ -6900,11 +7013,13 @@ goruby.$(OBJEXT): $(CCAN_DIR)/str/str.h
 goruby.$(OBJEXT): $(hdrdir)/ruby.h
 goruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/array.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/gc.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/serial.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+goruby.$(OBJEXT): $(top_srcdir)/internal/variable.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/vm.h
 goruby.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 goruby.$(OBJEXT): {$(VPATH)}assert.h
@@ -6920,11 +7035,12 @@ goruby.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 goruby.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 goruby.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 goruby.$(OBJEXT): {$(VPATH)}config.h
+goruby.$(OBJEXT): {$(VPATH)}constant.h
 goruby.$(OBJEXT): {$(VPATH)}defines.h
 goruby.$(OBJEXT): {$(VPATH)}golf_prelude.c
-goruby.$(OBJEXT): {$(VPATH)}golf_prelude.rb
 goruby.$(OBJEXT): {$(VPATH)}goruby.c
 goruby.$(OBJEXT): {$(VPATH)}id.h
+goruby.$(OBJEXT): {$(VPATH)}id_table.h
 goruby.$(OBJEXT): {$(VPATH)}intern.h
 goruby.$(OBJEXT): {$(VPATH)}internal.h
 goruby.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -6964,6 +7080,7 @@ goruby.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 goruby.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 goruby.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 goruby.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 goruby.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 goruby.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
 goruby.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
@@ -7074,6 +7191,7 @@ goruby.$(OBJEXT): {$(VPATH)}missing.h
 goruby.$(OBJEXT): {$(VPATH)}node.h
 goruby.$(OBJEXT): {$(VPATH)}ruby_assert.h
 goruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+goruby.$(OBJEXT): {$(VPATH)}shape.h
 goruby.$(OBJEXT): {$(VPATH)}st.h
 goruby.$(OBJEXT): {$(VPATH)}subst.h
 goruby.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -7081,8 +7199,13 @@ goruby.$(OBJEXT): {$(VPATH)}thread_native.h
 goruby.$(OBJEXT): {$(VPATH)}vm_core.h
 goruby.$(OBJEXT): {$(VPATH)}vm_debug.h
 goruby.$(OBJEXT): {$(VPATH)}vm_opts.h
+hash.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+hash.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+hash.$(OBJEXT): $(CCAN_DIR)/list/list.h
+hash.$(OBJEXT): $(CCAN_DIR)/str/str.h
 hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 hash.$(OBJEXT): $(top_srcdir)/internal/array.h
+hash.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 hash.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 hash.$(OBJEXT): $(top_srcdir)/internal/bits.h
 hash.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -7091,6 +7214,7 @@ hash.$(OBJEXT): $(top_srcdir)/internal/cont.h
 hash.$(OBJEXT): $(top_srcdir)/internal/error.h
 hash.$(OBJEXT): $(top_srcdir)/internal/gc.h
 hash.$(OBJEXT): $(top_srcdir)/internal/hash.h
+hash.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 hash.$(OBJEXT): $(top_srcdir)/internal/object.h
 hash.$(OBJEXT): $(top_srcdir)/internal/proc.h
 hash.$(OBJEXT): $(top_srcdir)/internal/serial.h
@@ -7099,9 +7223,11 @@ hash.$(OBJEXT): $(top_srcdir)/internal/string.h
 hash.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 hash.$(OBJEXT): $(top_srcdir)/internal/thread.h
 hash.$(OBJEXT): $(top_srcdir)/internal/time.h
+hash.$(OBJEXT): $(top_srcdir)/internal/variable.h
 hash.$(OBJEXT): $(top_srcdir)/internal/vm.h
 hash.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 hash.$(OBJEXT): {$(VPATH)}assert.h
+hash.$(OBJEXT): {$(VPATH)}atomic.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/bool.h
@@ -7112,6 +7238,7 @@ hash.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 hash.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 hash.$(OBJEXT): {$(VPATH)}config.h
+hash.$(OBJEXT): {$(VPATH)}constant.h
 hash.$(OBJEXT): {$(VPATH)}debug_counter.h
 hash.$(OBJEXT): {$(VPATH)}defines.h
 hash.$(OBJEXT): {$(VPATH)}encoding.h
@@ -7269,20 +7396,28 @@ hash.$(OBJEXT): {$(VPATH)}internal/value_type.h
 hash.$(OBJEXT): {$(VPATH)}internal/variable.h
 hash.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 hash.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+hash.$(OBJEXT): {$(VPATH)}iseq.h
+hash.$(OBJEXT): {$(VPATH)}method.h
 hash.$(OBJEXT): {$(VPATH)}missing.h
+hash.$(OBJEXT): {$(VPATH)}node.h
 hash.$(OBJEXT): {$(VPATH)}onigmo.h
 hash.$(OBJEXT): {$(VPATH)}oniguruma.h
 hash.$(OBJEXT): {$(VPATH)}probes.dmyh
 hash.$(OBJEXT): {$(VPATH)}probes.h
 hash.$(OBJEXT): {$(VPATH)}ractor.h
 hash.$(OBJEXT): {$(VPATH)}ruby_assert.h
+hash.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+hash.$(OBJEXT): {$(VPATH)}shape.h
 hash.$(OBJEXT): {$(VPATH)}st.h
 hash.$(OBJEXT): {$(VPATH)}subst.h
 hash.$(OBJEXT): {$(VPATH)}symbol.h
+hash.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 hash.$(OBJEXT): {$(VPATH)}thread_native.h
 hash.$(OBJEXT): {$(VPATH)}transient_heap.h
 hash.$(OBJEXT): {$(VPATH)}util.h
+hash.$(OBJEXT): {$(VPATH)}vm_core.h
 hash.$(OBJEXT): {$(VPATH)}vm_debug.h
+hash.$(OBJEXT): {$(VPATH)}vm_opts.h
 hash.$(OBJEXT): {$(VPATH)}vm_sync.h
 inits.$(OBJEXT): $(hdrdir)/ruby.h
 inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7454,6 +7589,7 @@ io.$(OBJEXT): $(CCAN_DIR)/list/list.h
 io.$(OBJEXT): $(CCAN_DIR)/str/str.h
 io.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 io.$(OBJEXT): $(top_srcdir)/internal/array.h
+io.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 io.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 io.$(OBJEXT): $(top_srcdir)/internal/bits.h
 io.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -7660,6 +7796,7 @@ io.$(OBJEXT): {$(VPATH)}oniguruma.h
 io.$(OBJEXT): {$(VPATH)}ractor.h
 io.$(OBJEXT): {$(VPATH)}ruby_assert.h
 io.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+io.$(OBJEXT): {$(VPATH)}shape.h
 io.$(OBJEXT): {$(VPATH)}st.h
 io.$(OBJEXT): {$(VPATH)}subst.h
 io.$(OBJEXT): {$(VPATH)}thread.h
@@ -7670,12 +7807,17 @@ io.$(OBJEXT): {$(VPATH)}vm_core.h
 io.$(OBJEXT): {$(VPATH)}vm_opts.h
 io_buffer.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/array.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/bits.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/error.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/serial.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/string.h
 io_buffer.$(OBJEXT): $(top_srcdir)/internal/thread.h
+io_buffer.$(OBJEXT): $(top_srcdir)/internal/vm.h
 io_buffer.$(OBJEXT): {$(VPATH)}assert.h
 io_buffer.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 io_buffer.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
@@ -7856,6 +7998,7 @@ iseq.$(OBJEXT): $(CCAN_DIR)/str/str.h
 iseq.$(OBJEXT): $(hdrdir)/ruby.h
 iseq.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/array.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/bits.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/class.h
 iseq.$(OBJEXT): $(top_srcdir)/internal/compile.h
@@ -8062,6 +8205,7 @@ iseq.$(OBJEXT): {$(VPATH)}oniguruma.h
 iseq.$(OBJEXT): {$(VPATH)}ractor.h
 iseq.$(OBJEXT): {$(VPATH)}ruby_assert.h
 iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+iseq.$(OBJEXT): {$(VPATH)}shape.h
 iseq.$(OBJEXT): {$(VPATH)}st.h
 iseq.$(OBJEXT): {$(VPATH)}subst.h
 iseq.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -8077,6 +8221,7 @@ load.$(OBJEXT): $(CCAN_DIR)/list/list.h
 load.$(OBJEXT): $(CCAN_DIR)/str/str.h
 load.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 load.$(OBJEXT): $(top_srcdir)/internal/array.h
+load.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 load.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 load.$(OBJEXT): $(top_srcdir)/internal/dir.h
 load.$(OBJEXT): $(top_srcdir)/internal/error.h
@@ -8274,6 +8419,7 @@ load.$(OBJEXT): {$(VPATH)}probes.dmyh
 load.$(OBJEXT): {$(VPATH)}probes.h
 load.$(OBJEXT): {$(VPATH)}ruby_assert.h
 load.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+load.$(OBJEXT): {$(VPATH)}shape.h
 load.$(OBJEXT): {$(VPATH)}st.h
 load.$(OBJEXT): {$(VPATH)}subst.h
 load.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -8283,7 +8429,6 @@ load.$(OBJEXT): {$(VPATH)}vm_core.h
 load.$(OBJEXT): {$(VPATH)}vm_opts.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/version.h
-loadpath.$(OBJEXT): $(top_srcdir)/revision.h
 loadpath.$(OBJEXT): $(top_srcdir)/version.h
 loadpath.$(OBJEXT): {$(VPATH)}assert.h
 loadpath.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -8773,8 +8918,13 @@ main.$(OBJEXT): {$(VPATH)}missing.h
 main.$(OBJEXT): {$(VPATH)}st.h
 main.$(OBJEXT): {$(VPATH)}subst.h
 main.$(OBJEXT): {$(VPATH)}vm_debug.h
+marshal.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+marshal.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+marshal.$(OBJEXT): $(CCAN_DIR)/list/list.h
+marshal.$(OBJEXT): $(CCAN_DIR)/str/str.h
 marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/array.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/bits.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -8784,6 +8934,7 @@ marshal.$(OBJEXT): $(top_srcdir)/internal/error.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/gc.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/hash.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/object.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/serial.h
@@ -8792,9 +8943,11 @@ marshal.$(OBJEXT): $(top_srcdir)/internal/string.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/struct.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/symbol.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/util.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/variable.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/vm.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 marshal.$(OBJEXT): {$(VPATH)}assert.h
+marshal.$(OBJEXT): {$(VPATH)}atomic.h
 marshal.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 marshal.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 marshal.$(OBJEXT): {$(VPATH)}backward/2/bool.h
@@ -8806,9 +8959,11 @@ marshal.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 marshal.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 marshal.$(OBJEXT): {$(VPATH)}builtin.h
 marshal.$(OBJEXT): {$(VPATH)}config.h
+marshal.$(OBJEXT): {$(VPATH)}constant.h
 marshal.$(OBJEXT): {$(VPATH)}defines.h
 marshal.$(OBJEXT): {$(VPATH)}encindex.h
 marshal.$(OBJEXT): {$(VPATH)}encoding.h
+marshal.$(OBJEXT): {$(VPATH)}id.h
 marshal.$(OBJEXT): {$(VPATH)}id_table.h
 marshal.$(OBJEXT): {$(VPATH)}intern.h
 marshal.$(OBJEXT): {$(VPATH)}internal.h
@@ -8849,6 +9004,7 @@ marshal.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
 marshal.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
@@ -8964,12 +9120,21 @@ marshal.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 marshal.$(OBJEXT): {$(VPATH)}io.h
 marshal.$(OBJEXT): {$(VPATH)}marshal.c
 marshal.$(OBJEXT): {$(VPATH)}marshal.rbinc
+marshal.$(OBJEXT): {$(VPATH)}method.h
 marshal.$(OBJEXT): {$(VPATH)}missing.h
+marshal.$(OBJEXT): {$(VPATH)}node.h
 marshal.$(OBJEXT): {$(VPATH)}onigmo.h
 marshal.$(OBJEXT): {$(VPATH)}oniguruma.h
+marshal.$(OBJEXT): {$(VPATH)}ruby_assert.h
+marshal.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+marshal.$(OBJEXT): {$(VPATH)}shape.h
 marshal.$(OBJEXT): {$(VPATH)}st.h
 marshal.$(OBJEXT): {$(VPATH)}subst.h
+marshal.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+marshal.$(OBJEXT): {$(VPATH)}thread_native.h
 marshal.$(OBJEXT): {$(VPATH)}util.h
+marshal.$(OBJEXT): {$(VPATH)}vm_core.h
+marshal.$(OBJEXT): {$(VPATH)}vm_opts.h
 math.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 math.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 math.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -8980,6 +9145,7 @@ math.$(OBJEXT): $(top_srcdir)/internal/math.h
 math.$(OBJEXT): $(top_srcdir)/internal/object.h
 math.$(OBJEXT): $(top_srcdir)/internal/serial.h
 math.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+math.$(OBJEXT): $(top_srcdir)/internal/variable.h
 math.$(OBJEXT): $(top_srcdir)/internal/vm.h
 math.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 math.$(OBJEXT): {$(VPATH)}assert.h
@@ -8993,6 +9159,7 @@ math.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 math.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 math.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 math.$(OBJEXT): {$(VPATH)}config.h
+math.$(OBJEXT): {$(VPATH)}constant.h
 math.$(OBJEXT): {$(VPATH)}defines.h
 math.$(OBJEXT): {$(VPATH)}id_table.h
 math.$(OBJEXT): {$(VPATH)}intern.h
@@ -9139,15 +9306,20 @@ math.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 math.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 math.$(OBJEXT): {$(VPATH)}math.c
 math.$(OBJEXT): {$(VPATH)}missing.h
+math.$(OBJEXT): {$(VPATH)}shape.h
 math.$(OBJEXT): {$(VPATH)}st.h
 math.$(OBJEXT): {$(VPATH)}subst.h
 memory_view.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/gc.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/hash.h
 memory_view.$(OBJEXT): $(top_srcdir)/internal/variable.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 memory_view.$(OBJEXT): {$(VPATH)}assert.h
 memory_view.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 memory_view.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 memory_view.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
 memory_view.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
 memory_view.$(OBJEXT): {$(VPATH)}backward/2/limits.h
 memory_view.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
@@ -9303,6 +9475,7 @@ memory_view.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 memory_view.$(OBJEXT): {$(VPATH)}memory_view.c
 memory_view.$(OBJEXT): {$(VPATH)}memory_view.h
 memory_view.$(OBJEXT): {$(VPATH)}missing.h
+memory_view.$(OBJEXT): {$(VPATH)}shape.h
 memory_view.$(OBJEXT): {$(VPATH)}st.h
 memory_view.$(OBJEXT): {$(VPATH)}subst.h
 memory_view.$(OBJEXT): {$(VPATH)}util.h
@@ -9315,11 +9488,13 @@ miniinit.$(OBJEXT): $(CCAN_DIR)/str/str.h
 miniinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 miniinit.$(OBJEXT): $(srcdir)/mjit_c.rb
 miniinit.$(OBJEXT): $(top_srcdir)/internal/array.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/gc.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/serial.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/variable.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/vm.h
 miniinit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 miniinit.$(OBJEXT): {$(VPATH)}array.rb
@@ -9337,12 +9512,14 @@ miniinit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 miniinit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 miniinit.$(OBJEXT): {$(VPATH)}builtin.h
 miniinit.$(OBJEXT): {$(VPATH)}config.h
+miniinit.$(OBJEXT): {$(VPATH)}constant.h
 miniinit.$(OBJEXT): {$(VPATH)}defines.h
 miniinit.$(OBJEXT): {$(VPATH)}dir.rb
 miniinit.$(OBJEXT): {$(VPATH)}encoding.h
 miniinit.$(OBJEXT): {$(VPATH)}gc.rb
 miniinit.$(OBJEXT): {$(VPATH)}gem_prelude.rb
 miniinit.$(OBJEXT): {$(VPATH)}id.h
+miniinit.$(OBJEXT): {$(VPATH)}id_table.h
 miniinit.$(OBJEXT): {$(VPATH)}intern.h
 miniinit.$(OBJEXT): {$(VPATH)}internal.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -9382,6 +9559,7 @@ miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
 miniinit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
@@ -9505,7 +9683,6 @@ miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c
 miniinit.$(OBJEXT): {$(VPATH)}missing.h
 miniinit.$(OBJEXT): {$(VPATH)}mjit.rb
 miniinit.$(OBJEXT): {$(VPATH)}mjit_c.rb
-miniinit.$(OBJEXT): {$(VPATH)}mjit_compiler.rb
 miniinit.$(OBJEXT): {$(VPATH)}nilclass.rb
 miniinit.$(OBJEXT): {$(VPATH)}node.h
 miniinit.$(OBJEXT): {$(VPATH)}numeric.rb
@@ -9516,8 +9693,10 @@ miniinit.$(OBJEXT): {$(VPATH)}prelude.rb
 miniinit.$(OBJEXT): {$(VPATH)}ractor.rb
 miniinit.$(OBJEXT): {$(VPATH)}ruby_assert.h
 miniinit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+miniinit.$(OBJEXT): {$(VPATH)}shape.h
 miniinit.$(OBJEXT): {$(VPATH)}st.h
 miniinit.$(OBJEXT): {$(VPATH)}subst.h
+miniinit.$(OBJEXT): {$(VPATH)}symbol.rb
 miniinit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 miniinit.$(OBJEXT): {$(VPATH)}thread_native.h
 miniinit.$(OBJEXT): {$(VPATH)}thread_sync.rb
@@ -9535,6 +9714,7 @@ mjit.$(OBJEXT): $(hdrdir)/ruby.h
 mjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 mjit.$(OBJEXT): $(hdrdir)/ruby/version.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/array.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/class.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/cmdlineopt.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/compile.h
@@ -9547,6 +9727,7 @@ mjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/process.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/serial.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/variable.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/vm.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 mjit.$(OBJEXT): {$(VPATH)}assert.h
@@ -9730,10 +9911,9 @@ mjit.$(OBJEXT): {$(VPATH)}method.h
 mjit.$(OBJEXT): {$(VPATH)}missing.h
 mjit.$(OBJEXT): {$(VPATH)}mjit.c
 mjit.$(OBJEXT): {$(VPATH)}mjit.h
-mjit.$(OBJEXT): {$(VPATH)}mjit.rb
 mjit.$(OBJEXT): {$(VPATH)}mjit.rbinc
+mjit.$(OBJEXT): {$(VPATH)}mjit_c.h
 mjit.$(OBJEXT): {$(VPATH)}mjit_config.h
-mjit.$(OBJEXT): {$(VPATH)}mjit_unit.h
 mjit.$(OBJEXT): {$(VPATH)}node.h
 mjit.$(OBJEXT): {$(VPATH)}onigmo.h
 mjit.$(OBJEXT): {$(VPATH)}oniguruma.h
@@ -9741,6 +9921,7 @@ mjit.$(OBJEXT): {$(VPATH)}ractor.h
 mjit.$(OBJEXT): {$(VPATH)}ractor_core.h
 mjit.$(OBJEXT): {$(VPATH)}ruby_assert.h
 mjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+mjit.$(OBJEXT): {$(VPATH)}shape.h
 mjit.$(OBJEXT): {$(VPATH)}st.h
 mjit.$(OBJEXT): {$(VPATH)}subst.h
 mjit.$(OBJEXT): {$(VPATH)}thread.h
@@ -9753,220 +9934,220 @@ mjit.$(OBJEXT): {$(VPATH)}vm_debug.h
 mjit.$(OBJEXT): {$(VPATH)}vm_opts.h
 mjit.$(OBJEXT): {$(VPATH)}vm_sync.h
 mjit.$(OBJEXT): {$(VPATH)}yjit.h
-mjit_compiler.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-mjit_compiler.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-mjit_compiler.$(OBJEXT): $(CCAN_DIR)/list/list.h
-mjit_compiler.$(OBJEXT): $(CCAN_DIR)/str/str.h
-mjit_compiler.$(OBJEXT): $(hdrdir)/ruby.h
-mjit_compiler.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-mjit_compiler.$(OBJEXT): $(srcdir)/mjit_c.rb
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/array.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/class.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/compile.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/compilers.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/gc.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/hash.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/imemo.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/object.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/serial.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/variable.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/vm.h
-mjit_compiler.$(OBJEXT): $(top_srcdir)/internal/warnings.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}assert.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}atomic.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}builtin.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}config.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}constant.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}debug_counter.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}defines.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}id.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}id_table.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}insns.def
-mjit_compiler.$(OBJEXT): {$(VPATH)}insns.inc
-mjit_compiler.$(OBJEXT): {$(VPATH)}insns_info.inc
-mjit_compiler.$(OBJEXT): {$(VPATH)}intern.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/abi.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/assume.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/cast.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/config.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/ctype.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/dosish.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/error.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/eval.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/event.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/gc.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/glob.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/globals.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/iterator.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/memory.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/method.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/module.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/newobj.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/rgengc.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/symbol.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/value.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/value_type.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/variable.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}iseq.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}method.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}missing.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_c.rb
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_c.rbinc
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compile_attr.inc
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.c
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.rb
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.rbinc
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_unit.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}node.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}ruby_assert.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}st.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}subst.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-mjit_compiler.$(OBJEXT): {$(VPATH)}thread_native.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}vm_callinfo.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}vm_core.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}vm_exec.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}vm_opts.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}yjit.h
+mjit_c.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+mjit_c.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+mjit_c.$(OBJEXT): $(CCAN_DIR)/list/list.h
+mjit_c.$(OBJEXT): $(CCAN_DIR)/str/str.h
+mjit_c.$(OBJEXT): $(hdrdir)/ruby.h
+mjit_c.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+mjit_c.$(OBJEXT): $(srcdir)/mjit_c.rb
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/array.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/class.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/compile.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/gc.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/hash.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/object.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/serial.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/variable.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/vm.h
+mjit_c.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+mjit_c.$(OBJEXT): {$(VPATH)}assert.h
+mjit_c.$(OBJEXT): {$(VPATH)}atomic.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+mjit_c.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+mjit_c.$(OBJEXT): {$(VPATH)}builtin.h
+mjit_c.$(OBJEXT): {$(VPATH)}config.h
+mjit_c.$(OBJEXT): {$(VPATH)}constant.h
+mjit_c.$(OBJEXT): {$(VPATH)}debug_counter.h
+mjit_c.$(OBJEXT): {$(VPATH)}defines.h
+mjit_c.$(OBJEXT): {$(VPATH)}id.h
+mjit_c.$(OBJEXT): {$(VPATH)}id_table.h
+mjit_c.$(OBJEXT): {$(VPATH)}insns.def
+mjit_c.$(OBJEXT): {$(VPATH)}insns.inc
+mjit_c.$(OBJEXT): {$(VPATH)}insns_info.inc
+mjit_c.$(OBJEXT): {$(VPATH)}intern.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/abi.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/assume.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/cast.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/config.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/ctype.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/dosish.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/error.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/eval.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/event.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/gc.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/glob.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/globals.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/iterator.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/memory.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/method.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/module.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/newobj.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/symbol.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/value.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/value_type.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/variable.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+mjit_c.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+mjit_c.$(OBJEXT): {$(VPATH)}iseq.h
+mjit_c.$(OBJEXT): {$(VPATH)}method.h
+mjit_c.$(OBJEXT): {$(VPATH)}missing.h
+mjit_c.$(OBJEXT): {$(VPATH)}mjit.h
+mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.c
+mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.h
+mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.rb
+mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.rbinc
+mjit_c.$(OBJEXT): {$(VPATH)}mjit_sp_inc.inc
+mjit_c.$(OBJEXT): {$(VPATH)}node.h
+mjit_c.$(OBJEXT): {$(VPATH)}ruby_assert.h
+mjit_c.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+mjit_c.$(OBJEXT): {$(VPATH)}shape.h
+mjit_c.$(OBJEXT): {$(VPATH)}st.h
+mjit_c.$(OBJEXT): {$(VPATH)}subst.h
+mjit_c.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+mjit_c.$(OBJEXT): {$(VPATH)}thread_native.h
+mjit_c.$(OBJEXT): {$(VPATH)}vm_callinfo.h
+mjit_c.$(OBJEXT): {$(VPATH)}vm_core.h
+mjit_c.$(OBJEXT): {$(VPATH)}vm_exec.h
+mjit_c.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
+mjit_c.$(OBJEXT): {$(VPATH)}vm_opts.h
+mjit_c.$(OBJEXT): {$(VPATH)}yjit.h
 node.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 node.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 node.$(OBJEXT): $(CCAN_DIR)/list/list.h
 node.$(OBJEXT): $(CCAN_DIR)/str/str.h
 node.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 node.$(OBJEXT): $(top_srcdir)/internal/array.h
+node.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 node.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 node.$(OBJEXT): $(top_srcdir)/internal/gc.h
 node.$(OBJEXT): $(top_srcdir)/internal/hash.h
@@ -10140,6 +10321,7 @@ node.$(OBJEXT): {$(VPATH)}node.c
 node.$(OBJEXT): {$(VPATH)}node.h
 node.$(OBJEXT): {$(VPATH)}ruby_assert.h
 node.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+node.$(OBJEXT): {$(VPATH)}shape.h
 node.$(OBJEXT): {$(VPATH)}st.h
 node.$(OBJEXT): {$(VPATH)}subst.h
 node.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -10337,16 +10519,21 @@ numeric.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 numeric.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 numeric.$(OBJEXT): {$(VPATH)}missing.h
 numeric.$(OBJEXT): {$(VPATH)}numeric.c
-numeric.$(OBJEXT): {$(VPATH)}numeric.rb
 numeric.$(OBJEXT): {$(VPATH)}numeric.rbinc
 numeric.$(OBJEXT): {$(VPATH)}onigmo.h
 numeric.$(OBJEXT): {$(VPATH)}oniguruma.h
 numeric.$(OBJEXT): {$(VPATH)}ruby_assert.h
+numeric.$(OBJEXT): {$(VPATH)}shape.h
 numeric.$(OBJEXT): {$(VPATH)}st.h
 numeric.$(OBJEXT): {$(VPATH)}subst.h
 numeric.$(OBJEXT): {$(VPATH)}util.h
+object.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+object.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+object.$(OBJEXT): $(CCAN_DIR)/list/list.h
+object.$(OBJEXT): $(CCAN_DIR)/str/str.h
 object.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 object.$(OBJEXT): $(top_srcdir)/internal/array.h
+object.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 object.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 object.$(OBJEXT): $(top_srcdir)/internal/bits.h
 object.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -10355,6 +10542,7 @@ object.$(OBJEXT): $(top_srcdir)/internal/error.h
 object.$(OBJEXT): $(top_srcdir)/internal/eval.h
 object.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 object.$(OBJEXT): $(top_srcdir)/internal/gc.h
+object.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 object.$(OBJEXT): $(top_srcdir)/internal/inits.h
 object.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 object.$(OBJEXT): $(top_srcdir)/internal/object.h
@@ -10367,6 +10555,7 @@ object.$(OBJEXT): $(top_srcdir)/internal/variable.h
 object.$(OBJEXT): $(top_srcdir)/internal/vm.h
 object.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 object.$(OBJEXT): {$(VPATH)}assert.h
+object.$(OBJEXT): {$(VPATH)}atomic.h
 object.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 object.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 object.$(OBJEXT): {$(VPATH)}backward/2/bool.h
@@ -10534,22 +10723,32 @@ object.$(OBJEXT): {$(VPATH)}internal/value_type.h
 object.$(OBJEXT): {$(VPATH)}internal/variable.h
 object.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 object.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-object.$(OBJEXT): {$(VPATH)}kernel.rb
 object.$(OBJEXT): {$(VPATH)}kernel.rbinc
+object.$(OBJEXT): {$(VPATH)}method.h
 object.$(OBJEXT): {$(VPATH)}missing.h
 object.$(OBJEXT): {$(VPATH)}nilclass.rbinc
+object.$(OBJEXT): {$(VPATH)}node.h
 object.$(OBJEXT): {$(VPATH)}object.c
 object.$(OBJEXT): {$(VPATH)}onigmo.h
 object.$(OBJEXT): {$(VPATH)}oniguruma.h
 object.$(OBJEXT): {$(VPATH)}probes.dmyh
 object.$(OBJEXT): {$(VPATH)}probes.h
+object.$(OBJEXT): {$(VPATH)}ruby_assert.h
+object.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+object.$(OBJEXT): {$(VPATH)}shape.h
 object.$(OBJEXT): {$(VPATH)}st.h
 object.$(OBJEXT): {$(VPATH)}subst.h
+object.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+object.$(OBJEXT): {$(VPATH)}thread_native.h
 object.$(OBJEXT): {$(VPATH)}util.h
+object.$(OBJEXT): {$(VPATH)}variable.h
+object.$(OBJEXT): {$(VPATH)}vm_core.h
+object.$(OBJEXT): {$(VPATH)}vm_opts.h
 pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 pack.$(OBJEXT): $(top_srcdir)/internal/array.h
 pack.$(OBJEXT): $(top_srcdir)/internal/bits.h
 pack.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+pack.$(OBJEXT): $(top_srcdir)/internal/gc.h
 pack.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 pack.$(OBJEXT): $(top_srcdir)/internal/string.h
 pack.$(OBJEXT): $(top_srcdir)/internal/symbol.h
@@ -10727,6 +10926,7 @@ pack.$(OBJEXT): {$(VPATH)}onigmo.h
 pack.$(OBJEXT): {$(VPATH)}oniguruma.h
 pack.$(OBJEXT): {$(VPATH)}pack.c
 pack.$(OBJEXT): {$(VPATH)}pack.rbinc
+pack.$(OBJEXT): {$(VPATH)}shape.h
 pack.$(OBJEXT): {$(VPATH)}st.h
 pack.$(OBJEXT): {$(VPATH)}subst.h
 pack.$(OBJEXT): {$(VPATH)}util.h
@@ -10738,6 +10938,7 @@ parse.$(OBJEXT): $(top_srcdir)/internal/bits.h
 parse.$(OBJEXT): $(top_srcdir)/internal/compile.h
 parse.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 parse.$(OBJEXT): $(top_srcdir)/internal/complex.h
+parse.$(OBJEXT): $(top_srcdir)/internal/encoding.h
 parse.$(OBJEXT): $(top_srcdir)/internal/error.h
 parse.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 parse.$(OBJEXT): $(top_srcdir)/internal/gc.h
@@ -10939,6 +11140,7 @@ parse.$(OBJEXT): {$(VPATH)}ractor.h
 parse.$(OBJEXT): {$(VPATH)}regenc.h
 parse.$(OBJEXT): {$(VPATH)}regex.h
 parse.$(OBJEXT): {$(VPATH)}ruby_assert.h
+parse.$(OBJEXT): {$(VPATH)}shape.h
 parse.$(OBJEXT): {$(VPATH)}st.h
 parse.$(OBJEXT): {$(VPATH)}subst.h
 parse.$(OBJEXT): {$(VPATH)}symbol.h
@@ -10949,11 +11151,13 @@ proc.$(OBJEXT): $(CCAN_DIR)/list/list.h
 proc.$(OBJEXT): $(CCAN_DIR)/str/str.h
 proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 proc.$(OBJEXT): $(top_srcdir)/internal/array.h
+proc.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 proc.$(OBJEXT): $(top_srcdir)/internal/class.h
 proc.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 proc.$(OBJEXT): $(top_srcdir)/internal/error.h
 proc.$(OBJEXT): $(top_srcdir)/internal/eval.h
 proc.$(OBJEXT): $(top_srcdir)/internal/gc.h
+proc.$(OBJEXT): $(top_srcdir)/internal/hash.h
 proc.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 proc.$(OBJEXT): $(top_srcdir)/internal/object.h
 proc.$(OBJEXT): $(top_srcdir)/internal/proc.h
@@ -10961,6 +11165,7 @@ proc.$(OBJEXT): $(top_srcdir)/internal/serial.h
 proc.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 proc.$(OBJEXT): $(top_srcdir)/internal/string.h
 proc.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+proc.$(OBJEXT): $(top_srcdir)/internal/variable.h
 proc.$(OBJEXT): $(top_srcdir)/internal/vm.h
 proc.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 proc.$(OBJEXT): {$(VPATH)}assert.h
@@ -10975,6 +11180,7 @@ proc.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 proc.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 proc.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 proc.$(OBJEXT): {$(VPATH)}config.h
+proc.$(OBJEXT): {$(VPATH)}constant.h
 proc.$(OBJEXT): {$(VPATH)}defines.h
 proc.$(OBJEXT): {$(VPATH)}encoding.h
 proc.$(OBJEXT): {$(VPATH)}eval_intern.h
@@ -11141,6 +11347,7 @@ proc.$(OBJEXT): {$(VPATH)}oniguruma.h
 proc.$(OBJEXT): {$(VPATH)}proc.c
 proc.$(OBJEXT): {$(VPATH)}ruby_assert.h
 proc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+proc.$(OBJEXT): {$(VPATH)}shape.h
 proc.$(OBJEXT): {$(VPATH)}st.h
 proc.$(OBJEXT): {$(VPATH)}subst.h
 proc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -11155,6 +11362,7 @@ process.$(OBJEXT): $(CCAN_DIR)/str/str.h
 process.$(OBJEXT): $(hdrdir)/ruby.h
 process.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 process.$(OBJEXT): $(top_srcdir)/internal/array.h
+process.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 process.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 process.$(OBJEXT): $(top_srcdir)/internal/bits.h
 process.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -11360,6 +11568,7 @@ process.$(OBJEXT): {$(VPATH)}process.c
 process.$(OBJEXT): {$(VPATH)}ractor.h
 process.$(OBJEXT): {$(VPATH)}ruby_assert.h
 process.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+process.$(OBJEXT): {$(VPATH)}shape.h
 process.$(OBJEXT): {$(VPATH)}st.h
 process.$(OBJEXT): {$(VPATH)}subst.h
 process.$(OBJEXT): {$(VPATH)}thread.h
@@ -11372,8 +11581,10 @@ ractor.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 ractor.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 ractor.$(OBJEXT): $(CCAN_DIR)/list/list.h
 ractor.$(OBJEXT): $(CCAN_DIR)/str/str.h
+ractor.$(OBJEXT): $(hdrdir)/ruby.h
 ractor.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/array.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/bits.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/compilers.h
@@ -11390,6 +11601,7 @@ ractor.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/string.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/struct.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/thread.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/variable.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/vm.h
 ractor.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 ractor.$(OBJEXT): {$(VPATH)}assert.h
@@ -11405,6 +11617,7 @@ ractor.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 ractor.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 ractor.$(OBJEXT): {$(VPATH)}builtin.h
 ractor.$(OBJEXT): {$(VPATH)}config.h
+ractor.$(OBJEXT): {$(VPATH)}constant.h
 ractor.$(OBJEXT): {$(VPATH)}debug_counter.h
 ractor.$(OBJEXT): {$(VPATH)}defines.h
 ractor.$(OBJEXT): {$(VPATH)}encoding.h
@@ -11564,16 +11777,17 @@ ractor.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 ractor.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 ractor.$(OBJEXT): {$(VPATH)}method.h
 ractor.$(OBJEXT): {$(VPATH)}missing.h
+ractor.$(OBJEXT): {$(VPATH)}mjit.h
 ractor.$(OBJEXT): {$(VPATH)}node.h
 ractor.$(OBJEXT): {$(VPATH)}onigmo.h
 ractor.$(OBJEXT): {$(VPATH)}oniguruma.h
 ractor.$(OBJEXT): {$(VPATH)}ractor.c
 ractor.$(OBJEXT): {$(VPATH)}ractor.h
-ractor.$(OBJEXT): {$(VPATH)}ractor.rb
 ractor.$(OBJEXT): {$(VPATH)}ractor.rbinc
 ractor.$(OBJEXT): {$(VPATH)}ractor_core.h
 ractor.$(OBJEXT): {$(VPATH)}ruby_assert.h
 ractor.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+ractor.$(OBJEXT): {$(VPATH)}shape.h
 ractor.$(OBJEXT): {$(VPATH)}st.h
 ractor.$(OBJEXT): {$(VPATH)}subst.h
 ractor.$(OBJEXT): {$(VPATH)}thread.h
@@ -11592,6 +11806,7 @@ random.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 random.$(OBJEXT): $(top_srcdir)/internal/bits.h
 random.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 random.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+random.$(OBJEXT): $(top_srcdir)/internal/gc.h
 random.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 random.$(OBJEXT): $(top_srcdir)/internal/random.h
 random.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
@@ -11763,12 +11978,14 @@ random.$(OBJEXT): {$(VPATH)}ractor.h
 random.$(OBJEXT): {$(VPATH)}random.c
 random.$(OBJEXT): {$(VPATH)}random.h
 random.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+random.$(OBJEXT): {$(VPATH)}shape.h
 random.$(OBJEXT): {$(VPATH)}siphash.c
 random.$(OBJEXT): {$(VPATH)}siphash.h
 random.$(OBJEXT): {$(VPATH)}st.h
 random.$(OBJEXT): {$(VPATH)}subst.h
 range.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 range.$(OBJEXT): $(top_srcdir)/internal/array.h
+range.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 range.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 range.$(OBJEXT): $(top_srcdir)/internal/bits.h
 range.$(OBJEXT): $(top_srcdir)/internal/compar.h
@@ -11955,6 +12172,7 @@ range.$(OBJEXT): {$(VPATH)}missing.h
 range.$(OBJEXT): {$(VPATH)}onigmo.h
 range.$(OBJEXT): {$(VPATH)}oniguruma.h
 range.$(OBJEXT): {$(VPATH)}range.c
+range.$(OBJEXT): {$(VPATH)}shape.h
 range.$(OBJEXT): {$(VPATH)}st.h
 range.$(OBJEXT): {$(VPATH)}subst.h
 rational.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -11971,6 +12189,7 @@ rational.$(OBJEXT): $(top_srcdir)/internal/object.h
 rational.$(OBJEXT): $(top_srcdir)/internal/rational.h
 rational.$(OBJEXT): $(top_srcdir)/internal/serial.h
 rational.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+rational.$(OBJEXT): $(top_srcdir)/internal/variable.h
 rational.$(OBJEXT): $(top_srcdir)/internal/vm.h
 rational.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 rational.$(OBJEXT): {$(VPATH)}assert.h
@@ -11984,6 +12203,7 @@ rational.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 rational.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 rational.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 rational.$(OBJEXT): {$(VPATH)}config.h
+rational.$(OBJEXT): {$(VPATH)}constant.h
 rational.$(OBJEXT): {$(VPATH)}defines.h
 rational.$(OBJEXT): {$(VPATH)}id.h
 rational.$(OBJEXT): {$(VPATH)}id_table.h
@@ -12132,6 +12352,7 @@ rational.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 rational.$(OBJEXT): {$(VPATH)}missing.h
 rational.$(OBJEXT): {$(VPATH)}rational.c
 rational.$(OBJEXT): {$(VPATH)}ruby_assert.h
+rational.$(OBJEXT): {$(VPATH)}shape.h
 rational.$(OBJEXT): {$(VPATH)}st.h
 rational.$(OBJEXT): {$(VPATH)}subst.h
 re.$(OBJEXT): $(hdrdir)/ruby.h
@@ -12140,6 +12361,7 @@ re.$(OBJEXT): $(top_srcdir)/internal/array.h
 re.$(OBJEXT): $(top_srcdir)/internal/bits.h
 re.$(OBJEXT): $(top_srcdir)/internal/class.h
 re.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+re.$(OBJEXT): $(top_srcdir)/internal/encoding.h
 re.$(OBJEXT): $(top_srcdir)/internal/gc.h
 re.$(OBJEXT): $(top_srcdir)/internal/hash.h
 re.$(OBJEXT): $(top_srcdir)/internal/imemo.h
@@ -12329,6 +12551,7 @@ re.$(OBJEXT): {$(VPATH)}re.h
 re.$(OBJEXT): {$(VPATH)}regenc.h
 re.$(OBJEXT): {$(VPATH)}regex.h
 re.$(OBJEXT): {$(VPATH)}regint.h
+re.$(OBJEXT): {$(VPATH)}shape.h
 re.$(OBJEXT): {$(VPATH)}st.h
 re.$(OBJEXT): {$(VPATH)}subst.h
 re.$(OBJEXT): {$(VPATH)}util.h
@@ -13324,9 +13547,11 @@ ruby.$(OBJEXT): $(hdrdir)/ruby.h
 ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 ruby.$(OBJEXT): $(hdrdir)/ruby/version.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/array.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/class.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/cmdlineopt.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/cont.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/error.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/file.h
 ruby.$(OBJEXT): $(top_srcdir)/internal/gc.h
@@ -13517,6 +13742,7 @@ ruby.$(OBJEXT): {$(VPATH)}internal/variable.h
 ruby.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 ruby.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 ruby.$(OBJEXT): {$(VPATH)}io.h
+ruby.$(OBJEXT): {$(VPATH)}iseq.h
 ruby.$(OBJEXT): {$(VPATH)}method.h
 ruby.$(OBJEXT): {$(VPATH)}missing.h
 ruby.$(OBJEXT): {$(VPATH)}mjit.h
@@ -13526,6 +13752,7 @@ ruby.$(OBJEXT): {$(VPATH)}oniguruma.h
 ruby.$(OBJEXT): {$(VPATH)}ruby.c
 ruby.$(OBJEXT): {$(VPATH)}ruby_assert.h
 ruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+ruby.$(OBJEXT): {$(VPATH)}shape.h
 ruby.$(OBJEXT): {$(VPATH)}st.h
 ruby.$(OBJEXT): {$(VPATH)}subst.h
 ruby.$(OBJEXT): {$(VPATH)}thread.h
@@ -13541,12 +13768,14 @@ scheduler.$(OBJEXT): $(CCAN_DIR)/list/list.h
 scheduler.$(OBJEXT): $(CCAN_DIR)/str/str.h
 scheduler.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/array.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/gc.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/serial.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/thread.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/variable.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/vm.h
 scheduler.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 scheduler.$(OBJEXT): {$(VPATH)}assert.h
@@ -13561,10 +13790,12 @@ scheduler.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 scheduler.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 scheduler.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 scheduler.$(OBJEXT): {$(VPATH)}config.h
+scheduler.$(OBJEXT): {$(VPATH)}constant.h
 scheduler.$(OBJEXT): {$(VPATH)}defines.h
 scheduler.$(OBJEXT): {$(VPATH)}encoding.h
 scheduler.$(OBJEXT): {$(VPATH)}fiber/scheduler.h
 scheduler.$(OBJEXT): {$(VPATH)}id.h
+scheduler.$(OBJEXT): {$(VPATH)}id_table.h
 scheduler.$(OBJEXT): {$(VPATH)}intern.h
 scheduler.$(OBJEXT): {$(VPATH)}internal.h
 scheduler.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -13726,6 +13957,7 @@ scheduler.$(OBJEXT): {$(VPATH)}oniguruma.h
 scheduler.$(OBJEXT): {$(VPATH)}ruby_assert.h
 scheduler.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 scheduler.$(OBJEXT): {$(VPATH)}scheduler.c
+scheduler.$(OBJEXT): {$(VPATH)}shape.h
 scheduler.$(OBJEXT): {$(VPATH)}st.h
 scheduler.$(OBJEXT): {$(VPATH)}subst.h
 scheduler.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -13891,12 +14123,219 @@ setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c
 setproctitle.$(OBJEXT): {$(VPATH)}st.h
 setproctitle.$(OBJEXT): {$(VPATH)}subst.h
 setproctitle.$(OBJEXT): {$(VPATH)}util.h
+shape.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+shape.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+shape.$(OBJEXT): $(CCAN_DIR)/list/list.h
+shape.$(OBJEXT): $(CCAN_DIR)/str/str.h
+shape.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+shape.$(OBJEXT): $(top_srcdir)/internal/array.h
+shape.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+shape.$(OBJEXT): $(top_srcdir)/internal/class.h
+shape.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+shape.$(OBJEXT): $(top_srcdir)/internal/gc.h
+shape.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+shape.$(OBJEXT): $(top_srcdir)/internal/serial.h
+shape.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+shape.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+shape.$(OBJEXT): $(top_srcdir)/internal/variable.h
+shape.$(OBJEXT): $(top_srcdir)/internal/vm.h
+shape.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+shape.$(OBJEXT): {$(VPATH)}assert.h
+shape.$(OBJEXT): {$(VPATH)}atomic.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+shape.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+shape.$(OBJEXT): {$(VPATH)}config.h
+shape.$(OBJEXT): {$(VPATH)}constant.h
+shape.$(OBJEXT): {$(VPATH)}debug_counter.h
+shape.$(OBJEXT): {$(VPATH)}defines.h
+shape.$(OBJEXT): {$(VPATH)}encoding.h
+shape.$(OBJEXT): {$(VPATH)}gc.h
+shape.$(OBJEXT): {$(VPATH)}id.h
+shape.$(OBJEXT): {$(VPATH)}id_table.h
+shape.$(OBJEXT): {$(VPATH)}intern.h
+shape.$(OBJEXT): {$(VPATH)}internal.h
+shape.$(OBJEXT): {$(VPATH)}internal/abi.h
+shape.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+shape.$(OBJEXT): {$(VPATH)}internal/assume.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+shape.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+shape.$(OBJEXT): {$(VPATH)}internal/cast.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+shape.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+shape.$(OBJEXT): {$(VPATH)}internal/config.h
+shape.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+shape.$(OBJEXT): {$(VPATH)}internal/core.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+shape.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+shape.$(OBJEXT): {$(VPATH)}internal/ctype.h
+shape.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+shape.$(OBJEXT): {$(VPATH)}internal/dosish.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/coderange.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/ctype.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/encoding.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/pathname.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/re.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/sprintf.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/string.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/symbol.h
+shape.$(OBJEXT): {$(VPATH)}internal/encoding/transcode.h
+shape.$(OBJEXT): {$(VPATH)}internal/error.h
+shape.$(OBJEXT): {$(VPATH)}internal/eval.h
+shape.$(OBJEXT): {$(VPATH)}internal/event.h
+shape.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+shape.$(OBJEXT): {$(VPATH)}internal/gc.h
+shape.$(OBJEXT): {$(VPATH)}internal/glob.h
+shape.$(OBJEXT): {$(VPATH)}internal/globals.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+shape.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+shape.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+shape.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+shape.$(OBJEXT): {$(VPATH)}internal/iterator.h
+shape.$(OBJEXT): {$(VPATH)}internal/memory.h
+shape.$(OBJEXT): {$(VPATH)}internal/method.h
+shape.$(OBJEXT): {$(VPATH)}internal/module.h
+shape.$(OBJEXT): {$(VPATH)}internal/newobj.h
+shape.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+shape.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+shape.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+shape.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+shape.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+shape.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+shape.$(OBJEXT): {$(VPATH)}internal/symbol.h
+shape.$(OBJEXT): {$(VPATH)}internal/value.h
+shape.$(OBJEXT): {$(VPATH)}internal/value_type.h
+shape.$(OBJEXT): {$(VPATH)}internal/variable.h
+shape.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+shape.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+shape.$(OBJEXT): {$(VPATH)}method.h
+shape.$(OBJEXT): {$(VPATH)}missing.h
+shape.$(OBJEXT): {$(VPATH)}node.h
+shape.$(OBJEXT): {$(VPATH)}onigmo.h
+shape.$(OBJEXT): {$(VPATH)}oniguruma.h
+shape.$(OBJEXT): {$(VPATH)}ruby_assert.h
+shape.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+shape.$(OBJEXT): {$(VPATH)}shape.c
+shape.$(OBJEXT): {$(VPATH)}shape.h
+shape.$(OBJEXT): {$(VPATH)}st.h
+shape.$(OBJEXT): {$(VPATH)}subst.h
+shape.$(OBJEXT): {$(VPATH)}symbol.h
+shape.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+shape.$(OBJEXT): {$(VPATH)}thread_native.h
+shape.$(OBJEXT): {$(VPATH)}variable.h
+shape.$(OBJEXT): {$(VPATH)}vm_core.h
+shape.$(OBJEXT): {$(VPATH)}vm_debug.h
+shape.$(OBJEXT): {$(VPATH)}vm_opts.h
+shape.$(OBJEXT): {$(VPATH)}vm_sync.h
 signal.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 signal.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 signal.$(OBJEXT): $(CCAN_DIR)/list/list.h
 signal.$(OBJEXT): $(CCAN_DIR)/str/str.h
 signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 signal.$(OBJEXT): $(top_srcdir)/internal/array.h
+signal.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 signal.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 signal.$(OBJEXT): $(top_srcdir)/internal/eval.h
 signal.$(OBJEXT): $(top_srcdir)/internal/gc.h
@@ -13907,6 +14346,7 @@ signal.$(OBJEXT): $(top_srcdir)/internal/signal.h
 signal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 signal.$(OBJEXT): $(top_srcdir)/internal/string.h
 signal.$(OBJEXT): $(top_srcdir)/internal/thread.h
+signal.$(OBJEXT): $(top_srcdir)/internal/variable.h
 signal.$(OBJEXT): $(top_srcdir)/internal/vm.h
 signal.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 signal.$(OBJEXT): {$(VPATH)}assert.h
@@ -13921,6 +14361,7 @@ signal.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 signal.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 signal.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 signal.$(OBJEXT): {$(VPATH)}config.h
+signal.$(OBJEXT): {$(VPATH)}constant.h
 signal.$(OBJEXT): {$(VPATH)}debug_counter.h
 signal.$(OBJEXT): {$(VPATH)}defines.h
 signal.$(OBJEXT): {$(VPATH)}encoding.h
@@ -13966,6 +14407,7 @@ signal.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
 signal.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
@@ -14087,6 +14529,7 @@ signal.$(OBJEXT): {$(VPATH)}ractor.h
 signal.$(OBJEXT): {$(VPATH)}ractor_core.h
 signal.$(OBJEXT): {$(VPATH)}ruby_assert.h
 signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+signal.$(OBJEXT): {$(VPATH)}shape.h
 signal.$(OBJEXT): {$(VPATH)}signal.c
 signal.$(OBJEXT): {$(VPATH)}st.h
 signal.$(OBJEXT): {$(VPATH)}subst.h
@@ -14111,6 +14554,7 @@ sprintf.$(OBJEXT): $(top_srcdir)/internal/serial.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/string.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/variable.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/vm.h
 sprintf.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 sprintf.$(OBJEXT): {$(VPATH)}assert.h
@@ -14124,6 +14568,7 @@ sprintf.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 sprintf.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 sprintf.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 sprintf.$(OBJEXT): {$(VPATH)}config.h
+sprintf.$(OBJEXT): {$(VPATH)}constant.h
 sprintf.$(OBJEXT): {$(VPATH)}defines.h
 sprintf.$(OBJEXT): {$(VPATH)}encoding.h
 sprintf.$(OBJEXT): {$(VPATH)}id.h
@@ -14285,6 +14730,7 @@ sprintf.$(OBJEXT): {$(VPATH)}onigmo.h
 sprintf.$(OBJEXT): {$(VPATH)}oniguruma.h
 sprintf.$(OBJEXT): {$(VPATH)}re.h
 sprintf.$(OBJEXT): {$(VPATH)}regex.h
+sprintf.$(OBJEXT): {$(VPATH)}shape.h
 sprintf.$(OBJEXT): {$(VPATH)}sprintf.c
 sprintf.$(OBJEXT): {$(VPATH)}st.h
 sprintf.$(OBJEXT): {$(VPATH)}subst.h
@@ -14452,11 +14898,13 @@ st.$(OBJEXT): {$(VPATH)}internal/variable.h
 st.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 st.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 st.$(OBJEXT): {$(VPATH)}missing.h
+st.$(OBJEXT): {$(VPATH)}ruby_assert.h
 st.$(OBJEXT): {$(VPATH)}st.c
 st.$(OBJEXT): {$(VPATH)}st.h
 st.$(OBJEXT): {$(VPATH)}subst.h
 strftime.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 strftime.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+strftime.$(OBJEXT): $(top_srcdir)/internal/encoding.h
 strftime.$(OBJEXT): $(top_srcdir)/internal/serial.h
 strftime.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 strftime.$(OBJEXT): $(top_srcdir)/internal/string.h
@@ -14635,6 +15083,7 @@ strftime.$(OBJEXT): {$(VPATH)}timev.h
 strftime.$(OBJEXT): {$(VPATH)}util.h
 string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 string.$(OBJEXT): $(top_srcdir)/internal/array.h
+string.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 string.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 string.$(OBJEXT): $(top_srcdir)/internal/bits.h
 string.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -14653,6 +15102,7 @@ string.$(OBJEXT): $(top_srcdir)/internal/serial.h
 string.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 string.$(OBJEXT): $(top_srcdir)/internal/string.h
 string.$(OBJEXT): $(top_srcdir)/internal/transcode.h
+string.$(OBJEXT): $(top_srcdir)/internal/variable.h
 string.$(OBJEXT): $(top_srcdir)/internal/vm.h
 string.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 string.$(OBJEXT): {$(VPATH)}assert.h
@@ -14667,6 +15117,7 @@ string.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 string.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 string.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 string.$(OBJEXT): {$(VPATH)}config.h
+string.$(OBJEXT): {$(VPATH)}constant.h
 string.$(OBJEXT): {$(VPATH)}debug_counter.h
 string.$(OBJEXT): {$(VPATH)}defines.h
 string.$(OBJEXT): {$(VPATH)}encindex.h
@@ -14713,6 +15164,7 @@ string.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
 string.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
@@ -14834,6 +15286,7 @@ string.$(OBJEXT): {$(VPATH)}probes.h
 string.$(OBJEXT): {$(VPATH)}re.h
 string.$(OBJEXT): {$(VPATH)}regex.h
 string.$(OBJEXT): {$(VPATH)}ruby_assert.h
+string.$(OBJEXT): {$(VPATH)}shape.h
 string.$(OBJEXT): {$(VPATH)}st.h
 string.$(OBJEXT): {$(VPATH)}string.c
 string.$(OBJEXT): {$(VPATH)}subst.h
@@ -14877,6 +15330,7 @@ struct.$(OBJEXT): $(CCAN_DIR)/list/list.h
 struct.$(OBJEXT): $(CCAN_DIR)/str/str.h
 struct.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 struct.$(OBJEXT): $(top_srcdir)/internal/array.h
+struct.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 struct.$(OBJEXT): $(top_srcdir)/internal/class.h
 struct.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 struct.$(OBJEXT): $(top_srcdir)/internal/error.h
@@ -14890,6 +15344,7 @@ struct.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 struct.$(OBJEXT): $(top_srcdir)/internal/string.h
 struct.$(OBJEXT): $(top_srcdir)/internal/struct.h
 struct.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+struct.$(OBJEXT): $(top_srcdir)/internal/variable.h
 struct.$(OBJEXT): $(top_srcdir)/internal/vm.h
 struct.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 struct.$(OBJEXT): {$(VPATH)}assert.h
@@ -14905,6 +15360,7 @@ struct.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 struct.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 struct.$(OBJEXT): {$(VPATH)}builtin.h
 struct.$(OBJEXT): {$(VPATH)}config.h
+struct.$(OBJEXT): {$(VPATH)}constant.h
 struct.$(OBJEXT): {$(VPATH)}defines.h
 struct.$(OBJEXT): {$(VPATH)}encoding.h
 struct.$(OBJEXT): {$(VPATH)}id.h
@@ -15067,6 +15523,7 @@ struct.$(OBJEXT): {$(VPATH)}onigmo.h
 struct.$(OBJEXT): {$(VPATH)}oniguruma.h
 struct.$(OBJEXT): {$(VPATH)}ruby_assert.h
 struct.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+struct.$(OBJEXT): {$(VPATH)}shape.h
 struct.$(OBJEXT): {$(VPATH)}st.h
 struct.$(OBJEXT): {$(VPATH)}struct.c
 struct.$(OBJEXT): {$(VPATH)}subst.h
@@ -15086,6 +15543,7 @@ symbol.$(OBJEXT): $(top_srcdir)/internal/serial.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/string.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/variable.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/vm.h
 symbol.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 symbol.$(OBJEXT): {$(VPATH)}assert.h
@@ -15098,7 +15556,9 @@ symbol.$(OBJEXT): {$(VPATH)}backward/2/limits.h
 symbol.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 symbol.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 symbol.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+symbol.$(OBJEXT): {$(VPATH)}builtin.h
 symbol.$(OBJEXT): {$(VPATH)}config.h
+symbol.$(OBJEXT): {$(VPATH)}constant.h
 symbol.$(OBJEXT): {$(VPATH)}debug_counter.h
 symbol.$(OBJEXT): {$(VPATH)}defines.h
 symbol.$(OBJEXT): {$(VPATH)}encoding.h
@@ -15146,6 +15606,7 @@ symbol.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
 symbol.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
@@ -15264,10 +15725,13 @@ symbol.$(OBJEXT): {$(VPATH)}oniguruma.h
 symbol.$(OBJEXT): {$(VPATH)}probes.dmyh
 symbol.$(OBJEXT): {$(VPATH)}probes.h
 symbol.$(OBJEXT): {$(VPATH)}ruby_assert.h
+symbol.$(OBJEXT): {$(VPATH)}shape.h
 symbol.$(OBJEXT): {$(VPATH)}st.h
 symbol.$(OBJEXT): {$(VPATH)}subst.h
 symbol.$(OBJEXT): {$(VPATH)}symbol.c
 symbol.$(OBJEXT): {$(VPATH)}symbol.h
+symbol.$(OBJEXT): {$(VPATH)}symbol.rb
+symbol.$(OBJEXT): {$(VPATH)}symbol.rbinc
 symbol.$(OBJEXT): {$(VPATH)}vm_debug.h
 symbol.$(OBJEXT): {$(VPATH)}vm_sync.h
 thread.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
@@ -15277,6 +15741,7 @@ thread.$(OBJEXT): $(CCAN_DIR)/str/str.h
 thread.$(OBJEXT): $(hdrdir)/ruby.h
 thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 thread.$(OBJEXT): $(top_srcdir)/internal/array.h
+thread.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 thread.$(OBJEXT): $(top_srcdir)/internal/bits.h
 thread.$(OBJEXT): $(top_srcdir)/internal/class.h
 thread.$(OBJEXT): $(top_srcdir)/internal/compilers.h
@@ -15294,6 +15759,7 @@ thread.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 thread.$(OBJEXT): $(top_srcdir)/internal/string.h
 thread.$(OBJEXT): $(top_srcdir)/internal/thread.h
 thread.$(OBJEXT): $(top_srcdir)/internal/time.h
+thread.$(OBJEXT): $(top_srcdir)/internal/variable.h
 thread.$(OBJEXT): $(top_srcdir)/internal/vm.h
 thread.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 thread.$(OBJEXT): {$(VPATH)}assert.h
@@ -15309,6 +15775,7 @@ thread.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 thread.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 thread.$(OBJEXT): {$(VPATH)}builtin.h
 thread.$(OBJEXT): {$(VPATH)}config.h
+thread.$(OBJEXT): {$(VPATH)}constant.h
 thread.$(OBJEXT): {$(VPATH)}debug.h
 thread.$(OBJEXT): {$(VPATH)}debug_counter.h
 thread.$(OBJEXT): {$(VPATH)}defines.h
@@ -15482,6 +15949,7 @@ thread.$(OBJEXT): {$(VPATH)}ractor.h
 thread.$(OBJEXT): {$(VPATH)}ractor_core.h
 thread.$(OBJEXT): {$(VPATH)}ruby_assert.h
 thread.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+thread.$(OBJEXT): {$(VPATH)}shape.h
 thread.$(OBJEXT): {$(VPATH)}st.h
 thread.$(OBJEXT): {$(VPATH)}subst.h
 thread.$(OBJEXT): {$(VPATH)}thread.c
@@ -15490,7 +15958,6 @@ thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).c
 thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 thread.$(OBJEXT): {$(VPATH)}thread_native.h
 thread.$(OBJEXT): {$(VPATH)}thread_sync.c
-thread.$(OBJEXT): {$(VPATH)}thread_sync.rb
 thread.$(OBJEXT): {$(VPATH)}thread_sync.rbinc
 thread.$(OBJEXT): {$(VPATH)}timev.h
 thread.$(OBJEXT): {$(VPATH)}vm_core.h
@@ -15499,12 +15966,14 @@ thread.$(OBJEXT): {$(VPATH)}vm_opts.h
 thread.$(OBJEXT): {$(VPATH)}vm_sync.h
 time.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 time.$(OBJEXT): $(top_srcdir)/internal/array.h
+time.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 time.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 time.$(OBJEXT): $(top_srcdir)/internal/bits.h
 time.$(OBJEXT): $(top_srcdir)/internal/compar.h
 time.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 time.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 time.$(OBJEXT): $(top_srcdir)/internal/gc.h
+time.$(OBJEXT): $(top_srcdir)/internal/hash.h
 time.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 time.$(OBJEXT): $(top_srcdir)/internal/rational.h
 time.$(OBJEXT): $(top_srcdir)/internal/serial.h
@@ -15686,6 +16155,7 @@ time.$(OBJEXT): {$(VPATH)}missing.h
 time.$(OBJEXT): {$(VPATH)}onigmo.h
 time.$(OBJEXT): {$(VPATH)}oniguruma.h
 time.$(OBJEXT): {$(VPATH)}ruby_assert.h
+time.$(OBJEXT): {$(VPATH)}shape.h
 time.$(OBJEXT): {$(VPATH)}st.h
 time.$(OBJEXT): {$(VPATH)}subst.h
 time.$(OBJEXT): {$(VPATH)}time.c
@@ -15702,6 +16172,7 @@ transcode.$(OBJEXT): $(top_srcdir)/internal/serial.h
 transcode.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 transcode.$(OBJEXT): $(top_srcdir)/internal/string.h
 transcode.$(OBJEXT): $(top_srcdir)/internal/transcode.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/variable.h
 transcode.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 transcode.$(OBJEXT): {$(VPATH)}assert.h
 transcode.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -15714,6 +16185,7 @@ transcode.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 transcode.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 transcode.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 transcode.$(OBJEXT): {$(VPATH)}config.h
+transcode.$(OBJEXT): {$(VPATH)}constant.h
 transcode.$(OBJEXT): {$(VPATH)}defines.h
 transcode.$(OBJEXT): {$(VPATH)}encoding.h
 transcode.$(OBJEXT): {$(VPATH)}id.h
@@ -15872,6 +16344,7 @@ transcode.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 transcode.$(OBJEXT): {$(VPATH)}missing.h
 transcode.$(OBJEXT): {$(VPATH)}onigmo.h
 transcode.$(OBJEXT): {$(VPATH)}oniguruma.h
+transcode.$(OBJEXT): {$(VPATH)}shape.h
 transcode.$(OBJEXT): {$(VPATH)}st.h
 transcode.$(OBJEXT): {$(VPATH)}subst.h
 transcode.$(OBJEXT): {$(VPATH)}transcode.c
@@ -16047,6 +16520,7 @@ transient_heap.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 transient_heap.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 transient_heap.$(OBJEXT): {$(VPATH)}missing.h
 transient_heap.$(OBJEXT): {$(VPATH)}ruby_assert.h
+transient_heap.$(OBJEXT): {$(VPATH)}shape.h
 transient_heap.$(OBJEXT): {$(VPATH)}st.h
 transient_heap.$(OBJEXT): {$(VPATH)}subst.h
 transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.c
@@ -16226,6 +16700,7 @@ variable.$(OBJEXT): $(CCAN_DIR)/list/list.h
 variable.$(OBJEXT): $(CCAN_DIR)/str/str.h
 variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 variable.$(OBJEXT): $(top_srcdir)/internal/array.h
+variable.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 variable.$(OBJEXT): $(top_srcdir)/internal/class.h
 variable.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 variable.$(OBJEXT): $(top_srcdir)/internal/error.h
@@ -16421,6 +16896,7 @@ variable.$(OBJEXT): {$(VPATH)}ractor.h
 variable.$(OBJEXT): {$(VPATH)}ractor_core.h
 variable.$(OBJEXT): {$(VPATH)}ruby_assert.h
 variable.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+variable.$(OBJEXT): {$(VPATH)}shape.h
 variable.$(OBJEXT): {$(VPATH)}st.h
 variable.$(OBJEXT): {$(VPATH)}subst.h
 variable.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -16441,14 +16917,16 @@ version.$(OBJEXT): $(hdrdir)/ruby.h
 version.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 version.$(OBJEXT): $(hdrdir)/ruby/version.h
 version.$(OBJEXT): $(top_srcdir)/internal/array.h
+version.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
+version.$(OBJEXT): $(top_srcdir)/internal/cmdlineopt.h
 version.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 version.$(OBJEXT): $(top_srcdir)/internal/gc.h
 version.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 version.$(OBJEXT): $(top_srcdir)/internal/serial.h
 version.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+version.$(OBJEXT): $(top_srcdir)/internal/variable.h
 version.$(OBJEXT): $(top_srcdir)/internal/vm.h
 version.$(OBJEXT): $(top_srcdir)/internal/warnings.h
-version.$(OBJEXT): $(top_srcdir)/revision.h
 version.$(OBJEXT): $(top_srcdir)/version.h
 version.$(OBJEXT): {$(VPATH)}assert.h
 version.$(OBJEXT): {$(VPATH)}atomic.h
@@ -16462,9 +16940,11 @@ version.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 version.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 version.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 version.$(OBJEXT): {$(VPATH)}config.h
+version.$(OBJEXT): {$(VPATH)}constant.h
 version.$(OBJEXT): {$(VPATH)}debug_counter.h
 version.$(OBJEXT): {$(VPATH)}defines.h
 version.$(OBJEXT): {$(VPATH)}id.h
+version.$(OBJEXT): {$(VPATH)}id_table.h
 version.$(OBJEXT): {$(VPATH)}intern.h
 version.$(OBJEXT): {$(VPATH)}internal.h
 version.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -16611,8 +17091,10 @@ version.$(OBJEXT): {$(VPATH)}method.h
 version.$(OBJEXT): {$(VPATH)}missing.h
 version.$(OBJEXT): {$(VPATH)}mjit.h
 version.$(OBJEXT): {$(VPATH)}node.h
+version.$(OBJEXT): {$(VPATH)}revision.h
 version.$(OBJEXT): {$(VPATH)}ruby_assert.h
 version.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+version.$(OBJEXT): {$(VPATH)}shape.h
 version.$(OBJEXT): {$(VPATH)}st.h
 version.$(OBJEXT): {$(VPATH)}subst.h
 version.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -16628,6 +17110,7 @@ vm.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm.$(OBJEXT): $(hdrdir)/ruby.h
 vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 vm.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm.$(OBJEXT): $(top_srcdir)/internal/bignum.h
 vm.$(OBJEXT): $(top_srcdir)/internal/bits.h
 vm.$(OBJEXT): $(top_srcdir)/internal/class.h
@@ -16848,6 +17331,7 @@ vm.$(OBJEXT): {$(VPATH)}ractor.h
 vm.$(OBJEXT): {$(VPATH)}ractor_core.h
 vm.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm.$(OBJEXT): {$(VPATH)}shape.h
 vm.$(OBJEXT): {$(VPATH)}st.h
 vm.$(OBJEXT): {$(VPATH)}subst.h
 vm.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -16877,6 +17361,7 @@ vm_backtrace.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/error.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/gc.h
@@ -16884,6 +17369,7 @@ vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/serial.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/string.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/variable.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/vm.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}assert.h
@@ -16898,11 +17384,13 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}config.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}constant.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}defines.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}encoding.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}eval_intern.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}id.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}id_table.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}intern.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -17062,6 +17550,7 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}onigmo.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}oniguruma.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}shape.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}st.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}subst.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -17075,6 +17564,7 @@ vm_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 vm_dump.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm_dump.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 vm_dump.$(OBJEXT): $(top_srcdir)/internal/gc.h
 vm_dump.$(OBJEXT): $(top_srcdir)/internal/imemo.h
@@ -17252,6 +17742,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}ractor.h
 vm_dump.$(OBJEXT): {$(VPATH)}ractor_core.h
 vm_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_dump.$(OBJEXT): {$(VPATH)}shape.h
 vm_dump.$(OBJEXT): {$(VPATH)}st.h
 vm_dump.$(OBJEXT): {$(VPATH)}subst.h
 vm_dump.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -17266,11 +17757,13 @@ vm_sync.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_sync.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_sync.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/gc.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/serial.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/variable.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/vm.h
 vm_sync.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 vm_sync.$(OBJEXT): {$(VPATH)}assert.h
@@ -17285,6 +17778,7 @@ vm_sync.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 vm_sync.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 vm_sync.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 vm_sync.$(OBJEXT): {$(VPATH)}config.h
+vm_sync.$(OBJEXT): {$(VPATH)}constant.h
 vm_sync.$(OBJEXT): {$(VPATH)}debug_counter.h
 vm_sync.$(OBJEXT): {$(VPATH)}defines.h
 vm_sync.$(OBJEXT): {$(VPATH)}gc.h
@@ -17439,6 +17933,7 @@ vm_sync.$(OBJEXT): {$(VPATH)}ractor.h
 vm_sync.$(OBJEXT): {$(VPATH)}ractor_core.h
 vm_sync.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_sync.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_sync.$(OBJEXT): {$(VPATH)}shape.h
 vm_sync.$(OBJEXT): {$(VPATH)}st.h
 vm_sync.$(OBJEXT): {$(VPATH)}subst.h
 vm_sync.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -17455,6 +17950,7 @@ vm_trace.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_trace.$(OBJEXT): $(hdrdir)/ruby.h
 vm_trace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/gc.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/hash.h
@@ -17462,6 +17958,7 @@ vm_trace.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/serial.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/variable.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/vm.h
 vm_trace.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 vm_trace.$(OBJEXT): {$(VPATH)}assert.h
@@ -17477,12 +17974,14 @@ vm_trace.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 vm_trace.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 vm_trace.$(OBJEXT): {$(VPATH)}builtin.h
 vm_trace.$(OBJEXT): {$(VPATH)}config.h
+vm_trace.$(OBJEXT): {$(VPATH)}constant.h
 vm_trace.$(OBJEXT): {$(VPATH)}debug.h
 vm_trace.$(OBJEXT): {$(VPATH)}debug_counter.h
 vm_trace.$(OBJEXT): {$(VPATH)}defines.h
 vm_trace.$(OBJEXT): {$(VPATH)}encoding.h
 vm_trace.$(OBJEXT): {$(VPATH)}eval_intern.h
 vm_trace.$(OBJEXT): {$(VPATH)}id.h
+vm_trace.$(OBJEXT): {$(VPATH)}id_table.h
 vm_trace.$(OBJEXT): {$(VPATH)}intern.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal/abi.h
@@ -17644,6 +18143,7 @@ vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h
 vm_trace.$(OBJEXT): {$(VPATH)}ractor.h
 vm_trace.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_trace.$(OBJEXT): {$(VPATH)}shape.h
 vm_trace.$(OBJEXT): {$(VPATH)}st.h
 vm_trace.$(OBJEXT): {$(VPATH)}subst.h
 vm_trace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -17659,9 +18159,11 @@ yjit.$(OBJEXT): $(CCAN_DIR)/list/list.h
 yjit.$(OBJEXT): $(CCAN_DIR)/str/str.h
 yjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/array.h
+yjit.$(OBJEXT): $(top_srcdir)/internal/basic_operators.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/class.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/compile.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+yjit.$(OBJEXT): $(top_srcdir)/internal/cont.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/gc.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/hash.h
@@ -17859,6 +18361,7 @@ yjit.$(OBJEXT): {$(VPATH)}probes.h
 yjit.$(OBJEXT): {$(VPATH)}probes_helper.h
 yjit.$(OBJEXT): {$(VPATH)}ruby_assert.h
 yjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+yjit.$(OBJEXT): {$(VPATH)}shape.h
 yjit.$(OBJEXT): {$(VPATH)}st.h
 yjit.$(OBJEXT): {$(VPATH)}subst.h
 yjit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
@@ -17871,6 +18374,5 @@ yjit.$(OBJEXT): {$(VPATH)}vm_opts.h
 yjit.$(OBJEXT): {$(VPATH)}vm_sync.h
 yjit.$(OBJEXT): {$(VPATH)}yjit.c
 yjit.$(OBJEXT): {$(VPATH)}yjit.h
-yjit.$(OBJEXT): {$(VPATH)}yjit.rb
 yjit.$(OBJEXT): {$(VPATH)}yjit.rbinc
 # AUTOGENERATED DEPENDENCIES END
diff --git a/compar.c b/compar.c
index 00e79b5767..040f77975e 100644
--- a/compar.c
+++ b/compar.c
@@ -50,7 +50,7 @@ VALUE
 rb_invcmp(VALUE x, VALUE y)
 {
     VALUE invcmp = rb_exec_recursive(invcmp_recursive, x, y);
-    if (invcmp == Qundef || NIL_P(invcmp)) {
+    if (NIL_OR_UNDEF_P(invcmp)) {
         return Qnil;
     }
     else {
diff --git a/compile.c b/compile.c
index a5da919c0a..0452305923 100644
--- a/compile.c
+++ b/compile.c
@@ -1243,6 +1243,32 @@ new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
     return adjust;
 }
 
+static void
+iseq_insn_each_markable_object(INSN *insn, void (*func)(VALUE *, VALUE), VALUE data)
+{
+    const char *types = insn_op_types(insn->insn_id);
+    for (int j = 0; types[j]; j++) {
+        char type = types[j];
+        switch (type) {
+          case TS_CDHASH:
+          case TS_ISEQ:
+          case TS_VALUE:
+          case TS_IC: // constant path array
+          case TS_CALLDATA: // ci is stored.
+            func(&OPERAND_AT(insn, j), data);
+            break;
+          default:
+            break;
+        }
+    }
+}
+
+static void
+iseq_insn_each_object_write_barrier(VALUE *obj_ptr, VALUE iseq)
+{
+    RB_OBJ_WRITTEN(iseq, Qundef, *obj_ptr);
+}
+
 static INSN *
 new_insn_core(rb_iseq_t *iseq, const NODE *line_node,
               int insn_id, int argc, VALUE *argv)
@@ -1260,6 +1286,9 @@ new_insn_core(rb_iseq_t *iseq, const NODE *line_node,
     iobj->operands = argv;
     iobj->operand_size = argc;
     iobj->sc_state = 0;
+
+    iseq_insn_each_markable_object(iobj, iseq_insn_each_object_write_barrier, (VALUE)iseq);
+
     return iobj;
 }
 
@@ -2058,20 +2087,7 @@ cdhash_set_label_i(VALUE key, VALUE val, VALUE ptr)
 static inline VALUE
 get_ivar_ic_value(rb_iseq_t *iseq,ID id)
 {
-    VALUE val;
-    struct rb_id_table *tbl = ISEQ_COMPILE_DATA(iseq)->ivar_cache_table;
-    if (tbl) {
-        if (rb_id_table_lookup(tbl,id,&val)) {
-            return val;
-        }
-    }
-    else {
-        tbl = rb_id_table_create(1);
-        ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = tbl;
-    }
-    val = INT2FIX(ISEQ_BODY(iseq)->ivc_size++);
-    rb_id_table_insert(tbl,id,val);
-    return val;
+    return INT2FIX(ISEQ_BODY(iseq)->ivc_size++);
 }
 
 static inline VALUE
@@ -2472,9 +2488,23 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
                             generated_iseq[code_index + 1 + j] = (VALUE)ic;
                         }
                         break;
+                      case TS_IVC: /* inline ivar cache */
+                        {
+                            unsigned int ic_index = FIX2UINT(operands[j]);
+
+                            IVC cache = ((IVC)&body->is_entries[ic_index]);
+
+                            if (insn == BIN(setinstancevariable)) {
+                                cache->iv_set_name = SYM2ID(operands[j - 1]);
+                            }
+                            else {
+                                cache->iv_set_name = 0;
+                            }
+
+                            vm_ic_attr_index_initialize(cache, INVALID_SHAPE_ID);
+                        }
                       case TS_ISE: /* inline storage entry: `once` insn */
                       case TS_ICVARC: /* inline cvar cache */
-                      case TS_IVC: /* inline ivar cache */
                         {
                             unsigned int ic_index = FIX2UINT(operands[j]);
                             IC ic = &ISEQ_IS_ENTRY_START(body, type)[ic_index].ic_cache;
@@ -2630,9 +2660,11 @@ iseq_set_exception_table(rb_iseq_t *iseq)
     struct iseq_catch_table_entry *entry;
 
     ISEQ_BODY(iseq)->catch_table = NULL;
-    if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) return COMPILE_OK;
-    tlen = (int)RARRAY_LEN(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
-    tptr = RARRAY_CONST_PTR_TRANSIENT(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
+
+    VALUE catch_table_ary = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (NIL_P(catch_table_ary)) return COMPILE_OK;
+    tlen = (int)RARRAY_LEN(catch_table_ary);
+    tptr = RARRAY_CONST_PTR_TRANSIENT(catch_table_ary);
 
     if (tlen > 0) {
         struct iseq_catch_table *table = xmalloc(iseq_catch_table_bytes(tlen));
@@ -2668,6 +2700,8 @@ iseq_set_exception_table(rb_iseq_t *iseq)
         RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */
     }
 
+    RB_GC_GUARD(catch_table_ary);
+
     return COMPILE_OK;
 }
 
@@ -2806,7 +2840,6 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
                 break;
             }
             else if ((lab = find_destination((INSN *)i)) != 0) {
-                if (lab->unremovable) break;
                 unref_counts[lab->label_no]++;
             }
         }
@@ -2823,8 +2856,7 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
             /* do nothing */
         }
         else if (IS_ADJUST(i)) {
-            LABEL *dest = ((ADJUST *)i)->label;
-            if (dest && dest->unremovable) return 0;
+            return 0;
         }
         end = i;
     } while ((i = i->next) != 0);
@@ -4588,7 +4620,12 @@ compile_array_1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node)
     }
     else {
         CHECK(COMPILE_(ret, "array element", node, FALSE));
-        ADD_INSN1(ret, node, newarray, INT2FIX(1));
+        if (keyword_node_p(node)) {
+            ADD_INSN1(ret, node, newarraykwsplat, INT2FIX(1));
+        }
+        else {
+            ADD_INSN1(ret, node, newarray, INT2FIX(1));
+        }
     }
 
     return 1;
@@ -4829,7 +4866,7 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
         const NODE *val = vals->nd_head;
         VALUE lit = rb_node_case_when_optimizable_literal(val);
 
-        if (lit == Qundef) {
+        if (UNDEF_P(lit)) {
             only_special_literals = 0;
         }
         else if (NIL_P(rb_hash_lookup(literals, lit))) {
@@ -5039,12 +5076,17 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
 
         CHECK(COMPILE_POPPED(pre, "masgn lhs (NODE_ATTRASGN)", node));
 
+        bool safenav_call = false;
         LINK_ELEMENT *insn_element = LAST_ELEMENT(pre);
         iobj = (INSN *)get_prev_insn((INSN *)insn_element); /* send insn */
         ASSUME(iobj);
-        ELEM_REMOVE(LAST_ELEMENT(pre));
-        ELEM_REMOVE((LINK_ELEMENT *)iobj);
-        pre->last = iobj->link.prev;
+        ELEM_REMOVE(insn_element);
+        if (!IS_INSN_ID(iobj, send)) {
+            safenav_call = true;
+            iobj = (INSN *)get_prev_insn(iobj);
+            ELEM_INSERT_NEXT(&iobj->link, insn_element);
+        }
+        (pre->last = iobj->link.prev)->next = 0;
 
         const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, 0);
         int argc = vm_ci_argc(ci) + 1;
@@ -5063,7 +5105,9 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
             return COMPILE_NG;
         }
 
-        ADD_ELEM(lhs, (LINK_ELEMENT *)iobj);
+        iobj->link.prev = lhs->last;
+        lhs->last->next = &iobj->link;
+        for (lhs->last = &iobj->link; lhs->last->next; lhs->last = lhs->last->next);
         if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) {
             int argc = vm_ci_argc(ci);
             ci = ci_argc_set(iseq, ci, argc - 1);
@@ -5072,9 +5116,11 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
             INSERT_BEFORE_INSN1(iobj, line_node, newarray, INT2FIX(1));
             INSERT_BEFORE_INSN(iobj, line_node, concatarray);
         }
-        ADD_INSN(lhs, line_node, pop);
-        if (argc != 1) {
+        if (!safenav_call) {
             ADD_INSN(lhs, line_node, pop);
+            if (argc != 1) {
+                ADD_INSN(lhs, line_node, pop);
+            }
         }
         for (int i=0; i < argc; i++) {
             ADD_INSN(post, line_node, pop);
@@ -7403,7 +7449,7 @@ compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     ADD_LABEL(ret, end_label);
     ADD_ADJUST_RESTORE(ret, adjust_label);
 
-    if (node->nd_state == Qundef) {
+    if (UNDEF_P(node->nd_state)) {
         /* ADD_INSN(ret, line_node, putundef); */
         COMPILE_ERROR(ERROR_ARGS "unsupported: putundef");
         return COMPILE_NG;
@@ -7458,7 +7504,30 @@ compile_iter(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
                            ISEQ_TYPE_BLOCK, line);
         CHECK(COMPILE(ret, "iter caller", node->nd_iter));
     }
-    ADD_LABEL(ret, retry_end_l);
+
+    {
+        // We need to put the label "retry_end_l" immediately after the last "send" instruction.
+        // This because vm_throw checks if the break cont is equal to the index of next insn of the "send".
+        // (Otherwise, it is considered "break from proc-closure". See "TAG_BREAK" handling in "vm_throw_start".)
+        //
+        // Normally, "send" instruction is at the last.
+        // However, qcall under branch coverage measurement adds some instructions after the "send".
+        //
+        // Note that "invokesuper" appears instead of "send".
+        INSN *iobj;
+        LINK_ELEMENT *last_elem = LAST_ELEMENT(ret);
+        iobj = IS_INSN(last_elem) ? (INSN*) last_elem : (INSN*) get_prev_insn((INSN*) last_elem);
+        while (INSN_OF(iobj) != BIN(send) && INSN_OF(iobj) != BIN(invokesuper)) {
+            iobj = (INSN*) get_prev_insn(iobj);
+        }
+        ELEM_INSERT_NEXT(&iobj->link, (LINK_ELEMENT*) retry_end_l);
+
+        // LINK_ANCHOR has a pointer to the last element, but ELEM_INSERT_NEXT does not update it
+        // even if we add an insn to the last of LINK_ANCHOR. So this updates it manually.
+        if (&iobj->link == LAST_ELEMENT(ret)) {
+            ret->last = (LINK_ELEMENT*) retry_end_l;
+        }
+    }
 
     if (popped) {
         ADD_INSN(ret, line_node, pop);
@@ -7588,7 +7657,6 @@ compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
         add_ensure_iseq(ret, iseq, 0);
         ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
         ADD_ADJUST_RESTORE(ret, splabel);
-        splabel->unremovable = FALSE;
 
         if (!popped) {
             ADD_INSN(ret, line_node, putnil);
@@ -9253,7 +9321,8 @@ compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     /* optimization shortcut
      *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
      */
-    if (mid == idASET && !private_recv_p(node) && node->nd_args &&
+    if (!ISEQ_COMPILE_DATA(iseq)->in_masgn &&
+        mid == idASET && !private_recv_p(node) && node->nd_args &&
         nd_type_p(node->nd_args, NODE_LIST) && node->nd_args->nd_alen == 2 &&
         nd_type_p(node->nd_args->nd_head, NODE_STR) &&
         ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
@@ -9451,7 +9520,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       }
 
       case NODE_MASGN:{
+        bool prev_in_masgn = ISEQ_COMPILE_DATA(iseq)->in_masgn;
+        ISEQ_COMPILE_DATA(iseq)->in_masgn = true;
         compile_massign(iseq, ret, node, popped);
+        ISEQ_COMPILE_DATA(iseq)->in_masgn = prev_in_masgn;
         break;
       }
 
@@ -9693,7 +9765,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
       case NODE_LIT:{
         debugp_param("lit", node->nd_lit);
         if (!popped) {
-            ADD_INSN1(ret, node, putobject, node->nd_lit);
+            if (UNLIKELY(node->nd_lit == rb_mRubyVMFrozenCore)) {
+                ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); // [Bug #20569]
+            }
+            else {
+                ADD_INSN1(ret, node, putobject, node->nd_lit);
+            }
             RB_OBJ_WRITTEN(iseq, Qundef, node->nd_lit);
         }
         break;
@@ -10711,6 +10788,12 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
     return keyword;
 }
 
+static void
+iseq_insn_each_object_mark(VALUE *obj_ptr, VALUE _)
+{
+    rb_gc_mark(*obj_ptr);
+}
+
 void
 rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *storage)
 {
@@ -10737,29 +10820,7 @@ rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *storage)
             iobj = (INSN *)&storage->buff[pos];
 
             if (iobj->operands) {
-                int j;
-                const char *types = insn_op_types(iobj->insn_id);
-
-                for (j = 0; types[j]; j++) {
-                    char type = types[j];
-                    switch (type) {
-                      case TS_CDHASH:
-                      case TS_ISEQ:
-                      case TS_VALUE:
-                      case TS_IC: // constant path array
-                      case TS_CALLDATA: // ci is stored.
-                        {
-                            VALUE op = OPERAND_AT(iobj, j);
-
-                            if (!SPECIAL_CONST_P(op)) {
-                                rb_gc_mark(op);
-                            }
-                        }
-                        break;
-                      default:
-                        break;
-                    }
-                }
+                iseq_insn_each_markable_object(iobj, iseq_insn_each_object_mark, (VALUE)0);
             }
             pos += (int)size;
         }
@@ -11514,6 +11575,21 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
 
                     ISE ic = ISEQ_IS_ENTRY_START(load_body, operand_type) + op;
                     code[code_index] = (VALUE)ic;
+
+                    if (operand_type == TS_IVC) {
+                        IVC cache = (IVC)ic;
+
+                        if (insn == BIN(setinstancevariable)) {
+                            ID iv_name = (ID)code[code_index - 1];
+                            cache->iv_set_name = iv_name;
+                        }
+                        else {
+                            cache->iv_set_name = 0;
+                        }
+
+                        vm_ic_attr_index_initialize(cache, INVALID_SHAPE_ID);
+                    }
+
                 }
                 break;
               case TS_CALLDATA:
@@ -12161,6 +12237,40 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     const char catch_except_p = (char)ibf_load_small_value(load, &reading_pos);
     const bool builtin_inline_p = (bool)ibf_load_small_value(load, &reading_pos);
 
+    // setup fname and dummy frame
+    VALUE path = ibf_load_object(load, location_pathobj_index);
+    {
+        VALUE realpath = Qnil;
+
+        if (RB_TYPE_P(path, T_STRING)) {
+            realpath = path = rb_fstring(path);
+        }
+        else if (RB_TYPE_P(path, T_ARRAY)) {
+            VALUE pathobj = path;
+            if (RARRAY_LEN(pathobj) != 2) {
+                rb_raise(rb_eRuntimeError, "path object size mismatch");
+            }
+            path = rb_fstring(RARRAY_AREF(pathobj, 0));
+            realpath = RARRAY_AREF(pathobj, 1);
+            if (!NIL_P(realpath)) {
+                if (!RB_TYPE_P(realpath, T_STRING)) {
+                    rb_raise(rb_eArgError, "unexpected realpath %"PRIxVALUE
+                             "(%x), path=%+"PRIsVALUE,
+                             realpath, TYPE(realpath), path);
+                }
+                realpath = rb_fstring(realpath);
+            }
+        }
+        else {
+            rb_raise(rb_eRuntimeError, "unexpected path object");
+        }
+        rb_iseq_pathobj_set(iseq, path, realpath);
+    }
+
+    // push dummy frame
+    rb_execution_context_t *ec = GET_EC();
+    VALUE dummy_frame = rb_vm_push_frame_fname(ec, path);
+
 #undef IBF_BODY_OFFSET
 
     load_body->type = type;
@@ -12229,33 +12339,6 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load->current_buffer = &load->global_buffer;
 #endif
 
-    {
-        VALUE realpath = Qnil, path = ibf_load_object(load, location_pathobj_index);
-        if (RB_TYPE_P(path, T_STRING)) {
-            realpath = path = rb_fstring(path);
-        }
-        else if (RB_TYPE_P(path, T_ARRAY)) {
-            VALUE pathobj = path;
-            if (RARRAY_LEN(pathobj) != 2) {
-                rb_raise(rb_eRuntimeError, "path object size mismatch");
-            }
-            path = rb_fstring(RARRAY_AREF(pathobj, 0));
-            realpath = RARRAY_AREF(pathobj, 1);
-            if (!NIL_P(realpath)) {
-                if (!RB_TYPE_P(realpath, T_STRING)) {
-                    rb_raise(rb_eArgError, "unexpected realpath %"PRIxVALUE
-                             "(%x), path=%+"PRIsVALUE,
-                             realpath, TYPE(realpath), path);
-                }
-                realpath = rb_fstring(realpath);
-            }
-        }
-        else {
-            rb_raise(rb_eRuntimeError, "unexpected path object");
-        }
-        rb_iseq_pathobj_set(iseq, path, realpath);
-    }
-
     RB_OBJ_WRITE(iseq, &load_body->location.base_label,    ibf_load_location_str(load, location_base_label_index));
     RB_OBJ_WRITE(iseq, &load_body->location.label,         ibf_load_location_str(load, location_label_index));
 
@@ -12263,6 +12346,9 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load->current_buffer = saved_buffer;
 #endif
     verify_call_cache(iseq);
+
+    RB_GC_GUARD(dummy_frame);
+    rb_vm_pop_frame_no_int(ec);
 }
 
 struct ibf_dump_iseq_list_arg
@@ -13013,7 +13099,7 @@ ibf_dump_memsize(const void *ptr)
 static const rb_data_type_t ibf_dump_type = {
     "ibf_dump",
     {ibf_dump_mark, ibf_dump_free, ibf_dump_memsize,},
-    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void
diff --git a/complex.c b/complex.c
index 07e5914d54..a227cb0a58 100644
--- a/complex.c
+++ b/complex.c
@@ -421,15 +421,22 @@ f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
     return nucomp_s_new_internal(klass, x, y);
 }
 
-inline static void
+WARN_UNUSED_RESULT(inline static VALUE nucomp_real_check(VALUE num));
+inline static VALUE
 nucomp_real_check(VALUE num)
 {
     if (!RB_INTEGER_TYPE_P(num) &&
         !RB_FLOAT_TYPE_P(num) &&
         !RB_TYPE_P(num, T_RATIONAL)) {
+        if (RB_TYPE_P(num, T_COMPLEX) && nucomp_real_p(num)) {
+            VALUE real = RCOMPLEX(num)->real;
+            assert(!RB_TYPE_P(real, T_COMPLEX));
+            return real;
+        }
         if (!k_numeric_p(num) || !f_real_p(num))
             rb_raise(rb_eTypeError, "not a real");
     }
+    return num;
 }
 
 inline static VALUE
@@ -480,16 +487,16 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
 
     switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
       case 1:
-        nucomp_real_check(real);
+        real = nucomp_real_check(real);
         imag = ZERO;
         break;
       default:
-        nucomp_real_check(real);
-        nucomp_real_check(imag);
+        real = nucomp_real_check(real);
+        imag = nucomp_real_check(imag);
         break;
     }
 
-    return nucomp_s_canonicalize_internal(klass, real, imag);
+    return nucomp_s_new_internal(klass, real, imag);
 }
 
 inline static VALUE
@@ -554,7 +561,7 @@ nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
     if (!NIL_P(opts)) {
         raise = rb_opts_exception_p(opts, raise);
     }
-    if (argc > 0 && CLASS_OF(a1) == rb_cComplex && a2 == Qundef) {
+    if (argc > 0 && CLASS_OF(a1) == rb_cComplex && UNDEF_P(a2)) {
         return a1;
     }
     return nucomp_convert(rb_cComplex, a1, a2, raise);
@@ -611,16 +618,8 @@ m_sin(VALUE x)
 }
 
 static VALUE
-f_complex_polar(VALUE klass, VALUE x, VALUE y)
+f_complex_polar_real(VALUE klass, VALUE x, VALUE y)
 {
-    if (RB_TYPE_P(x, T_COMPLEX)) {
-        get_dat1(x);
-        x = dat->real;
-    }
-    if (RB_TYPE_P(y, T_COMPLEX)) {
-        get_dat1(y);
-        y = dat->real;
-    }
     if (f_zero_p(x) || f_zero_p(y)) {
         return nucomp_s_new_internal(klass, x, RFLOAT_0);
     }
@@ -656,6 +655,14 @@ f_complex_polar(VALUE klass, VALUE x, VALUE y)
                                           f_mul(x, m_sin(y)));
 }
 
+static VALUE
+f_complex_polar(VALUE klass, VALUE x, VALUE y)
+{
+    x = nucomp_real_check(x);
+    y = nucomp_real_check(y);
+    return f_complex_polar_real(klass, x, y);
+}
+
 #ifdef HAVE___COSPI
 # define cospi(x) __cospi(x)
 #else
@@ -704,16 +711,15 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
 {
     VALUE abs, arg;
 
-    switch (rb_scan_args(argc, argv, "11", &abs, &arg)) {
-      case 1:
-        nucomp_real_check(abs);
-        return nucomp_s_new_internal(klass, abs, ZERO);
-      default:
-        nucomp_real_check(abs);
-        nucomp_real_check(arg);
-        break;
+    argc = rb_scan_args(argc, argv, "11", &abs, &arg);
+    abs = nucomp_real_check(abs);
+    if (argc == 2) {
+        arg = nucomp_real_check(arg);
+    }
+    else {
+        arg = ZERO;
     }
-    return f_complex_polar(klass, abs, arg);
+    return f_complex_polar_real(klass, abs, arg);
 }
 
 /*
@@ -1745,9 +1751,9 @@ read_digits(const char **s, int strict,
 
     while (isdecimal(**s) || **s == '_') {
         if (**s == '_') {
-            if (strict) {
-                if (us)
-                    return 0;
+            if (us) {
+                if (strict) return 0;
+                break;
             }
             us = 1;
         }
@@ -2026,6 +2032,12 @@ string_to_c_strict(VALUE self, int raise)
  *    '1/2+3/4i'.to_c    #=> ((1/2)+(3/4)*i)
  *    'ruby'.to_c        #=> (0+0i)
  *
+ * Polar form:
+ *    include Math
+ *    "1.0@0".to_c        #=> (1+0.0i)
+ *    "1.0@#{PI/2}".to_c  #=> (0.0+1i)
+ *    "1.0@#{PI}".to_c    #=> (-1+0.0i)
+ *
  * See Kernel.Complex.
  */
 static VALUE
@@ -2095,17 +2107,20 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
     }
 
     if (RB_TYPE_P(a1, T_COMPLEX)) {
-        if (a2 == Qundef || (k_exact_zero_p(a2)))
+        if (UNDEF_P(a2) || (k_exact_zero_p(a2)))
             return a1;
     }
 
-    if (a2 == Qundef) {
+    if (UNDEF_P(a2)) {
         if (k_numeric_p(a1) && !f_real_p(a1))
             return a1;
         /* should raise exception for consistency */
         if (!k_numeric_p(a1)) {
-            if (!raise)
-                return rb_protect(to_complex, a1, NULL);
+            if (!raise) {
+                a1 = rb_protect(to_complex, a1, NULL);
+                rb_set_errinfo(Qnil);
+                return a1;
+            }
             return to_complex(a1);
         }
     }
@@ -2121,7 +2136,7 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
         int argc;
         VALUE argv2[2];
         argv2[0] = a1;
-        if (a2 == Qundef) {
+        if (UNDEF_P(a2)) {
             argv2[1] = Qnil;
             argc = 1;
         }
@@ -2149,31 +2164,6 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    num.real  ->  self
- *
- * Returns self.
- */
-static VALUE
-numeric_real(VALUE self)
-{
-    return self;
-}
-
-/*
- * call-seq:
- *    num.imag       ->  0
- *    num.imaginary  ->  0
- *
- * Returns zero.
- */
-static VALUE
-numeric_imag(VALUE self)
-{
-    return INT2FIX(0);
-}
-
-/*
- * call-seq:
  *    num.abs2  ->  real
  *
  * Returns square of self.
@@ -2245,19 +2235,6 @@ numeric_polar(VALUE self)
 
 /*
  * call-seq:
- *    num.conj       ->  self
- *    num.conjugate  ->  self
- *
- * Returns self.
- */
-static VALUE
-numeric_conj(VALUE self)
-{
-    return self;
-}
-
-/*
- * call-seq:
  *    flo.arg    ->  0 or float
  *    flo.angle  ->  0 or float
  *    flo.phase  ->  0 or float
@@ -2421,9 +2398,6 @@ Init_Complex(void)
 
     rb_define_private_method(CLASS_OF(rb_cComplex), "convert", nucomp_s_convert, -1);
 
-    rb_define_method(rb_cNumeric, "real", numeric_real, 0);
-    rb_define_method(rb_cNumeric, "imaginary", numeric_imag, 0);
-    rb_define_method(rb_cNumeric, "imag", numeric_imag, 0);
     rb_define_method(rb_cNumeric, "abs2", numeric_abs2, 0);
     rb_define_method(rb_cNumeric, "arg", numeric_arg, 0);
     rb_define_method(rb_cNumeric, "angle", numeric_arg, 0);
@@ -2431,8 +2405,6 @@ Init_Complex(void)
     rb_define_method(rb_cNumeric, "rectangular", numeric_rect, 0);
     rb_define_method(rb_cNumeric, "rect", numeric_rect, 0);
     rb_define_method(rb_cNumeric, "polar", numeric_polar, 0);
-    rb_define_method(rb_cNumeric, "conjugate", numeric_conj, 0);
-    rb_define_method(rb_cNumeric, "conj", numeric_conj, 0);
 
     rb_define_method(rb_cFloat, "arg", float_arg, 0);
     rb_define_method(rb_cFloat, "angle", float_arg, 0);
diff --git a/configure.ac b/configure.ac
index d20d70b8d1..220392d120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ AC_ARG_WITH(baseruby,
 	[
 		AC_PATH_PROG([BASERUBY], [ruby], [false])
 	])
+# BASERUBY must be >= 2.2.0. Note that `"2.2.0" > "2.2"` is true.
 AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.2"' 2>/dev/null`" = 42], [
     AS_CASE(["$build_os"], [mingw*], [
         # Can MSys shell run a command with a drive letter?
@@ -132,9 +133,12 @@ AC_CANONICAL_TARGET
 AS_CASE(["$target_cpu-$target_os"],
     [aarch64-darwin*], [
         target_cpu=arm64
-        AS_CASE(["$target_vendor"], [unknown], [target_vendor=apple target=${target/-unknown-/-apple-}])
-        target="${target/aarch64/arm64}"
-        target_alias="${target_alias/aarch64/arm64}"
+        AS_CASE(["$target_vendor"], [unknown], [
+            target_vendor=apple
+            target=${target%%-unknown-*}-apple-${target@%:@*-unknown-}
+        ])
+        target="arm64-${target@%:@aarch64-}"
+        AS_IF([test -n "$target_alias"], [target_alias="arm64-${target_alias@%:@aarch64-}"])
     ])
 
 AC_ARG_PROGRAM
@@ -210,15 +214,23 @@ AS_CASE(["/${rb_CC} "],
 [*clang*],            [
     # Ditto for LLVM.  Note however that llvm-as is a LLVM-IR to LLVM bitcode
     # assembler that does not target your machine native binary.
-    : ${LD:="${CC}"}         # ... try -fuse-ld=lld ?
-    RUBY_CHECK_PROG_FOR_CC([AR],      [s/clang/llvm-ar/])
-#   RUBY_CHECK_PROG_FOR_CC([AS],      [s/clang/llvm-as/])
+
+    # Xcode has its own version tools that may be incompatible with
+    # genuine LLVM tools, use the tools in the same directory.
+
+    AS_IF([$rb_CC -E -dM -xc - < /dev/null | grep -F __apple_build_version__ > /dev/null],
+          [llvm_prefix=], [llvm_prefix=llvm-])
+    # AC_PREPROC_IFELSE cannot be used before AC_USE_SYSTEM_EXTENSIONS
+
+    RUBY_CHECK_PROG_FOR_CC([LD],      [s/clang/ld/]) # ... maybe try lld ?
+    RUBY_CHECK_PROG_FOR_CC([AR],      [s/clang/${llvm_prefix}ar/])
+#   RUBY_CHECK_PROG_FOR_CC([AS],      [s/clang/${llvm_prefix}as/])
     RUBY_CHECK_PROG_FOR_CC([CXX],     [s/clang/clang++/])
-    RUBY_CHECK_PROG_FOR_CC([NM],      [s/clang/llvm-nm/])
-    RUBY_CHECK_PROG_FOR_CC([OBJCOPY], [s/clang/llvm-objcopy/])
-    RUBY_CHECK_PROG_FOR_CC([OBJDUMP], [s/clang/llvm-objdump/])
-    RUBY_CHECK_PROG_FOR_CC([RANLIB],  [s/clang/llvm-ranlib/])
-    RUBY_CHECK_PROG_FOR_CC([STRIP],   [s/clang/llvm-strip/])
+    RUBY_CHECK_PROG_FOR_CC([NM],      [s/clang/${llvm_prefix}nm/])
+    RUBY_CHECK_PROG_FOR_CC([OBJCOPY], [s/clang/${llvm_prefix}objcopy/])
+    RUBY_CHECK_PROG_FOR_CC([OBJDUMP], [s/clang/${llvm_prefix}objdump/])
+    RUBY_CHECK_PROG_FOR_CC([RANLIB],  [s/clang/${llvm_prefix}ranlib/])
+    RUBY_CHECK_PROG_FOR_CC([STRIP],   [s/clang/${llvm_prefix}strip/])
 ])
 AS_UNSET(rb_CC)
 AS_UNSET(rb_dummy)
@@ -362,12 +374,6 @@ AS_CASE(["$target_os"],
 	[AC_MSG_RESULT(yes)],
 	[AC_MSG_RESULT(no)
 	AC_MSG_ERROR([Unsupported OS X version is required])])
-    AC_CACHE_CHECK([if thread-local storage is supported], [rb_cv_tls_supported],
-	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[int __thread conftest;]])],
-	    [rb_cv_tls_supported=yes],
-	    [rb_cv_tls_supported=no])])
-    AS_IF([test x"$rb_cv_tls_supported" != xyes],
-	[AC_DEFINE(RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED)])
 ])
 
 RUBY_MINGW32
@@ -387,6 +393,13 @@ AS_IF([test "$GCC" = yes], [
     AS_IF([test "$gcc_major" -lt 4], [
         AC_MSG_ERROR([too old GCC: $gcc_major.$gcc_minor])
     ])
+
+    AC_CACHE_CHECK([if thread-local storage is supported], [rb_cv_tls_supported],
+        [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int __thread conftest;]])],
+            [rb_cv_tls_supported=yes],
+            [rb_cv_tls_supported=no])])
+    AS_IF([test x"$rb_cv_tls_supported" != xyes],
+        [AC_DEFINE(RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED)])
 ], [
     linker_flag=
 ])
@@ -520,7 +533,9 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
 AC_CHECK_PROGS(DOT, dot)
 AC_CHECK_PROGS(DOXYGEN, doxygen)
 
+tool_warned=$ac_tool_warned ac_tool_warned=no
 AC_CHECK_TOOL(PKG_CONFIG, pkg-config)
+ac_tool_warned=$tool_warned
 AS_IF([test -z "$PKG_CONFIG"], [],
 ["$PKG_CONFIG" --print-errors --version > /dev/null 2>&1], [],
 [
@@ -785,7 +800,8 @@ AS_IF([test "$GCC" = yes], [
 				 [disable -D_FORTIFY_SOURCE=2 option, which causes link error on mingw]),
 		  [fortify_source=$enableval])
     AS_IF([test "x$fortify_source" != xno], [
-        RUBY_TRY_CFLAGS([$optflags -D_FORTIFY_SOURCE=2], [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)], [],
+        RUBY_TRY_CFLAGS([$optflags -D_FORTIFY_SOURCE=2],
+                        [RUBY_APPEND_OPTION(XCFLAGS, -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2)], [],
                         [@%:@include <stdio.h>])
     ])
 
@@ -793,7 +809,7 @@ AS_IF([test "$GCC" = yes], [
 
     # -fstack-protector
     AS_CASE(["$target_os"],
-    [mingw*|emscripten*|wasi*], [
+    [emscripten*|wasi*], [
 	stack_protector=no
     ])
     AS_IF([test -z "${stack_protector+set}"], [
@@ -805,6 +821,8 @@ AS_IF([test "$GCC" = yes], [
 	    AS_IF([test "x$stack_protector" = xyes], [stack_protector=option; break])
 	])
     ])
+    AC_MSG_CHECKING([for -fstack-protector])
+    AC_MSG_RESULT(["$stack_protector"])
     AS_CASE(["$stack_protector"], [-*], [
 	RUBY_APPEND_OPTION(XCFLAGS, $stack_protector)
 	RUBY_APPEND_OPTION(XLDFLAGS, $stack_protector)
@@ -957,9 +975,10 @@ AS_IF([test "x$OPT_DIR" != x], [
     LDFLAGS="${LDFLAGS:+$LDFLAGS }$val"
     DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }$val"
     LDFLAGS_OPTDIR="$val"
-    CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }"`echo "$OPT_DIR" | tr "${PATH_SEPARATOR}" '\012' |
+    INCFLAGS="${INCFLAGS:+$INCFLAGS }"`echo "$OPT_DIR" | tr "${PATH_SEPARATOR}" '\012' |
         sed '/^$/d;s|^|-I|;s|$|/include|' | tr '\012' ' ' | sed 's/ *$//'`
 ])
+AC_SUBST(incflags, "$INCFLAGS")
 
 test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
 test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
@@ -1184,8 +1203,6 @@ main()
 		ac_cv_func_gmtime_r=yes
 		rb_cv_large_fd_select=yes
 		ac_cv_type_struct_timeval=yes
-                ac_cv_func_clock_gettime=yes
-                ac_cv_func_clock_getres=yes
 		ac_cv_func_malloc_usable_size=no
 		ac_cv_type_off_t=yes
 		ac_cv_sizeof_off_t=8
@@ -1280,6 +1297,11 @@ dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
 AC_HEADER_STDBOOL
 AC_HEADER_SYS_WAIT
 
+AC_CHECK_HEADERS([afunix.h], [], [],
+[#ifdef _WIN32
+# include <winsock2.h>
+#endif
+])
 AC_CHECK_HEADERS(atomic.h)
 AC_CHECK_HEADERS(copyfile.h)
 AC_CHECK_HEADERS(direct.h)
@@ -1326,6 +1348,8 @@ AC_CHECK_HEADERS(syscall.h)
 AC_CHECK_HEADERS(time.h)
 AC_CHECK_HEADERS(ucontext.h)
 AC_CHECK_HEADERS(utime.h)
+AC_CHECK_HEADERS(stdatomic.h)
+
 AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
   AC_CHECK_HEADERS(x86intrin.h)
 ])
@@ -1342,6 +1366,8 @@ AC_ARG_WITH([jemalloc],
   [with_jemalloc=$withval], [with_jemalloc=no])
 AS_IF([test "x$with_jemalloc" != xno],[
   # find jemalloc header first
+  save_CPPFLAGS="${CPPFLAGS}"
+  CPPFLAGS="${INCFLAGS} ${CPPFLAGS}"
   malloc_header=
   AC_CHECK_HEADER(jemalloc/jemalloc.h, [malloc_header=jemalloc/jemalloc.h], [
     AC_CHECK_HEADER(jemalloc.h, [malloc_header=jemalloc.h])
@@ -1373,6 +1399,8 @@ AS_IF([test "x$with_jemalloc" != xno],[
       done
     done
   ])
+  CPPFLAGS="${save_CPPFLAGS}"
+  unset save_CPPFLAGS
   with_jemalloc=${rb_cv_jemalloc_library}
   AS_CASE(["$with_jemalloc"],
   [no],
@@ -1902,8 +1930,8 @@ AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
 [universal-darwin*:*ppc*], [
   AC_LIBSOURCES(alloca.c)
   AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
-  RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
-  RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
+  RUBY_DEFINE_IF([defined __POWERPC__], C_ALLOCA, 1) # Darwin defines __POWERPC__ for ppc and ppc64 both
+  RUBY_DEFINE_IF([defined __POWERPC__], alloca, alloca)
   ],
 [
   AC_FUNC_ALLOCA
@@ -1983,6 +2011,7 @@ AC_CHECK_FUNCS(_longjmp)		# used for AC_ARG_WITH(setjmp-type)
 test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
 AC_CHECK_FUNCS(arc4random_buf)
 AC_CHECK_FUNCS(atan2l atan2f)
+AC_CHECK_DECLS(atomic_signal_fence, [], [], [#include <stdatomic.h>])
 AC_CHECK_FUNCS(chmod)
 AC_CHECK_FUNCS(chown)
 AC_CHECK_FUNCS(chroot)
@@ -2573,10 +2602,13 @@ AS_CASE([$coroutine_type], [yes|''], [
         [arm64-darwin*], [
             coroutine_type=arm64
         ],
-        [powerpc-darwin*], [
+        # Correct target name is powerpc*-, but Ruby seems to prefer ppc*-.
+        # Notice that Darwin PPC ABI differs from AIX and ELF.
+        # Adding PPC targets for AIX, *BSD and *Linux will require separate implementations.
+        [powerpc-darwin*|ppc-darwin*], [
             coroutine_type=ppc
         ],
-        [powerpc64-darwin*], [
+        [powerpc64-darwin*|ppc64-darwin*], [
             coroutine_type=ppc64
         ],
         [x*64-linux*], [
@@ -2958,6 +2990,23 @@ STATIC=
   ])
 }
 
+EXTSTATIC=
+AC_SUBST(EXTSTATIC)dnl
+AC_ARG_WITH(static-linked-ext,
+	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
+            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
+AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
+  ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
+  EXTOBJS='ext/extinit.$(OBJEXT)'
+  AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
+  AC_SUBST(ENCSTATIC, static)
+], [
+  ENCOBJS='dmyenc.$(OBJEXT)'
+  EXTOBJS='dmyext.$(OBJEXT)'
+])
+AC_SUBST(ENCOBJS)
+AC_SUBST(EXTOBJS)
+
 : "rpath" && {
     AS_CASE(["$target_os"],
 	[solaris*], [	AS_IF([test "$GCC" = yes], [
@@ -3017,7 +3066,7 @@ STATIC=
 	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
 			: ${DLDSHARED='$(CC) -dynamiclib'}
 			: ${LDFLAGS=""}
-			: ${LIBPATHENV=DYLD_FALLBACK_LIBRARY_PATH}
+			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
 			: ${PRELOADENV=DYLD_INSERT_LIBRARIES}
                         AS_IF([test x"$enable_shared" = xyes], [
                             # Resolve symbols from libruby.dylib when --enable-shared
@@ -3070,12 +3119,12 @@ AS_IF([test "$rb_cv_dlopen" = yes], [
 	  "-undefined dynamic_lookup" \
 	  ; do
             test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
-            RUBY_TRY_LDFLAGS([$flag], [], [$flag=])
+            RUBY_TRY_LDFLAGS([$flag], [], [flag=])
             AS_IF([test x"$flag" = x], [continue])
 
             AC_MSG_CHECKING([whether $flag is accepted for bundle])
             : > conftest.c
-            AS_IF([${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
+            AS_IF([${LDSHARED%%'$(CC)'*}$CC${LDSHARED@%:@*'$(CC)'} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
                 test ! -s conftest.err], [
                 AC_MSG_RESULT([yes])
                 RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
@@ -3262,23 +3311,6 @@ AC_ARG_WITH(ext,
 AC_ARG_WITH(out-ext,
             AS_HELP_STRING([--with-out-ext=EXTS],
                            [pass to --without-ext option of extmk.rb]))
-EXTSTATIC=
-AC_SUBST(EXTSTATIC)dnl
-AC_ARG_WITH(static-linked-ext,
-	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
-            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
-AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
-  ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
-  EXTOBJS='ext/extinit.$(OBJEXT)'
-  AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
-  AC_SUBST(ENCSTATIC, static)
-], [
-  ENCOBJS='dmyenc.$(OBJEXT)'
-  EXTOBJS='dmyext.$(OBJEXT)'
-])
-AC_SUBST(ENCOBJS)
-AC_SUBST(EXTOBJS)
-
 AC_ARG_WITH(setup,
 	    AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]),
 	    [setup=$withval])
@@ -3337,6 +3369,10 @@ AS_IF([test x"$cross_compiling" = xyes], [
   AC_SUBST(XRUBY_RUBYLIBDIR)
   AC_SUBST(XRUBY_RUBYHDRDIR)
   PREP='$(arch)-fake.rb'
+  AS_CASE(["$enable_shared:$EXTSTATIC:$target_os"], [no::darwin*], [
+    # darwin target requires miniruby for linking ext bundles
+    PREP="$PREP"' miniruby$(EXEEXT)'
+  ])
   RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
   RUNRUBY='$(RUNRUBY_COMMAND)'
   XRUBY='$(MINIRUBY)'
@@ -3727,10 +3763,58 @@ AS_IF([test x"$MJIT_SUPPORT" = "xyes"],
 
 AC_SUBST(MJIT_SUPPORT)
 
+AC_CHECK_PROG(RUSTC, [rustc], [rustc], [no]) dnl no ac_tool_prefix
+
+dnl check if rustc is recent enough to build YJIT (rustc >= 1.58.0)
+YJIT_RUSTC_OK=no
+AS_IF([test "$RUSTC" != "no"],
+    AC_MSG_CHECKING([whether ${RUSTC} works for YJIT])
+    YJIT_TARGET_ARCH=
+    AS_CASE(["$target_cpu"],
+        [arm64|aarch64], [YJIT_TARGET_ARCH=aarch64],
+        [x86_64], [YJIT_TARGET_ARCH=x86_64],
+    )
+    dnl Fails in case rustc target doesn't match ruby target.
+    dnl Can happen on Rosetta, for example.
+    AS_IF([echo "#[cfg(target_arch = \"$YJIT_TARGET_ARCH\")] fn main() { let x = 1; format!(\"{x}\"); }" |
+            $RUSTC - --emit asm=/dev/null 2>/dev/null],
+        [YJIT_RUSTC_OK=yes]
+    )
+    AC_MSG_RESULT($YJIT_RUSTC_OK)
+)
+
+dnl check if we can build YJIT on this target platform
+dnl we can't easily cross-compile with rustc so we don't support that
+YJIT_TARGET_OK=no
+AS_IF([test "$cross_compiling" = no],
+    AS_CASE(["$target_cpu-$target_os"],
+        [*android*], [
+            YJIT_TARGET_OK=no
+        ],
+        [arm64-darwin*|aarch64-darwin*|x86_64-darwin*], [
+            YJIT_TARGET_OK=yes
+        ],
+        [arm64-*linux*|aarch64-*linux*|x86_64-*linux*], [
+            YJIT_TARGET_OK=yes
+        ],
+        [arm64-*bsd*|aarch64-*bsd*|x86_64-*bsd*], [
+            YJIT_TARGET_OK=yes
+        ]
+    )
+)
+
+dnl build YJIT in release mode if rustc >= 1.58.0 is present and we are on a supported platform
 AC_ARG_ENABLE(yjit,
-        AS_HELP_STRING([--enable-yjit],
-        [enable experimental in-process JIT compiler that requires Rust build tools [default=no]]),
-        [YJIT_SUPPORT=$enableval], [YJIT_SUPPORT=no])
+    AS_HELP_STRING([--enable-yjit],
+    [enable in-process JIT compiler that requires Rust build tools. enabled by default on supported platforms if rustc 1.58.0+ is available]),
+    [YJIT_SUPPORT=$enableval],
+    [AS_CASE(["$enable_jit_support:$YJIT_TARGET_OK:$YJIT_RUSTC_OK"],
+        [yes:yes:yes|:yes:yes], [
+            YJIT_SUPPORT=yes
+        ],
+        [YJIT_SUPPORT=no]
+    )]
+)
 
 CARGO=
 CARGO_BUILD_ARGS=
@@ -3740,7 +3824,6 @@ AS_CASE(["${YJIT_SUPPORT}"],
     AS_IF([test x"$enable_jit_support" = "xno"],
         AC_MSG_ERROR([--disable-jit-support but --enable-yjit. YJIT requires JIT support])
     )
-    AC_CHECK_TOOL(RUSTC, [rustc], [no])
     AS_IF([test x"$RUSTC" = "xno"],
         AC_MSG_ERROR([rustc is required. Installation instructions available at https://www.rust-lang.org/tools/install])
     )
@@ -3751,16 +3834,17 @@ AS_CASE(["${YJIT_SUPPORT}"],
     ],
     [dev], [
 	rb_rust_target_subdir=debug
-	CARGO_BUILD_ARGS='--features stats,disasm,asm_comments'
+	CARGO_BUILD_ARGS='--features stats,disasm'
 	AC_DEFINE(RUBY_DEBUG, 1)
     ],
     [dev_nodebug], [
 	rb_rust_target_subdir=dev_nodebug
-	CARGO_BUILD_ARGS='--profile dev_nodebug --features stats,disasm,asm_comments'
+	CARGO_BUILD_ARGS='--profile dev_nodebug --features stats,disasm'
     ],
     [stats], [
 	rb_rust_target_subdir=stats
 	CARGO_BUILD_ARGS='--profile stats --features stats'
+	AC_DEFINE(YJIT_STATS, 1)
     ])
 
     AS_IF([test -n "${CARGO_BUILD_ARGS}"], [
@@ -3775,10 +3859,12 @@ AS_CASE(["${YJIT_SUPPORT}"],
         LDFLAGS="$LDFLAGS -lpthread -lc++abi"
     ])
     YJIT_OBJ='yjit.$(OBJEXT)'
+    AS_IF([test x"$YJIT_SUPPORT" != "xyes" ], [
+        AC_DEFINE_UNQUOTED(YJIT_SUPPORT, [$YJIT_SUPPORT])
+    ])
     AC_DEFINE(USE_YJIT, 1)
 ], [AC_DEFINE(USE_YJIT, 0)])
 
-
 dnl These variables end up in ::RbConfig::CONFIG
 AC_SUBST(YJIT_SUPPORT)dnl what flavor of YJIT the Ruby build includes
 AC_SUBST(RUSTC)dnl Rust compiler command
diff --git a/cont.c b/cont.c
index 499e1e7910..5375d1945b 100644
--- a/cont.c
+++ b/cont.c
@@ -29,12 +29,15 @@ extern int madvise(caddr_t, size_t, int);
 #include "gc.h"
 #include "internal.h"
 #include "internal/cont.h"
+#include "internal/error.h"
 #include "internal/proc.h"
 #include "internal/sanitizers.h"
 #include "internal/warnings.h"
 #include "ruby/fiber/scheduler.h"
 #include "mjit.h"
+#include "yjit.h"
 #include "vm_core.h"
+#include "vm_sync.h"
 #include "id_table.h"
 #include "ractor_core.h"
 
@@ -67,6 +70,8 @@ static VALUE rb_cFiberPool;
 #define FIBER_POOL_ALLOCATION_FREE
 #endif
 
+#define jit_cont_enabled (mjit_enabled || rb_yjit_enabled_p())
+
 enum context_type {
     CONTINUATION_CONTEXT = 0,
     FIBER_CONTEXT = 1
@@ -195,6 +200,15 @@ struct fiber_pool {
     size_t vm_stack_size;
 };
 
+// Continuation contexts used by JITs
+struct rb_jit_cont {
+    rb_execution_context_t *ec; // continuation ec
+    struct rb_jit_cont *prev, *next; // used to form lists
+};
+
+// Doubly linked list for enumerating all on-stack ISEQs.
+static struct rb_jit_cont *first_jit_cont;
+
 typedef struct rb_context_struct {
     enum context_type type;
     int argc;
@@ -212,8 +226,7 @@ typedef struct rb_context_struct {
     rb_execution_context_t saved_ec;
     rb_jmpbuf_t jmpbuf;
     rb_ensure_entry_t *ensure_array;
-    /* Pointer to MJIT info about the continuation.  */
-    struct mjit_cont *mjit_cont;
+    struct rb_jit_cont *jit_cont; // Continuation contexts for JITs
 } rb_context_t;
 
 
@@ -259,7 +272,7 @@ struct rb_fiber_struct {
 
 static struct fiber_pool shared_fiber_pool = {NULL, NULL, 0, 0, 0, 0};
 
-static ID fiber_initialize_keywords[2] = {0};
+static ID fiber_initialize_keywords[3] = {0};
 
 /*
  * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
@@ -681,21 +694,36 @@ fiber_pool_stack_free(struct fiber_pool_stack * stack)
 
     if (DEBUG) fprintf(stderr, "fiber_pool_stack_free: %p+%"PRIuSIZE" [base=%p, size=%"PRIuSIZE"]\n", base, size, stack->base, stack->size);
 
-#if VM_CHECK_MODE > 0 && defined(MADV_DONTNEED)
+    // The pages being used by the stack can be returned back to the system.
+    // That doesn't change the page mapping, but it does allow the system to
+    // reclaim the physical memory.
+    // Since we no longer care about the data itself, we don't need to page
+    // out to disk, since that is costly. Not all systems support that, so
+    // we try our best to select the most efficient implementation.
+    // In addition, it's actually slightly desirable to not do anything here,
+    // but that results in higher memory usage.
+
+#ifdef __wasi__
+    // WebAssembly doesn't support madvise, so we just don't do anything.
+#elif VM_CHECK_MODE > 0 && defined(MADV_DONTNEED)
     // This immediately discards the pages and the memory is reset to zero.
     madvise(base, size, MADV_DONTNEED);
-#elif defined(POSIX_MADV_DONTNEED)
-    posix_madvise(base, size, POSIX_MADV_DONTNEED);
 #elif defined(MADV_FREE_REUSABLE)
+    // Darwin / macOS / iOS.
     // Acknowledge the kernel down to the task info api we make this
     // page reusable for future use.
     // As for MADV_FREE_REUSE below we ensure in the rare occasions the task was not
     // completed at the time of the call to re-iterate.
     while (madvise(base, size, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN);
 #elif defined(MADV_FREE)
+    // Recent Linux.
     madvise(base, size, MADV_FREE);
 #elif defined(MADV_DONTNEED)
+    // Old Linux.
     madvise(base, size, MADV_DONTNEED);
+#elif defined(POSIX_MADV_DONTNEED)
+    // Solaris?
+    posix_madvise(base, size, POSIX_MADV_DONTNEED);
 #elif defined(_WIN32)
     VirtualAlloc(base, size, MEM_RESET, PAGE_READWRITE);
     // Not available in all versions of Windows.
@@ -1000,6 +1028,8 @@ fiber_is_root_p(const rb_fiber_t *fiber)
 }
 #endif
 
+static void jit_cont_free(struct rb_jit_cont *cont);
+
 static void
 cont_free(void *ptr)
 {
@@ -1020,9 +1050,9 @@ cont_free(void *ptr)
 
     RUBY_FREE_UNLESS_NULL(cont->saved_vm_stack.ptr);
 
-    if (mjit_enabled) {
-        VM_ASSERT(cont->mjit_cont != NULL);
-        mjit_cont_free(cont->mjit_cont);
+    if (jit_cont_enabled) {
+        VM_ASSERT(cont->jit_cont != NULL);
+        jit_cont_free(cont->jit_cont);
     }
     /* free rb_cont_t or rb_fiber_t */
     ruby_xfree(ptr);
@@ -1127,7 +1157,9 @@ fiber_memsize(const void *ptr)
      */
     if (saved_ec->local_storage && fiber != th->root_fiber) {
         size += rb_id_table_memsize(saved_ec->local_storage);
+        size += rb_obj_memsize_of(saved_ec->storage);
     }
+
     size += cont_memsize(&fiber->cont);
     return size;
 }
@@ -1187,12 +1219,103 @@ cont_save_thread(rb_context_t *cont, rb_thread_t *th)
     sec->machine.stack_end = NULL;
 }
 
+static rb_nativethread_lock_t jit_cont_lock;
+
+// Register a new continuation with execution context `ec`. Return JIT info about
+// the continuation.
+static struct rb_jit_cont *
+jit_cont_new(rb_execution_context_t *ec)
+{
+    struct rb_jit_cont *cont;
+
+    // We need to use calloc instead of something like ZALLOC to avoid triggering GC here.
+    // When this function is called from rb_thread_alloc through rb_threadptr_root_fiber_setup,
+    // the thread is still being prepared and marking it causes SEGV.
+    cont = calloc(1, sizeof(struct rb_jit_cont));
+    if (cont == NULL)
+        rb_memerror();
+    cont->ec = ec;
+
+    rb_native_mutex_lock(&jit_cont_lock);
+    if (first_jit_cont == NULL) {
+        cont->next = cont->prev = NULL;
+    }
+    else {
+        cont->prev = NULL;
+        cont->next = first_jit_cont;
+        first_jit_cont->prev = cont;
+    }
+    first_jit_cont = cont;
+    rb_native_mutex_unlock(&jit_cont_lock);
+
+    return cont;
+}
+
+// Unregister continuation `cont`.
 static void
-cont_init_mjit_cont(rb_context_t *cont)
+jit_cont_free(struct rb_jit_cont *cont)
 {
-    VM_ASSERT(cont->mjit_cont == NULL);
-    if (mjit_enabled) {
-        cont->mjit_cont = mjit_cont_new(&(cont->saved_ec));
+    if (!cont) return;
+
+    rb_native_mutex_lock(&jit_cont_lock);
+    if (cont == first_jit_cont) {
+        first_jit_cont = cont->next;
+        if (first_jit_cont != NULL)
+            first_jit_cont->prev = NULL;
+    }
+    else {
+        cont->prev->next = cont->next;
+        if (cont->next != NULL)
+            cont->next->prev = cont->prev;
+    }
+    rb_native_mutex_unlock(&jit_cont_lock);
+
+    free(cont);
+}
+
+// Call a given callback against all on-stack ISEQs.
+void
+rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data)
+{
+    struct rb_jit_cont *cont;
+    for (cont = first_jit_cont; cont != NULL; cont = cont->next) {
+        if (cont->ec->vm_stack == NULL)
+            continue;
+
+        const rb_control_frame_t *cfp;
+        for (cfp = RUBY_VM_END_CONTROL_FRAME(cont->ec) - 1; ; cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp)) {
+            const rb_iseq_t *iseq;
+            if (cfp->pc && (iseq = cfp->iseq) != NULL && imemo_type((VALUE)iseq) == imemo_iseq) {
+                callback(iseq, data);
+            }
+
+            if (cfp == cont->ec->cfp)
+                break; // reached the most recent cfp
+        }
+    }
+}
+
+// Finish working with jit_cont.
+void
+rb_jit_cont_finish(void)
+{
+    if (!jit_cont_enabled)
+        return;
+
+    struct rb_jit_cont *cont, *next;
+    for (cont = first_jit_cont; cont != NULL; cont = next) {
+        next = cont->next;
+        free(cont); // Don't use xfree because it's allocated by calloc.
+    }
+    rb_native_mutex_destroy(&jit_cont_lock);
+}
+
+static void
+cont_init_jit_cont(rb_context_t *cont)
+{
+    VM_ASSERT(cont->jit_cont == NULL);
+    if (jit_cont_enabled) {
+        cont->jit_cont = jit_cont_new(&(cont->saved_ec));
     }
 }
 
@@ -1211,7 +1334,7 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
     cont->saved_ec.local_storage = NULL;
     cont->saved_ec.local_storage_recursive_hash = Qnil;
     cont->saved_ec.local_storage_recursive_hash_for_trace = Qnil;
-    cont_init_mjit_cont(cont);
+    cont_init_jit_cont(cont);
 }
 
 static rb_context_t *
@@ -1240,11 +1363,15 @@ rb_fiberptr_blocking(struct rb_fiber_struct *fiber)
     return fiber->blocking;
 }
 
-// This is used for root_fiber because other fibers call cont_init_mjit_cont through cont_new.
+// Start working with jit_cont.
 void
-rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber)
+rb_jit_cont_init(void)
 {
-    cont_init_mjit_cont(&fiber->cont);
+    if (!jit_cont_enabled)
+        return;
+
+    rb_native_mutex_initialize(&jit_cont_lock);
+    cont_init_jit_cont(&GET_EC()->fiber_ptr->cont);
 }
 
 #if 0
@@ -1454,7 +1581,7 @@ cont_restore_1(rb_context_t *cont)
     cont_restore_thread(cont);
 
     /* restore machine stack */
-#ifdef _M_AMD64
+#if defined(_M_AMD64) && !defined(__MINGW64__)
     {
         /* workaround for x64 SEH */
         jmp_buf buf;
@@ -1709,7 +1836,7 @@ rollback_ensure_stack(VALUE self,rb_ensure_list_t *current,rb_ensure_entry_t *ta
     /* push ensure stack */
     for (j = 0; j < i; j++) {
         func = lookup_rollback_func(target[i - j - 1].e_proc);
-        if ((VALUE)func != Qundef) {
+        if (!UNDEF_P((VALUE)func)) {
             (*func)(target[i - j - 1].data2);
         }
     }
@@ -1834,7 +1961,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *  the current thread, blocking and non-blocking fibers' behavior is identical.
  *
  *  Ruby doesn't provide a scheduler class: it is expected to be implemented by
- *  the user and correspond to Fiber::SchedulerInterface.
+ *  the user and correspond to Fiber::Scheduler.
  *
  *  There is also Fiber.schedule method, which is expected to immediately perform
  *  the given block in a non-blocking manner. Its actual implementation is up to
@@ -1885,11 +2012,207 @@ fiber_t_alloc(VALUE fiber_value, unsigned int blocking)
     return fiber;
 }
 
+static rb_fiber_t *
+root_fiber_alloc(rb_thread_t *th)
+{
+    VALUE fiber_value = fiber_alloc(rb_cFiber);
+    rb_fiber_t *fiber = th->ec->fiber_ptr;
+
+    VM_ASSERT(DATA_PTR(fiber_value) == NULL);
+    VM_ASSERT(fiber->cont.type == FIBER_CONTEXT);
+    VM_ASSERT(FIBER_RESUMED_P(fiber));
+
+    th->root_fiber = fiber;
+    DATA_PTR(fiber_value) = fiber;
+    fiber->cont.self = fiber_value;
+
+    coroutine_initialize_main(&fiber->context);
+
+    return fiber;
+}
+
+static inline rb_fiber_t*
+fiber_current(void)
+{
+    rb_execution_context_t *ec = GET_EC();
+    if (ec->fiber_ptr->cont.self == 0) {
+        root_fiber_alloc(rb_ec_thread_ptr(ec));
+    }
+    return ec->fiber_ptr;
+}
+
+static inline VALUE
+current_fiber_storage(void)
+{
+    rb_execution_context_t *ec = GET_EC();
+    return ec->storage;
+}
+
+static inline VALUE
+inherit_fiber_storage(void)
+{
+    return rb_obj_dup(current_fiber_storage());
+}
+
+static inline void
+fiber_storage_set(struct rb_fiber_struct *fiber, VALUE storage)
+{
+    fiber->cont.saved_ec.storage = storage;
+}
+
+static inline VALUE
+fiber_storage_get(rb_fiber_t *fiber)
+{
+    VALUE storage = fiber->cont.saved_ec.storage;
+    if (storage == Qnil) {
+        storage = rb_hash_new();
+        fiber_storage_set(fiber, storage);
+    }
+    return storage;
+}
+
+static void
+storage_access_must_be_from_same_fiber(VALUE self)
+{
+    rb_fiber_t *fiber = fiber_ptr(self);
+    rb_fiber_t *current = fiber_current();
+    if (fiber != current) {
+        rb_raise(rb_eArgError, "Fiber storage can only be accessed from the Fiber it belongs to");
+    }
+}
+
+/**
+ *  call-seq: fiber.storage -> hash (dup)
+ *
+ *  Returns a copy of the storage hash for the fiber. The method can only be called on the
+ *  Fiber.current.
+ */
+static VALUE
+rb_fiber_storage_get(VALUE self)
+{
+    storage_access_must_be_from_same_fiber(self);
+    return rb_obj_dup(fiber_storage_get(fiber_ptr(self)));
+}
+
+static int
+fiber_storage_validate_each(VALUE key, VALUE value, VALUE _argument)
+{
+    Check_Type(key, T_SYMBOL);
+
+    return ST_CONTINUE;
+}
+
+static void
+fiber_storage_validate(VALUE value)
+{
+    // nil is an allowed value and will be lazily initialized.
+    if (value == Qnil) return;
+
+    if (!RB_TYPE_P(value, T_HASH)) {
+        rb_raise(rb_eTypeError, "storage must be a hash");
+    }
+
+    if (RB_OBJ_FROZEN(value)) {
+        rb_raise(rb_eFrozenError, "storage must not be frozen");
+    }
+
+    rb_hash_foreach(value, fiber_storage_validate_each, Qundef);
+}
+
+/**
+ *  call-seq: fiber.storage = hash
+ *
+ *  Sets the storage hash for the fiber. This feature is experimental
+ *  and may change in the future. The method can only be called on the
+ *  Fiber.current.
+ *
+ *  You should be careful about using this method as you may inadvertently clear
+ *  important fiber-storage state. You should mostly prefer to assign specific
+ *  keys in the storage using Fiber::[]=.
+ *
+ *  You can also use <tt>Fiber.new(storage: nil)</tt> to create a fiber with an empty
+ *  storage.
+ *
+ *  Example:
+ *
+ *    while request = request_queue.pop
+ *      # Reset the per-request state:
+ *      Fiber.current.storage = nil
+ *      handle_request(request)
+ *    end
+ */
 static VALUE
-fiber_initialize(VALUE self, VALUE proc, struct fiber_pool * fiber_pool, unsigned int blocking)
+rb_fiber_storage_set(VALUE self, VALUE value)
 {
+    if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_EXPERIMENTAL)) {
+        rb_category_warn(RB_WARN_CATEGORY_EXPERIMENTAL,
+          "Fiber#storage= is experimental and may be removed in the future!");
+    }
+
+    storage_access_must_be_from_same_fiber(self);
+    fiber_storage_validate(value);
+
+    fiber_ptr(self)->cont.saved_ec.storage = rb_obj_dup(value);
+    return value;
+}
+
+/**
+ *  call-seq: Fiber[key] -> value
+ *
+ *  Returns the value of the fiber storage variable identified by +key+.
+ *
+ *  The +key+ must be a symbol, and the value is set by Fiber#[]= or
+ *  Fiber#store.
+ *
+ *  See also Fiber::[]=.
+ */
+static VALUE
+rb_fiber_storage_aref(VALUE class, VALUE key)
+{
+    Check_Type(key, T_SYMBOL);
+
+    VALUE storage = fiber_storage_get(fiber_current());
+
+    if (storage == Qnil) return Qnil;
+
+    return rb_hash_aref(storage, key);
+}
+
+/**
+ *  call-seq: Fiber[key] = value
+ *
+ *  Assign +value+ to the fiber storage variable identified by +key+.
+ *  The variable is created if it doesn't exist.
+ *
+ *  +key+ must be a Symbol, otherwise a TypeError is raised.
+ *
+ *  See also Fiber::[].
+ */
+static VALUE
+rb_fiber_storage_aset(VALUE class, VALUE key, VALUE value)
+{
+    Check_Type(key, T_SYMBOL);
+
+    VALUE storage = fiber_storage_get(fiber_current());
+
+    return rb_hash_aset(storage, key, value);
+}
+
+static VALUE
+fiber_initialize(VALUE self, VALUE proc, struct fiber_pool * fiber_pool, unsigned int blocking, VALUE storage)
+{
+    if (storage == Qundef || storage == Qtrue) {
+        // The default, inherit storage (dup) from the current fiber:
+        storage = inherit_fiber_storage();
+    }
+    else /* nil, hash, etc. */ {
+        fiber_storage_validate(storage);
+        storage = rb_obj_dup(storage);
+    }
+
     rb_fiber_t *fiber = fiber_t_alloc(self, blocking);
 
+    fiber->cont.saved_ec.storage = storage;
     fiber->first_proc = proc;
     fiber->stack.base = NULL;
     fiber->stack.pool = fiber_pool;
@@ -1922,54 +2245,90 @@ rb_fiber_pool_default(VALUE pool)
     return &shared_fiber_pool;
 }
 
+VALUE rb_fiber_inherit_storage(struct rb_execution_context_struct *ec, struct rb_fiber_struct *fiber)
+{
+    VALUE storage = rb_obj_dup(ec->storage);
+    fiber->cont.saved_ec.storage = storage;
+    return storage;
+}
+
 /* :nodoc: */
 static VALUE
 rb_fiber_initialize_kw(int argc, VALUE* argv, VALUE self, int kw_splat)
 {
     VALUE pool = Qnil;
     VALUE blocking = Qfalse;
+    VALUE storage = Qundef;
 
     if (kw_splat != RB_NO_KEYWORDS) {
         VALUE options = Qnil;
-        VALUE arguments[2] = {Qundef};
+        VALUE arguments[3] = {Qundef};
 
         argc = rb_scan_args_kw(kw_splat, argc, argv, ":", &options);
-        rb_get_kwargs(options, fiber_initialize_keywords, 0, 2, arguments);
+        rb_get_kwargs(options, fiber_initialize_keywords, 0, 3, arguments);
 
-        if (arguments[0] != Qundef) {
+        if (!UNDEF_P(arguments[0])) {
             blocking = arguments[0];
         }
 
-        if (arguments[1] != Qundef) {
+        if (!UNDEF_P(arguments[1])) {
             pool = arguments[1];
         }
+
+        storage = arguments[2];
     }
 
-    return fiber_initialize(self, rb_block_proc(), rb_fiber_pool_default(pool), RTEST(blocking));
+    return fiber_initialize(self, rb_block_proc(), rb_fiber_pool_default(pool), RTEST(blocking), storage);
 }
 
 /*
  *  call-seq:
- *     Fiber.new(blocking: false) { |*args| ... } -> fiber
+ *     Fiber.new(blocking: false, storage: true) { |*args| ... } -> fiber
  *
- *  Creates new Fiber. Initially, the fiber is not running and can be resumed with
- *  #resume. Arguments to the first #resume call will be passed to the block:
+ *  Creates new Fiber. Initially, the fiber is not running and can be resumed
+ *  with #resume. Arguments to the first #resume call will be passed to the
+ *  block:
  *
- *      f = Fiber.new do |initial|
- *         current = initial
- *         loop do
- *           puts "current: #{current.inspect}"
- *           current = Fiber.yield
- *         end
- *      end
- *      f.resume(100)     # prints: current: 100
- *      f.resume(1, 2, 3) # prints: current: [1, 2, 3]
- *      f.resume          # prints: current: nil
- *      # ... and so on ...
- *
- *  If <tt>blocking: false</tt> is passed to <tt>Fiber.new</tt>, _and_ current thread
- *  has a Fiber.scheduler defined, the Fiber becomes non-blocking (see "Non-blocking
- *  Fibers" section in class docs).
+ *    f = Fiber.new do |initial|
+ *       current = initial
+ *       loop do
+ *         puts "current: #{current.inspect}"
+ *         current = Fiber.yield
+ *       end
+ *    end
+ *    f.resume(100)     # prints: current: 100
+ *    f.resume(1, 2, 3) # prints: current: [1, 2, 3]
+ *    f.resume          # prints: current: nil
+ *    # ... and so on ...
+ *
+ *  If <tt>blocking: false</tt> is passed to <tt>Fiber.new</tt>, _and_ current
+ *  thread has a Fiber.scheduler defined, the Fiber becomes non-blocking (see
+ *  "Non-blocking Fibers" section in class docs).
+ *
+ *  If the <tt>storage</tt> is unspecified, the default is to inherit a copy of
+ *  the storage from the current fiber. This is the same as specifying
+ *  <tt>storage: true</tt>.
+ *
+ *    Fiber[:x] = 1
+ *    Fiber.new do
+ *      Fiber[:x] # => 1
+ *      Fiber[:x] = 2
+ *    end.resume
+ *    Fiber[:x] # => 1
+ *
+ *  If the given <tt>storage</tt> is <tt>nil</tt>, this function will lazy
+ *  initialize the internal storage, which starts as an empty hash.
+ *
+ *    Fiber[:x] = "Hello World"
+ *    Fiber.new(storage: nil) do
+ *      Fiber[:x] # nil
+ *    end
+ *
+ *  Otherwise, the given <tt>storage</tt> is used as the new fiber's storage,
+ *  and it must be an instance of Hash.
+ *
+ *  Explicitly using <tt>storage: true</tt> is currently experimental and may
+ *  change in the future.
  */
 static VALUE
 rb_fiber_initialize(int argc, VALUE* argv, VALUE self)
@@ -1978,9 +2337,15 @@ rb_fiber_initialize(int argc, VALUE* argv, VALUE self)
 }
 
 VALUE
+rb_fiber_new_storage(rb_block_call_func_t func, VALUE obj, VALUE storage)
+{
+    return fiber_initialize(fiber_alloc(rb_cFiber), rb_proc_new(func, obj), rb_fiber_pool_default(Qnil), 0, storage);
+}
+
+VALUE
 rb_fiber_new(rb_block_call_func_t func, VALUE obj)
 {
-    return fiber_initialize(fiber_alloc(rb_cFiber), rb_proc_new(func, obj), rb_fiber_pool_default(Qnil), 1);
+    return rb_fiber_new_storage(func, obj, Qtrue);
 }
 
 static VALUE
@@ -1991,7 +2356,7 @@ rb_fiber_s_schedule_kw(int argc, VALUE* argv, int kw_splat)
     VALUE fiber = Qnil;
 
     if (scheduler != Qnil) {
-        fiber = rb_funcall_passing_block_kw(scheduler, rb_intern("fiber"), argc, argv, kw_splat);
+        fiber = rb_fiber_scheduler_fiber(scheduler, argc, argv, kw_splat);
     }
     else {
         rb_raise(rb_eRuntimeError, "No scheduler is available!");
@@ -2034,7 +2399,7 @@ rb_fiber_s_schedule_kw(int argc, VALUE* argv, int kw_splat)
  *
  *  Note that the behavior described above is how the method is <em>expected</em>
  *  to behave, actual behavior is up to the current scheduler's implementation of
- *  Fiber::SchedulerInterface#fiber method. Ruby doesn't enforce this method to
+ *  Fiber::Scheduler#fiber method. Ruby doesn't enforce this method to
  *  behave in any particular way.
  *
  *  If the scheduler is not set, the method raises
@@ -2053,7 +2418,7 @@ rb_fiber_s_schedule(int argc, VALUE *argv, VALUE obj)
  *
  *  Returns the Fiber scheduler, that was last set for the current thread with Fiber.set_scheduler.
  *  Returns +nil+ if no scheduler is set (which is the default), and non-blocking fibers'
- #  behavior is the same as blocking.
+ *  behavior is the same as blocking.
  *  (see "Non-blocking fibers" section in class docs for details about the scheduler concept).
  *
  */
@@ -2087,7 +2452,7 @@ rb_fiber_current_scheduler(VALUE klass)
  *  thread will call scheduler's +close+ method on finalization (allowing the scheduler to
  *  properly manage all non-finished fibers).
  *
- *  +scheduler+ can be an object of any class corresponding to Fiber::SchedulerInterface. Its
+ *  +scheduler+ can be an object of any class corresponding to Fiber::Scheduler. Its
  *  implementation is up to the user.
  *
  *  See also the "Non-blocking fibers" section in class docs.
@@ -2154,25 +2519,7 @@ rb_fiber_start(rb_fiber_t *fiber)
     rb_fiber_terminate(fiber, need_interrupt, err);
 }
 
-static rb_fiber_t *
-root_fiber_alloc(rb_thread_t *th)
-{
-    VALUE fiber_value = fiber_alloc(rb_cFiber);
-    rb_fiber_t *fiber = th->ec->fiber_ptr;
-
-    VM_ASSERT(DATA_PTR(fiber_value) == NULL);
-    VM_ASSERT(fiber->cont.type == FIBER_CONTEXT);
-    VM_ASSERT(fiber->status == FIBER_RESUMED);
-
-    th->root_fiber = fiber;
-    DATA_PTR(fiber_value) = fiber;
-    fiber->cont.self = fiber_value;
-
-    coroutine_initialize_main(&fiber->context);
-
-    return fiber;
-}
-
+// Set up a "root fiber", which is the fiber that every Ractor has.
 void
 rb_threadptr_root_fiber_setup(rb_thread_t *th)
 {
@@ -2187,9 +2534,11 @@ rb_threadptr_root_fiber_setup(rb_thread_t *th)
     fiber->blocking = 1;
     fiber_status_set(fiber, FIBER_RESUMED); /* skip CREATED */
     th->ec = &fiber->cont.saved_ec;
-    // This skips mjit_cont_new for the initial thread because mjit_enabled is always false
-    // at this point. mjit_init calls rb_fiber_init_mjit_cont again for this root_fiber.
-    rb_fiber_init_mjit_cont(fiber);
+    // When rb_threadptr_root_fiber_setup is called for the first time, mjit_enabled and
+    // rb_yjit_enabled_p() are still false. So this does nothing and rb_jit_cont_init() that is
+    // called later will take care of it. However, you still have to call cont_init_jit_cont()
+    // here for other Ractors, which are not initialized by rb_jit_cont_init().
+    cont_init_jit_cont(&fiber->cont);
 }
 
 void
@@ -2224,16 +2573,6 @@ rb_threadptr_root_fiber_terminate(rb_thread_t *th)
 }
 
 static inline rb_fiber_t*
-fiber_current(void)
-{
-    rb_execution_context_t *ec = GET_EC();
-    if (ec->fiber_ptr->cont.self == 0) {
-        root_fiber_alloc(rb_ec_thread_ptr(ec));
-    }
-    return ec->fiber_ptr;
-}
-
-static inline rb_fiber_t*
 return_fiber(bool terminate)
 {
     rb_fiber_t *fiber = fiber_current();
@@ -2410,20 +2749,34 @@ rb_fiber_transfer(VALUE fiber_value, int argc, const VALUE *argv)
 VALUE
 rb_fiber_blocking_p(VALUE fiber)
 {
-    return RBOOL(fiber_ptr(fiber)->blocking != 0);
+    return RBOOL(fiber_ptr(fiber)->blocking);
 }
 
 static VALUE
-fiber_blocking_yield(VALUE fiber)
+fiber_blocking_yield(VALUE fiber_value)
 {
-    fiber_ptr(fiber)->blocking += 1;
-    return rb_yield(fiber);
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    rb_thread_t * volatile th = fiber->cont.saved_ec.thread_ptr;
+
+    // fiber->blocking is `unsigned int : 1`, so we use it as a boolean:
+    fiber->blocking = 1;
+
+    // Once the fiber is blocking, and current, we increment the thread blocking state:
+    th->blocking += 1;
+
+    return rb_yield(fiber_value);
 }
 
 static VALUE
-fiber_blocking_ensure(VALUE fiber)
+fiber_blocking_ensure(VALUE fiber_value)
 {
-    fiber_ptr(fiber)->blocking -= 1;
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    rb_thread_t * volatile th = fiber->cont.saved_ec.thread_ptr;
+
+    // We are no longer blocking:
+    fiber->blocking = 0;
+    th->blocking -= 1;
+
     return Qnil;
 }
 
@@ -2440,8 +2793,16 @@ fiber_blocking_ensure(VALUE fiber)
 VALUE
 rb_fiber_blocking(VALUE class)
 {
-    VALUE fiber = rb_fiber_current();
-    return rb_ensure(fiber_blocking_yield, fiber, fiber_blocking_ensure, fiber);
+    VALUE fiber_value = rb_fiber_current();
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+
+    // If we are already blocking, this is essentially a no-op:
+    if (fiber->blocking) {
+        return rb_yield(fiber_value);
+    }
+    else {
+        return rb_ensure(fiber_blocking_yield, fiber_value, fiber_blocking_ensure, fiber_value);
+    }
 }
 
 /*
@@ -2979,329 +3340,6 @@ rb_fiber_pool_initialize(int argc, VALUE* argv, VALUE self)
  *     fiber.resume #=> FiberError: dead fiber called
  */
 
-/*
- *  Document-class: Fiber::SchedulerInterface
- *
- *  This is not an existing class, but documentation of the interface that Scheduler
- *  object should comply to in order to be used as argument to Fiber.scheduler and handle non-blocking
- *  fibers. See also the "Non-blocking fibers" section in Fiber class docs for explanations
- *  of some concepts.
- *
- *  Scheduler's behavior and usage are expected to be as follows:
- *
- *  * When the execution in the non-blocking Fiber reaches some blocking operation (like
- *    sleep, wait for a process, or a non-ready I/O), it calls some of the scheduler's
- *    hook methods, listed below.
- *  * Scheduler somehow registers what the current fiber is waiting on, and yields control
- *    to other fibers with Fiber.yield (so the fiber would be suspended while expecting its
- *    wait to end, and other fibers in the same thread can perform)
- *  * At the end of the current thread execution, the scheduler's method #close is called
- *  * The scheduler runs into a wait loop, checking all the blocked fibers (which it has
- *    registered on hook calls) and resuming them when the awaited resource is ready
- *    (e.g. I/O ready or sleep time elapsed).
- *
- *  A typical implementation would probably rely for this closing loop on a gem like
- *  EventMachine[https://github.com/eventmachine/eventmachine] or
- *  Async[https://github.com/socketry/async].
- *
- *  This way concurrent execution will be achieved transparently for every
- *  individual Fiber's code.
- *
- *  Hook methods are:
- *
- *  * #io_wait, #io_read, and #io_write
- *  * #process_wait
- *  * #kernel_sleep
- *  * #timeout_after
- *  * #address_resolve
- *  * #block and #unblock
- *  * (the list is expanded as Ruby developers make more methods having non-blocking calls)
- *
- *  When not specified otherwise, the hook implementations are mandatory: if they are not
- *  implemented, the methods trying to call hook will fail. To provide backward compatibility,
- *  in the future hooks will be optional (if they are not implemented, due to the scheduler
- *  being created for the older Ruby version, the code which needs this hook will not fail,
- *  and will just behave in a blocking fashion).
- *
- *  It is also strongly recommended that the scheduler implements the #fiber method, which is
- *  delegated to by Fiber.schedule.
- *
- *  Sample _toy_ implementation of the scheduler can be found in Ruby's code, in
- *  <tt>test/fiber/scheduler.rb</tt>
- *
- */
-
-#if 0 /* for RDoc */
-/*
- *
- *  Document-method: Fiber::SchedulerInterface#close
- *
- *  Called when the current thread exits. The scheduler is expected to implement this
- *  method in order to allow all waiting fibers to finalize their execution.
- *
- *  The suggested pattern is to implement the main event loop in the #close method.
- *
- */
-static VALUE
-rb_fiber_scheduler_interface_close(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#process_wait
- *  call-seq: process_wait(pid, flags)
- *
- *  Invoked by Process::Status.wait in order to wait for a specified process.
- *  See that method description for arguments description.
- *
- *  Suggested minimal implementation:
- *
- *      Thread.new do
- *        Process::Status.wait(pid, flags)
- *      end.value
- *
- *  This hook is optional: if it is not present in the current scheduler,
- *  Process::Status.wait will behave as a blocking method.
- *
- *  Expected to return a Process::Status instance.
- */
-static VALUE
-rb_fiber_scheduler_interface_process_wait(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#io_wait
- *  call-seq: io_wait(io, events, timeout)
- *
- *  Invoked by IO#wait, IO#wait_readable, IO#wait_writable to ask whether the
- *  specified descriptor is ready for specified events within
- *  the specified +timeout+.
- *
- *  +events+ is a bit mask of <tt>IO::READABLE</tt>, <tt>IO::WRITABLE</tt>, and
- *  <tt>IO::PRIORITY</tt>.
- *
- *  Suggested implementation should register which Fiber is waiting for which
- *  resources and immediately calling Fiber.yield to pass control to other
- *  fibers. Then, in the #close method, the scheduler might dispatch all the
- *  I/O resources to fibers waiting for it.
- *
- *  Expected to return the subset of events that are ready immediately.
- *
- */
-static VALUE
-rb_fiber_scheduler_interface_io_wait(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#io_read
- *  call-seq: io_read(io, buffer, length) -> read length or -errno
- *
- *  Invoked by IO#read to read +length+ bytes from +io+ into a specified
- *  +buffer+ (see IO::Buffer).
- *
- *  The +length+ argument is the "minimum length to be read".
- *  If the IO buffer size is 8KiB, but the +length+ is +1024+ (1KiB), up to
- *  8KiB might be read, but at least 1KiB will be.
- *  Generally, the only case where less data than +length+ will be read is if
- *  there is an error reading the data.
- *
- *  Specifying a +length+ of 0 is valid and means try reading at least once
- *  and return any available data.
- *
- *  Suggested implementation should try to read from +io+ in a non-blocking
- *  manner and call #io_wait if the +io+ is not ready (which will yield control
- *  to other fibers).
- *
- *  See IO::Buffer for an interface available to return data.
- *
- *  Expected to return number of bytes read, or, in case of an error, <tt>-errno</tt>
- *  (negated number corresponding to system's error code).
- *
- *  The method should be considered _experimental_.
- */
-static VALUE
-rb_fiber_scheduler_interface_io_read(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#io_write
- *  call-seq: io_write(io, buffer, length) -> written length or -errno
- *
- *  Invoked by IO#write to write +length+ bytes to +io+ from
- *  from a specified +buffer+ (see IO::Buffer).
- *
- *  The +length+ argument is the "(minimum) length to be written".
- *  If the IO buffer size is 8KiB, but the +length+ specified is 1024 (1KiB),
- *  at most 8KiB will be written, but at least 1KiB will be.
- *  Generally, the only case where less data than +length+ will be written is if
- *  there is an error writing the data.
- *
- *  Specifying a +length+ of 0 is valid and means try writing at least once,
- *  as much data as possible.
- *
- *  Suggested implementation should try to write to +io+ in a non-blocking
- *  manner and call #io_wait if the +io+ is not ready (which will yield control
- *  to other fibers).
- *
- *  See IO::Buffer for an interface available to get data from buffer efficiently.
- *
- *  Expected to return number of bytes written, or, in case of an error, <tt>-errno</tt>
- *  (negated number corresponding to system's error code).
- *
- *  The method should be considered _experimental_.
- */
-static VALUE
-rb_fiber_scheduler_interface_io_write(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#kernel_sleep
- *  call-seq: kernel_sleep(duration = nil)
- *
- *  Invoked by Kernel#sleep and Mutex#sleep and is expected to provide
- *  an implementation of sleeping in a non-blocking way. Implementation might
- *  register the current fiber in some list of "which fiber wait until what
- *  moment", call Fiber.yield to pass control, and then in #close resume
- *  the fibers whose wait period has elapsed.
- *
- */
-static VALUE
-rb_fiber_scheduler_interface_kernel_sleep(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#address_resolve
- *  call-seq: address_resolve(hostname) -> array_of_strings or nil
- *
- *  Invoked by any method that performs a non-reverse DNS lookup. The most
- *  notable method is Addrinfo.getaddrinfo, but there are many other.
- *
- *  The method is expected to return an array of strings corresponding to ip
- *  addresses the +hostname+ is resolved to, or +nil+ if it can not be resolved.
- *
- *  Fairly exhaustive list of all possible call-sites:
- *
- *  - Addrinfo.getaddrinfo
- *  - Addrinfo.tcp
- *  - Addrinfo.udp
- *  - Addrinfo.ip
- *  - Addrinfo.new
- *  - Addrinfo.marshal_load
- *  - SOCKSSocket.new
- *  - TCPServer.new
- *  - TCPSocket.new
- *  - IPSocket.getaddress
- *  - TCPSocket.gethostbyname
- *  - UDPSocket#connect
- *  - UDPSocket#bind
- *  - UDPSocket#send
- *  - Socket.getaddrinfo
- *  - Socket.gethostbyname
- *  - Socket.pack_sockaddr_in
- *  - Socket.sockaddr_in
- *  - Socket.unpack_sockaddr_in
- */
-static VALUE
-rb_fiber_scheduler_interface_address_resolve(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#timeout_after
- *  call-seq: timeout_after(duration, exception_class, *exception_arguments, &block) -> result of block
- *
- *  Invoked by Timeout.timeout to execute the given +block+ within the given
- *  +duration+. It can also be invoked directly by the scheduler or user code.
- *
- *  Attempt to limit the execution time of a given +block+ to the given
- *  +duration+ if possible. When a non-blocking operation causes the +block+'s
- *  execution time to exceed the specified +duration+, that non-blocking
- *  operation should be interrupted by raising the specified +exception_class+
- *  constructed with the given +exception_arguments+.
- *
- *  General execution timeouts are often considered risky. This implementation
- *  will only interrupt non-blocking operations. This is by design because it's
- *  expected that non-blocking operations can fail for a variety of
- *  unpredictable reasons, so applications should already be robust in handling
- *  these conditions and by implication timeouts.
- *
- *  However, as a result of this design, if the +block+ does not invoke any
- *  non-blocking operations, it will be impossible to interrupt it. If you
- *  desire to provide predictable points for timeouts, consider adding
- *  +sleep(0)+.
- *
- *  If the block is executed successfully, its result will be returned.
- *
- *  The exception will typically be raised using Fiber#raise.
- */
-static VALUE
-rb_fiber_scheduler_interface_timeout_after(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#block
- *  call-seq: block(blocker, timeout = nil)
- *
- *  Invoked by methods like Thread.join, and by Mutex, to signify that current
- *  Fiber is blocked until further notice (e.g. #unblock) or until +timeout+ has
- *  elapsed.
- *
- *  +blocker+ is what we are waiting on, informational only (for debugging and
- *  logging). There are no guarantee about its value.
- *
- *  Expected to return boolean, specifying whether the blocking operation was
- *  successful or not.
- */
-static VALUE
-rb_fiber_scheduler_interface_block(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#unblock
- *  call-seq: unblock(blocker, fiber)
- *
- *  Invoked to wake up Fiber previously blocked with #block (for example, Mutex#lock
- *  calls #block and Mutex#unlock calls #unblock). The scheduler should use
- *  the +fiber+ parameter to understand which fiber is unblocked.
- *
- *  +blocker+ is what was awaited for, but it is informational only (for debugging
- *  and logging), and it is not guaranteed to be the same value as the +blocker+ for
- *  #block.
- *
- */
-static VALUE
-rb_fiber_scheduler_interface_unblock(VALUE self)
-{
-}
-
-/*
- *  Document-method: SchedulerInterface#fiber
- *  call-seq: fiber(&block)
- *
- *  Implementation of the Fiber.schedule. The method is <em>expected</em> to immediately
- *  run the given block of code in a separate non-blocking fiber, and to return that Fiber.
- *
- *  Minimal suggested implementation is:
- *
- *     def fiber(&block)
- *       fiber = Fiber.new(blocking: false, &block)
- *       fiber.resume
- *       fiber
- *     end
- */
-static VALUE
-rb_fiber_scheduler_interface_fiber(VALUE self)
-{
-}
-#endif
-
 void
 Init_Cont(void)
 {
@@ -3323,6 +3361,7 @@ Init_Cont(void)
 
     fiber_initialize_keywords[0] = rb_intern_const("blocking");
     fiber_initialize_keywords[1] = rb_intern_const("pool");
+    fiber_initialize_keywords[2] = rb_intern_const("storage");
 
     const char *fiber_shared_fiber_pool_free_stacks = getenv("RUBY_SHARED_FIBER_POOL_FREE_STACKS");
     if (fiber_shared_fiber_pool_free_stacks) {
@@ -3335,8 +3374,13 @@ Init_Cont(void)
     rb_define_singleton_method(rb_cFiber, "yield", rb_fiber_s_yield, -1);
     rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
     rb_define_singleton_method(rb_cFiber, "blocking", rb_fiber_blocking, 0);
+    rb_define_singleton_method(rb_cFiber, "[]", rb_fiber_storage_aref, 1);
+    rb_define_singleton_method(rb_cFiber, "[]=", rb_fiber_storage_aset, 2);
+
     rb_define_method(rb_cFiber, "initialize", rb_fiber_initialize, -1);
     rb_define_method(rb_cFiber, "blocking?", rb_fiber_blocking_p, 0);
+    rb_define_method(rb_cFiber, "storage", rb_fiber_storage_get, 0);
+    rb_define_method(rb_cFiber, "storage=", rb_fiber_storage_set, 1);
     rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
     rb_define_method(rb_cFiber, "raise", rb_fiber_m_raise, -1);
     rb_define_method(rb_cFiber, "backtrace", rb_fiber_backtrace, -1);
@@ -3353,21 +3397,6 @@ Init_Cont(void)
 
     rb_define_singleton_method(rb_cFiber, "schedule", rb_fiber_s_schedule, -1);
 
-#if 0 /* for RDoc */
-    rb_cFiberScheduler = rb_define_class_under(rb_cFiber, "SchedulerInterface", rb_cObject);
-    rb_define_method(rb_cFiberScheduler, "close", rb_fiber_scheduler_interface_close, 0);
-    rb_define_method(rb_cFiberScheduler, "process_wait", rb_fiber_scheduler_interface_process_wait, 0);
-    rb_define_method(rb_cFiberScheduler, "io_wait", rb_fiber_scheduler_interface_io_wait, 0);
-    rb_define_method(rb_cFiberScheduler, "io_read", rb_fiber_scheduler_interface_io_read, 0);
-    rb_define_method(rb_cFiberScheduler, "io_write", rb_fiber_scheduler_interface_io_write, 0);
-    rb_define_method(rb_cFiberScheduler, "kernel_sleep", rb_fiber_scheduler_interface_kernel_sleep, 0);
-    rb_define_method(rb_cFiberScheduler, "address_resolve", rb_fiber_scheduler_interface_address_resolve, 0);
-    rb_define_method(rb_cFiberScheduler, "timeout_after", rb_fiber_scheduler_interface_timeout_after, 0);
-    rb_define_method(rb_cFiberScheduler, "block", rb_fiber_scheduler_interface_block, 0);
-    rb_define_method(rb_cFiberScheduler, "unblock", rb_fiber_scheduler_interface_unblock, 0);
-    rb_define_method(rb_cFiberScheduler, "fiber", rb_fiber_scheduler_interface_fiber, 0);
-#endif
-
 #ifdef RB_EXPERIMENTAL_FIBER_POOL
     rb_cFiberPool = rb_define_class_under(rb_cFiber, "Pool", rb_cObject);
     rb_define_alloc_func(rb_cFiberPool, fiber_pool_alloc);
diff --git a/coroutine/asyncify/Context.h b/coroutine/asyncify/Context.h
index 7dba829a1d..71791a4004 100644
--- a/coroutine/asyncify/Context.h
+++ b/coroutine/asyncify/Context.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdio.h>
+#include <stdint.h>
 #include "wasm/asyncify.h"
 #include "wasm/machine.h"
 #include "wasm/fiber.h"
@@ -47,10 +48,13 @@ static inline void coroutine_initialize_main(struct coroutine_context * context)
 
 static inline void coroutine_initialize(struct coroutine_context *context, coroutine_start start, void *stack, size_t size)
 {
-    if (ASYNCIFY_CORO_DEBUG) fprintf(stderr, "[%s] entry (context = %p, stack = %p ... %p)\n", __func__, context, stack, (char *)stack + size);
+    // Linear stack pointer must be always aligned down to 16 bytes.
+    // https://github.com/WebAssembly/tool-conventions/blob/c74267a5897c1bdc9aa60adeaf41816387d3cd12/BasicCABI.md#the-linear-stack
+    uintptr_t sp = ((uintptr_t)stack + size) & ~0xF;
+    if (ASYNCIFY_CORO_DEBUG) fprintf(stderr, "[%s] entry (context = %p, stack = %p ... %p)\n", __func__, context, stack, (char *)sp);
     rb_wasm_init_context(&context->fc, coroutine_trampoline, start, context);
     // record the initial stack pointer position to restore it after resumption
-    context->current_sp = (char *)stack + size;
+    context->current_sp = (char *)sp;
     context->stack_base = stack;
     context->size = size;
 }
diff --git a/coroutine/ppc/Context.S b/coroutine/ppc/Context.S
index fe28390df0..cdda93e179 100644
--- a/coroutine/ppc/Context.S
+++ b/coroutine/ppc/Context.S
@@ -1,73 +1,90 @@
+; Based on the code by Samuel Williams. Created by Sergey Fedorov on 04/06/2022.
+; Credits to Samuel Williams, Rei Odaira and Iain Sandoe. Errors, if any, are mine.
+; Some relevant examples: https://github.com/gcc-mirror/gcc/blob/master/libphobos/libdruntime/config/powerpc/switchcontext.S
+; https://github.com/gcc-mirror/gcc/blob/master/libgcc/config/rs6000/darwin-gpsave.S
+; https://www.ibm.com/docs/en/aix/7.2?topic=epilogs-saving-gprs-only
+; ppc32 version may be re-written compactly with stmw/lwm, but the code wonʼt be faster, see: https://github.com/ruby/ruby/pull/5927#issuecomment-1139730541
+
+; Notice that this code is only for Darwin (macOS). Darwin ABI differs from AIX and ELF.
+; To add support for AIX, *BSD or *Linux, please make separate implementations.
+
 #define TOKEN_PASTE(x,y) x##y
 #define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
+.machine ppc7400 ; = G4, Rosetta
 .text
-.align 2
 
 .globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+.align 2
+
 PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
-	# Make space on the stack for caller registers
-	addi r1,r1,-80
+	; Make space on the stack for caller registers
+	; (Should we rather use red zone? See libphobos example.)
+	subi r1,r1,80
+
+	; Get LR
+	mflr r0
 
-	# Save caller registers
-	stw r13,0(r1)
-	stw r14,4(r1)
-	stw r15,8(r1)
-	stw r16,12(r1)
-	stw r17,16(r1)
-	stw r18,20(r1)
-	stw r19,24(r1)
-	stw r20,28(r1)
-	stw r21,32(r1)
+	; Save caller registers
+	stw r31,0(r1)
+	stw r30,4(r1)
+	stw r29,8(r1)
+	stw r28,12(r1)
+	stw r27,16(r1)
+	stw r26,20(r1)
+	stw r25,24(r1)
+	stw r24,28(r1)
+	stw r23,32(r1)
 	stw r22,36(r1)
-	stw r23,40(r1)
-	stw r24,44(r1)
-	stw r25,48(r1)
-	stw r26,52(r1)
-	stw r27,56(r1)
-	stw r28,60(r1)
-	stw r29,64(r1)
-	stw r30,68(r1)
-	stw r31,72(r1)
+	stw r21,40(r1)
+	stw r20,44(r1)
+	stw r19,48(r1)
+	stw r18,52(r1)
+	stw r17,56(r1)
+	stw r16,60(r1)
+	stw r15,64(r1)
+	stw r14,68(r1)
+	stw r13,72(r1)
 
-	# Save return address
-	mflr r0
+	; Save return address
+	; Possibly should rather be saved into linkage area, see libphobos and IBM docs
 	stw r0,76(r1)
 
-	# Save stack pointer to first argument
+	; Save stack pointer to first argument
 	stw r1,0(r3)
 
-	# Load stack pointer from second argument
+	; Load stack pointer from second argument
 	lwz r1,0(r4)
 
-	# Restore caller registers
-	lwz r13,0(r1)
-	lwz r14,4(r1)
-	lwz r15,8(r1)
-	lwz r16,12(r1)
-	lwz r17,16(r1)
-	lwz r18,20(r1)
-	lwz r19,24(r1)
-	lwz r20,28(r1)
-	lwz r21,32(r1)
+	; Load return address
+	lwz r0,76(r1)
+
+	; Restore caller registers
+	lwz r13,72(r1)
+	lwz r14,68(r1)
+	lwz r15,64(r1)
+	lwz r16,60(r1)
+	lwz r17,56(r1)
+	lwz r18,52(r1)
+	lwz r19,48(r1)
+	lwz r20,44(r1)
+	lwz r21,40(r1)
 	lwz r22,36(r1)
-	lwz r23,40(r1)
-	lwz r24,44(r1)
-	lwz r25,48(r1)
-	lwz r26,52(r1)
-	lwz r27,56(r1)
-	lwz r28,60(r1)
-	lwz r29,64(r1)
-	lwz r30,68(r1)
-	lwz r31,72(r1)
+	lwz r23,32(r1)
+	lwz r24,28(r1)
+	lwz r25,24(r1)
+	lwz r26,20(r1)
+	lwz r27,16(r1)
+	lwz r28,12(r1)
+	lwz r29,8(r1)
+	lwz r30,4(r1)
+	lwz r31,0(r1)
 
-	# Load return address
-	lwz r0,76(r1)
+	; Set LR
 	mtlr r0
 
-	# Pop stack frame
+	; Pop stack frame
 	addi r1,r1,80
 
-	# Jump to return address
+	; Jump to return address
 	blr
-
diff --git a/coroutine/ppc/Context.h b/coroutine/ppc/Context.h
index 9f69390388..1fce112579 100644
--- a/coroutine/ppc/Context.h
+++ b/coroutine/ppc/Context.h
@@ -9,6 +9,7 @@
 #include <string.h>
 
 #define COROUTINE __attribute__((noreturn)) void
+#define COROUTINE_LIMITED_ADDRESS_SPACE
 
 enum {
   COROUTINE_REGISTERS =
diff --git a/coroutine/ppc64/Context.S b/coroutine/ppc64/Context.S
index 1bd9268f93..f8561e0e7d 100644
--- a/coroutine/ppc64/Context.S
+++ b/coroutine/ppc64/Context.S
@@ -1,70 +1,89 @@
+; Based on the code by Samuel Williams. Created by Sergey Fedorov on 04/06/2022.
+; Credits to Samuel Williams, Rei Odaira and Iain Sandoe. Errors, if any, are mine.
+; Some relevant examples: https://github.com/gcc-mirror/gcc/blob/master/libphobos/libdruntime/config/powerpc/switchcontext.S
+; https://github.com/gcc-mirror/gcc/blob/master/libgcc/config/rs6000/darwin-gpsave.S
+; https://www.ibm.com/docs/en/aix/7.2?topic=epilogs-saving-gprs-only
+
+; Notice that this code is only for Darwin (macOS). Darwin ABI differs from AIX and ELF.
+; To add support for AIX, *BSD or *Linux, please make separate implementations.
+
 #define TOKEN_PASTE(x,y) x##y
 #define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
 
+.machine ppc64 ; = G5
 .text
-.align 3
 
 .globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
-PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
-	# Make space on the stack for caller registers
-	addi r1,r1,-152
+.align 2
 
-	# Save caller registers
-	std r14,0(r1)
-	std r15,8(r1)
-	std r16,16(r1)
-	std r17,24(r1)
-	std r18,32(r1)
-	std r19,40(r1)
-	std r20,48(r1)
-	std r21,56(r1)
-	std r22,64(r1)
-	std r23,72(r1)
-	std r24,80(r1)
-	std r25,88(r1)
-	std r26,96(r1)
-	std r27,104(r1)
-	std r28,112(r1)
-	std r29,120(r1)
-	std r30,128(r1)
-	std r31,136(r1)
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+	; Make space on the stack for caller registers
+	; (Should we rather use red zone? See libphobos example.)
+	subi r1,r1,160
 
-	# Save return address
+	; Get LR
 	mflr r0
-	std r0,144(r1)
 
-	# Save stack pointer to first argument
+	; Save caller registers
+	std r31,0(r1)
+	std r30,8(r1)
+	std r29,16(r1)
+	std r28,24(r1)
+	std r27,32(r1)
+	std r26,40(r1)
+	std r25,48(r1)
+	std r24,56(r1)
+	std r23,64(r1)
+	std r22,72(r1)
+	std r21,80(r1)
+	std r20,88(r1)
+	std r19,96(r1)
+	std r18,104(r1)
+	std r17,112(r1)
+	std r16,120(r1)
+	std r15,128(r1)
+	std r14,136(r1)
+	std r13,144(r1)
+
+	; Save return address
+	; Possibly should rather be saved into linkage area, see libphobos and IBM docs
+	std r0,152(r1)
+
+	; Save stack pointer to first argument
 	std r1,0(r3)
 
-	# Load stack pointer from second argument
+	; Load stack pointer from second argument
 	ld r1,0(r4)
 
-	# Restore caller registers
-	ld r14,0(r1)
-	ld r15,8(r1)
-	ld r16,16(r1)
-	ld r17,24(r1)
-	ld r18,32(r1)
-	ld r19,40(r1)
-	ld r20,48(r1)
-	ld r21,56(r1)
-	ld r22,64(r1)
-	ld r23,72(r1)
-	ld r24,80(r1)
-	ld r25,88(r1)
-	ld r26,96(r1)
-	ld r27,104(r1)
-	ld r28,112(r1)
-	ld r29,120(r1)
-	ld r30,128(r1)
-	ld r31,136(r1)
+	; Load return address
+	ld r0,152(r1)
+
+	; Restore caller registers
+	ld r13,144(r1)
+	ld r14,136(r1)
+	ld r15,128(r1)
+	ld r16,120(r1)
+	ld r17,112(r1)
+	ld r18,104(r1)
+	ld r19,96(r1)
+	ld r20,88(r1)
+	ld r21,80(r1)
+	ld r22,72(r1)
+	ld r23,64(r1)
+	ld r24,56(r1)
+	ld r25,48(r1)
+	ld r26,40(r1)
+	ld r27,32(r1)
+	ld r28,24(r1)
+	ld r29,16(r1)
+	ld r30,8(r1)
+	ld r31,0(r1)
 
-	# Load return address
-	ld r0,144(r1)
+	; Set LR
 	mtlr r0
 
-	# Pop stack frame
-	addi r1,r1,152
+	; Pop stack frame
+	addi r1,r1,160
 
-	# Jump to return address
+	; Jump to return address
 	blr
diff --git a/coroutine/ppc64/Context.h b/coroutine/ppc64/Context.h
index 5b47511b9c..3e6f77f55a 100644
--- a/coroutine/ppc64/Context.h
+++ b/coroutine/ppc64/Context.h
@@ -12,7 +12,7 @@
 
 enum {
   COROUTINE_REGISTERS =
-  19  /* 18 general purpose registers (r14–r31) and 1 return address */
+  20  /* 19 general purpose registers (r13–r31) and 1 return address */
   + 4  /* space for fiber_entry() to store the link register */
 };
 
@@ -44,7 +44,7 @@ static inline void coroutine_initialize(
     memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
 
     /* Skip a global prologue that sets the TOC register */
-    context->stack_pointer[18] = ((char*)start) + 8;
+    context->stack_pointer[19] = ((char*)start) + 8;
 }
 
 struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 43e92a27f0..f342d2fcf7 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -2,6 +2,9 @@ gnumake = yes
 
 include Makefile
 
+MUNICODE_FLAG := $(if $(filter mingw%,$(target_os)),-municode)
+override EXE_LDFLAGS += $(MUNICODE_FLAG)
+
 DLLWRAP = @DLLWRAP@ --target=$(target_os) --driver-name="$(CC)"
 windres-cpp := $(CPP) -xc
 windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \
@@ -63,7 +66,7 @@ $(PROGRAM): $(RUBY_INSTALL_NAME).res.$(OBJEXT)
 $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.$(OBJEXT)
 	@rm -f $@
 	$(ECHO) linking $@
-	$(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
+	$(Q) $(PURIFY) $(CC) $(MUNICODE_FLAG) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 $(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.$(OBJEXT)
 
diff --git a/debug_counter.c b/debug_counter.c
index 0fd0e20c6d..463bebf849 100644
--- a/debug_counter.c
+++ b/debug_counter.c
@@ -16,7 +16,7 @@
 
 #if USE_DEBUG_COUNTER
 
-static const char *const debug_counter_names[] = {
+const char *const rb_debug_counter_names[] = {
 #define DEBUG_COUNTER_NAME_EMPTY "" /* Suppress -Wstring-concatenation */
     DEBUG_COUNTER_NAME_EMPTY
 #undef DEBUG_COUNTER_NAME_EMPTY
@@ -26,7 +26,7 @@ static const char *const debug_counter_names[] = {
 };
 
 MJIT_SYMBOL_EXPORT_BEGIN
-size_t rb_debug_counter[numberof(debug_counter_names)];
+size_t rb_debug_counter[numberof(rb_debug_counter_names)];
 void rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add);
 MJIT_SYMBOL_EXPORT_END
 
@@ -56,17 +56,7 @@ void
 ruby_debug_counter_reset(void)
 {
     for (int i = 0; i < RB_DEBUG_COUNTER_MAX; i++) {
-        switch (i) {
-          case RB_DEBUG_COUNTER_mjit_length_unit_queue:
-          case RB_DEBUG_COUNTER_mjit_length_active_units:
-          case RB_DEBUG_COUNTER_mjit_length_compact_units:
-          case RB_DEBUG_COUNTER_mjit_length_stale_units:
-            // These counters may be decreased and should not be reset.
-            break;
-          default:
-            rb_debug_counter[i] = 0;
-            break;
-        }
+        rb_debug_counter[i] = 0;
     }
 }
 
@@ -77,7 +67,7 @@ ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr)
     int i;
     if (names_ptr != NULL) {
         for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
-            names_ptr[i] = debug_counter_names[i];
+            names_ptr[i] = rb_debug_counter_names[i];
         }
     }
     if (counters_ptr != NULL) {
@@ -107,7 +97,7 @@ rb_debug_counter_show_results(const char *msg)
         fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%d %s\n", getpid(), msg);
         for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
             fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%-30s\t%'14"PRIuSIZE"\n",
-                    debug_counter_names[i],
+                    rb_debug_counter_names[i],
                     rb_debug_counter[i]);
         }
     }
diff --git a/debug_counter.h b/debug_counter.h
index c6f4176e97..6e0b8dee60 100644
--- a/debug_counter.h
+++ b/debug_counter.h
@@ -130,7 +130,6 @@ RB_DEBUG_COUNTER(frame_C2R)
 /* instance variable counts
  *
  * * ivar_get_ic_hit/miss: ivar_get inline cache (ic) hit/miss counts (VM insn)
- * * ivar_get_ic_miss_serial: ivar_get ic miss reason by serial (VM insn)
  * * ivar_get_ic_miss_unset:                      ... by unset (VM insn)
  * * ivar_get_ic_miss_noobject:                   ... by "not T_OBJECT" (VM insn)
  * * ivar_set_...: same counts with ivar_set (VM insn)
@@ -140,17 +139,17 @@ RB_DEBUG_COUNTER(frame_C2R)
  */
 RB_DEBUG_COUNTER(ivar_get_ic_hit)
 RB_DEBUG_COUNTER(ivar_get_ic_miss)
-RB_DEBUG_COUNTER(ivar_get_ic_miss_serial)
-RB_DEBUG_COUNTER(ivar_get_ic_miss_unset)
 RB_DEBUG_COUNTER(ivar_get_ic_miss_noobject)
 RB_DEBUG_COUNTER(ivar_set_ic_hit)
 RB_DEBUG_COUNTER(ivar_set_ic_miss)
-RB_DEBUG_COUNTER(ivar_set_ic_miss_serial)
-RB_DEBUG_COUNTER(ivar_set_ic_miss_unset)
 RB_DEBUG_COUNTER(ivar_set_ic_miss_iv_hit)
 RB_DEBUG_COUNTER(ivar_set_ic_miss_noobject)
 RB_DEBUG_COUNTER(ivar_get_base)
 RB_DEBUG_COUNTER(ivar_set_base)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_set)
+RB_DEBUG_COUNTER(ivar_get_cc_miss_set)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_unset)
+RB_DEBUG_COUNTER(ivar_get_cc_miss_unset)
 
 /* local variable counts
  *
@@ -244,6 +243,7 @@ RB_DEBUG_COUNTER(obj_wb_unprotect)
 RB_DEBUG_COUNTER(obj_obj_embed)
 RB_DEBUG_COUNTER(obj_obj_transient)
 RB_DEBUG_COUNTER(obj_obj_ptr)
+RB_DEBUG_COUNTER(obj_obj_too_complex)
 
 RB_DEBUG_COUNTER(obj_str_ptr)
 RB_DEBUG_COUNTER(obj_str_embed)
@@ -347,41 +347,6 @@ RB_DEBUG_COUNTER(vm_sync_lock_enter_nb)
 RB_DEBUG_COUNTER(vm_sync_lock_enter_cr)
 RB_DEBUG_COUNTER(vm_sync_barrier)
 
-/* jit_exec() counts */
-RB_DEBUG_COUNTER(jit_exec)
-RB_DEBUG_COUNTER(mjit_exec_not_added)
-RB_DEBUG_COUNTER(mjit_exec_not_ready)
-RB_DEBUG_COUNTER(mjit_exec_not_compiled)
-RB_DEBUG_COUNTER(mjit_exec_call_func)
-
-/* MJIT enqueue / unload */
-RB_DEBUG_COUNTER(mjit_add_iseq_to_process)
-RB_DEBUG_COUNTER(mjit_unload_units)
-
-/* MJIT <-> VM frame push counts */
-RB_DEBUG_COUNTER(mjit_frame_VM2VM)
-RB_DEBUG_COUNTER(mjit_frame_VM2JT)
-RB_DEBUG_COUNTER(mjit_frame_JT2JT)
-RB_DEBUG_COUNTER(mjit_frame_JT2VM)
-
-/* MJIT cancel counters */
-RB_DEBUG_COUNTER(mjit_cancel)
-RB_DEBUG_COUNTER(mjit_cancel_ivar_inline)
-RB_DEBUG_COUNTER(mjit_cancel_exivar_inline)
-RB_DEBUG_COUNTER(mjit_cancel_send_inline)
-RB_DEBUG_COUNTER(mjit_cancel_opt_insn) /* CALL_SIMPLE_METHOD */
-RB_DEBUG_COUNTER(mjit_cancel_invalidate_all)
-RB_DEBUG_COUNTER(mjit_cancel_leave)
-
-/* rb_mjit_unit_list length */
-RB_DEBUG_COUNTER(mjit_length_unit_queue)
-RB_DEBUG_COUNTER(mjit_length_active_units)
-RB_DEBUG_COUNTER(mjit_length_compact_units)
-RB_DEBUG_COUNTER(mjit_length_stale_units)
-
-/* Other MJIT counters */
-RB_DEBUG_COUNTER(mjit_compile_failures)
-
 /* load (not implemented yet) */
 /*
 RB_DEBUG_COUNTER(load_files)
diff --git a/defs/gmake.mk b/defs/gmake.mk
index cebb181fd1..54fef6685f 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -19,6 +19,7 @@ INSTRUBY_ENV += SDKROOT=
 endif
 INSTRUBY_ARGS += --gnumake
 
+ifeq ($(DOT_WAIT),)
 CHECK_TARGETS := great exam love check test check% test% btest%
 # expand test targets, and those dependents
 TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))
@@ -26,7 +27,7 @@ TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS))
 TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS))
 TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS))
 TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS))
-TEST_TARGETS := $(patsubst check,test-spec test-all test-tool test-short,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst check,test-syntax-suggest test-spec test-all test-tool test-short,$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS))
 TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS))
 TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS))
@@ -39,8 +40,10 @@ TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST
 TEST_TARGETS := $(patsubst test-bundled-gems,test-bundled-gems-run,$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-bundled-gems-run,test-bundled-gems-run $(PREPARE_BUNDLED_GEMS),$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-bundled-gems-prepare,test-bundled-gems-prepare $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst test-syntax-suggest,test-syntax-suggest $(PREPARE_SYNTAX_SUGGEST),$(TEST_TARGETS))
 TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS))
 TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts)
+endif
 
 in-srcdir := $(if $(filter-out .,$(srcdir)),$(CHDIR) $(srcdir) &&)
 
@@ -71,6 +74,7 @@ $(foreach arch,$(arch_flags),\
 	$(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
 endif
 
+ifeq ($(DOT_WAIT),)
 .PHONY: $(addprefix yes-,$(TEST_TARGETS))
 
 ifneq ($(filter-out btest%,$(TEST_TARGETS)),)
@@ -80,7 +84,8 @@ endif
 ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
 	btest-ruby test-knownbug test-basic \
 	test-testframework test-tool test-ruby test-all \
-	test-spec test-bundler-prepare test-bundler test-bundler-parallel \
+	test-spec test-syntax-suggest-prepare test-syntax-suggest \
+	test-bundler-prepare test-bundler test-bundler-parallel \
 	test-bundled-gems-precheck test-bundled-gems-fetch \
 	test-bundled-gems-prepare test-bundled-gems-run \
 	)
@@ -88,6 +93,7 @@ prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck
 $(foreach test,$(ORDERED_TEST_TARGETS), \
 	$(eval yes-$(value test) no-$(value test): $(value prev_test)); \
 	$(eval prev_test := $(value test)))
+endif
 
 ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
 install-targets := $(filter install uninstall,$(MAKECMDGOALS))
@@ -264,8 +270,6 @@ HELP_EXTRA_TASKS = \
 	"  update-github:         merge master branch and push it to Pull Request [PR=1234]" \
 	""
 
-extract-gems: $(HAVE_BASERUBY:yes=update-gems)
-
 # 1. squeeze spaces
 # 2. strip and skip comment/empty lines
 # 3. "gem x.y.z URL xxxxxx" -> "gem|x.y.z|xxxxxx|URL"
@@ -282,8 +286,18 @@ bundled-gems := $(shell sed \
 bundled-gems-rev := $(filter-out $(subst |,,$(bundled-gems)),$(bundled-gems))
 bundled-gems := $(filter-out $(bundled-gems-rev),$(bundled-gems))
 
+# calls $(1) with name, version, revision, URL
+foreach-bundled-gems-rev = \
+    $(foreach g,$(bundled-gems-rev),$(call foreach-bundled-gems-rev-0,$(1),$(subst |, ,$(value g))))
+foreach-bundled-gems-rev-0 = \
+    $(call $(1),$(word 1,$(2)),$(word 2,$(2)),$(word 3,$(2)),$(word 4,$(2)))
+bundled-gem-gemfile = $(srcdir)/gems/$(1)-$(2).gem
+bundled-gem-srcdir = $(srcdir)/gems/src/$(1)
+bundled-gem-extracted = $(srcdir)/.bundle/gems/$(1)-$(2)
+
 update-gems: | $(patsubst %,$(srcdir)/gems/%.gem,$(bundled-gems))
-update-gems: | $(foreach g,$(bundled-gems-rev),$(srcdir)/gems/src/$(word 1,$(subst |, ,$(value g))))
+update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-gemfile)
+update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-srcdir)
 
 test-bundler-precheck: | $(srcdir)/.bundle/cache
 
@@ -303,8 +317,7 @@ $(srcdir)/gems/%.gem:
 	    -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})'
 
 extract-gems: | $(patsubst %,$(srcdir)/.bundle/gems/%,$(bundled-gems))
-extract-gems: | $(foreach g,$(bundled-gems-rev), \
-	$(srcdir)/.bundle/gems/$(word 1,$(subst |, ,$(value g)))-$(word 2,$(subst |, ,$(value g))))
+extract-gems: | $(call foreach-bundled-gems-rev,bundled-gem-extracted)
 
 $(srcdir)/.bundle/gems/%: $(srcdir)/gems/%.gem | .bundle/gems
 	$(ECHO) Extracting bundle gem $*...
@@ -329,10 +342,10 @@ $(srcdir)/.bundle/gems/$(1)-$(2): | $(srcdir)/gems/src/$(1) .bundle/gems
 
 endef
 define copy-gem-0
-$(call copy-gem,$(word 1,$(1)),$(word 2,$(1)),$(word 3,$(1)),$(word 4,$(1)))
+$(eval $(call copy-gem,$(1),$(2),$(3),$(4)))
 endef
 
-$(foreach g,$(bundled-gems-rev),$(eval $(call copy-gem-0,$(subst |, ,$(value g)))))
+$(call foreach-bundled-gems-rev,copy-gem-0)
 
 $(srcdir)/gems/src:
 	$(MAKEDIRS) $@
@@ -372,15 +385,22 @@ $(MJIT_MIN_HEADER): $(mjit_min_headers) $(PREP)
 
 endif
 
-ifeq ($(if $(wildcard $(filter-out .,$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES))),,\
-	   $(wildcard $(srcdir)/lib/unicode_normalize/tables.rb)),)
-# Needs the dependency when any Unicode data file exists, or
-# normalization tables script doesn't.  Otherwise, when the target
-# only exists, use it as-is.
-.PHONY: $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
-UNICODE_TABLES_TIMESTAMP =
-$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: \
-	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+.SECONDARY: update-unicode-files
+.SECONDARY: update-unicode-auxiliary-files
+.SECONDARY: update-unicode-ucd-emoji-files
+.SECONDARY: update-unicode-emoji-files
+
+ifeq ($(HAVE_GIT),yes)
+REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && $(GIT) log -1 --format=%H 2>/dev/null)
+else
+REVISION_LATEST := update
+endif
+REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(wildcard $(srcdir)/revision.h revision.h) /dev/null 2>/dev/null)
+ifeq ($(REVISION_IN_HEADER),)
+REVISION_IN_HEADER := none
+endif
+ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
+$(REVISION_H): PHONY
 endif
 
 include $(top_srcdir)/yjit/yjit.mk
diff --git a/defs/id.def b/defs/id.def
index 94af02b12f..ebf00506ea 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -58,6 +58,7 @@ firstline, predefined = __LINE__+1, %[\
   quo
   name
   nil
+  path
 
   _                                                     UScore
 
@@ -75,6 +76,7 @@ firstline, predefined = __LINE__+1, %[\
   "/*NULL*/"                                            NULL
   empty?
   eql?
+  default
   respond_to?                                           Respond_to
   respond_to_missing?                                   Respond_to_missing
   <IFUNC>
diff --git a/dir.c b/dir.c
index a3ea5eea50..3f73f83fc5 100644
--- a/dir.c
+++ b/dir.c
@@ -2305,7 +2305,7 @@ glob_helper(
 #endif
             break;
           case BRACE:
-            if (!recursive) {
+            if (!recursive || strchr(p->str, '/')) {
                 brace = 1;
             }
             break;
@@ -2932,7 +2932,7 @@ dir_globs(VALUE args, VALUE base, int flags)
 static VALUE
 dir_glob_option_base(VALUE base)
 {
-    if (base == Qundef || NIL_P(base)) {
+    if (NIL_OR_UNDEF_P(base)) {
         return Qnil;
     }
 #if USE_OPENDIR_AT
@@ -3343,7 +3343,7 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname)
 
     result = (VALUE)rb_thread_call_without_gvl(nogvl_dir_empty_p, (void *)path,
                                             RUBY_UBF_IO, 0);
-    if (result == Qundef) {
+    if (UNDEF_P(result)) {
         rb_sys_fail_path(orig);
     }
     return result;
diff --git a/dln.c b/dln.c
index b14ba63c44..0edd709bbe 100644
--- a/dln.c
+++ b/dln.c
@@ -41,6 +41,10 @@ static void dln_loaderror(const char *format, ...);
 # include <strings.h>
 #endif
 
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+#endif
+
 #ifndef xmalloc
 void *xmalloc();
 void *xcalloc();
@@ -58,7 +62,7 @@ void *xrealloc();
 #include <sys/stat.h>
 
 #ifndef S_ISDIR
-#   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
 #ifdef HAVE_SYS_PARAM_H
@@ -298,15 +302,15 @@ COMPILER_WARNING_POP
 /* assume others than old Mac OS X have no problem */
 # define dln_disable_dlclose() false
 
-#elif MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11
-/* targeting newer versions only */
-# define dln_disable_dlclose() false
-
 #elif !defined(MAC_OS_X_VERSION_10_11) || \
     (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
 /* targeting older versions only */
 # define dln_disable_dlclose() true
 
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11
+/* targeting newer versions only */
+# define dln_disable_dlclose() false
+
 #else
 /* support both versions, and check at runtime */
 # include <sys/sysctl.h>
diff --git a/doc/.document b/doc/.document
index 5ef2d99651..f589dda07c 100644
--- a/doc/.document
+++ b/doc/.document
@@ -6,3 +6,4 @@ NEWS
 syntax
 optparse
 rdoc
+yjit
diff --git a/doc/ChangeLog-2.3.0 b/doc/ChangeLog-2.3.0
index 629fd9c4ec..94996cffd0 100644
--- a/doc/ChangeLog-2.3.0
+++ b/doc/ChangeLog-2.3.0
@@ -170,7 +170,7 @@ Tue Dec 22 14:31:28 2015  Toru Iwase  <tietew@tietew.net>
 	  should return unfrozen new string.
 	  [ruby-core:72426] [Bug #11858]
 
-Tue Dec 22 05:39:58 2015  Takashi Kokubun  <takashikkbn@gmail.com>
+Tue Dec 22 05:39:58 2015  Takashi Kokubun  <k0kubun@ruby-lang.org>
 
 	* ext/cgi/escape/escape.c (preserve_original_state): Preserve
 	  original state for tainted and frozen.  [Fix GH-1166]
@@ -208,7 +208,7 @@ Mon Dec 21 09:33:17 2015  Karol Bucek  <kares@users.noreply.github.com>
 	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket): fix
 	  NotImplementedError typo.  [Fix GH-1165]
 
-Sun Dec 20 20:54:51 2015  Takashi Kokubun  <takashikkbn@gmail.com>
+Sun Dec 20 20:54:51 2015  Takashi Kokubun  <k0kubun@ruby-lang.org>
 
 	* cgi/escape/escape.c: Optimize CGI.escapeHTML for
 	  ASCII-compatible encodings.  [Fix GH-1164]
@@ -476,7 +476,7 @@ Tue Dec 15 17:57:57 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
 	  to the correct one in the IANA registry (IBM037)
 	  and added an alias (ebcdic-cp-us)
 
-Tue Dec 15 16:19:26 2015  Takashi Kokubun  <takashikkbn@gmail.com>
+Tue Dec 15 16:19:26 2015  Takashi Kokubun  <k0kubun@ruby-lang.org>
 
 	* lib/erb.rb: Render erb with array buffer for function call optimization.
 	  [fix GH-1143]
@@ -488,7 +488,7 @@ Tue Dec 15 13:50:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* string.c (rb_str_oct): [DOC] mention radix indicators.
 	  [ruby-core:71310] [Bug #11648]
 
-Tue Dec 15 12:20:30 2015  Takashi Kokubun  <takashikkbn@gmail.com>
+Tue Dec 15 12:20:30 2015  Takashi Kokubun  <k0kubun@ruby-lang.org>
 
 	* lib/erb.rb: Simplify regexp to optimize erb scanner.
 	  [fix GH-1144]
@@ -2670,7 +2670,7 @@ Sat Nov  7 09:51:38 2015  Koichi Sasada  <ko1@atdot.net>
 	* vm_trace.c (rb_threadptr_exec_event_hooks_orig):
 	  maintain trace_running counter on internal events.
 
-	  This patch is made by Takashi Kokubun <takashikkbn@gmail.com>.
+	  This patch is made by Takashi Kokubun <k0kubun@ruby-lang.org>.
 	  [Bug #11603] https://github.com/ruby/ruby/pull/1059
 
 Sat Nov  7 03:32:27 2015  Koichi Sasada  <ko1@atdot.net>
diff --git a/doc/contributing/building_ruby.md b/doc/contributing/building_ruby.md
index 52d6042ec3..469c9d8361 100644
--- a/doc/contributing/building_ruby.md
+++ b/doc/contributing/building_ruby.md
@@ -6,7 +6,7 @@
 
     * C compiler
     * autoconf - 2.67 or later
-    * bison - 2.0 or later
+    * bison - 3.0 or later
     * gperf - 3.0.3 or later
     * ruby - 2.7 or later
 
@@ -18,6 +18,7 @@
     * libffi
     * libyaml
     * libexecinfo (FreeBSD)
+    * rustc - 1.58.0 or later (if you wish to build [YJIT](/doc/yjit/yjit.md))
 
 3. Checkout the CRuby source code:
 
@@ -25,23 +26,54 @@
     git clone https://github.com/ruby/ruby.git
     ```
 
-4. Generate the configuration files and build. It's generally advisable to use a build directory:
+4. Generate the configure file:
 
     ```
     ./autogen.sh
-    mkdir build && cd build # it's good practice to build outside of source dir
-    mkdir ~/.rubies # we will install to .rubies/ruby-master in our home dir
+    ```
+
+5. Create a `build` directory outside of the source directory:
+
+    ```
+    mkdir build && cd build
+    ```
+
+    While it's not necessary to build in a separate directory, it's good practice to do so.
+
+6. We'll install Ruby in `~/.rubies/ruby-master`, so create the directory:
+
+    ```
+    mkdir ~/.rubies
+    ```
+
+7. Run configure:
+
+    ```
     ../configure --prefix="${HOME}/.rubies/ruby-master"
-    make install
     ```
 
-5. Optional: If you are frequently building Ruby, disabling documentation will reduce the time it takes to `make`:
+    - If you are frequently building Ruby, add the `--disable-install-doc` flag to not build documentation which will speed up the build process.
 
-    ``` shell
-    ../configure --disable-install-doc
+8. Build Ruby:
+
+    ```
+    make install
     ```
 
-6. [Run tests](testing_ruby.md) to confirm your build succeeded
+    - If you're on macOS and installed \OpenSSL through Homebrew, you may encounter failure to build \OpenSSL that look like this:
+
+        ```
+        openssl:
+            Could not be configured. It will not be installed.
+            ruby/ext/openssl/extconf.rb: OpenSSL library could not be found. You might want to use --with-openssl-dir=<dir> option to specify the prefix where OpenSSL is installed.
+            Check ext/openssl/mkmf.log for more details.
+        ```
+
+        Adding `--with-openssl-dir=$(brew --prefix openssl)` to the list of options passed to configure may solve the issue.
+
+        Remember to delete your `build` directory and start again from the configure step.
+
+9. [Run tests](testing_ruby.md) to confirm your build succeeded.
 
 ### Unexplainable Build Errors
 
diff --git a/doc/contributing/documentation_guide.md b/doc/contributing/documentation_guide.md
index 6090928edf..9cfd59d629 100644
--- a/doc/contributing/documentation_guide.md
+++ b/doc/contributing/documentation_guide.md
@@ -137,6 +137,19 @@ or [list](rdoc-ref:RDoc::Markup@Simple+Lists)
 should be preceded by and followed by a blank line.
 This is unnecessary for the HTML output, but helps in the `ri` output.
 
+### \Method Names
+
+For a method name in text:
+
+- For a method in the current class or module,
+  use a double-colon for a singleton method,
+  or a hash mark for an instance method:
+  <tt>::bar</tt>, <tt>#baz</tt>.
+- Otherwise, include the class or module name
+  and use a dot for a singleton method,
+  or a hash mark for an instance method:
+  <tt>Foo.bar</tt>, <tt>Foo#baz</tt>.
+
 ### Auto-Linking
 
 In general, \RDoc's auto-linking should not be suppressed.
@@ -159,8 +172,8 @@ may not render them properly.
 
 ### Tables
 
-Avoid building tables with HTML tags
-(<tt><table></tt>, etc.)
+In particular, avoid building tables with HTML tags
+(<tt><table></tt>, etc.).
 
 Alternatives are:
 
@@ -170,10 +183,8 @@ Alternatives are:
 
 - A {verbatim text block}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks],
   using spaces and punctuation to format the text.
-
-Note that in neither case will
-{text markup}[rdoc-ref:RDoc::MarkupReference@Text+Markup]
-be honored.
+  Note that {text markup}[rdoc-ref:RDoc::MarkupReference@Text+Markup]
+  will not be honored.
 
 ## Documenting Classes and Modules
 
diff --git a/doc/encodings.rdoc b/doc/encodings.rdoc
index c61ab11e9a..1f3c54d740 100644
--- a/doc/encodings.rdoc
+++ b/doc/encodings.rdoc
@@ -467,12 +467,13 @@ These keyword-value pairs specify encoding options:
     with a carriage-return character (<tt>"\r"</tt>).
   - <tt>:crlf_newline: true</tt>: Replace each line-feed character (<tt>"\n"</tt>)
     with a carriage-return/line-feed string (<tt>"\r\n"</tt>).
-  - <tt>:universal_newline: true</tt>: Replace each carriage-return/line-feed string
+  - <tt>:universal_newline: true</tt>: Replace each carriage-return
+    character (<tt>"\r"</tt>) and each carriage-return/line-feed string
     (<tt>"\r\n"</tt>) with a line-feed character (<tt>"\n"</tt>).
 
   Examples:
 
-    s = "\n \r\n"                              # => "\n \r\n"
-    s.encode('ASCII', cr_newline: true)        # => "\r \r\r"
-    s.encode('ASCII', crlf_newline: true)      # => "\r\n \r\r\n"
-    s.encode('ASCII', universal_newline: true) # => "\n \n"
+    s = "\n \r \r\n"                           # => "\n \r \r\n"
+    s.encode('ASCII', cr_newline: true)        # => "\r \r \r\r"
+    s.encode('ASCII', crlf_newline: true)      # => "\r\n \r \r\r\n"
+    s.encode('ASCII', universal_newline: true) # => "\n \n \n"
diff --git a/doc/io_streams.rdoc b/doc/io_streams.rdoc
deleted file mode 100644
index 96285e4f36..0000000000
--- a/doc/io_streams.rdoc
+++ /dev/null
@@ -1,509 +0,0 @@
-== \IO Streams
-
-This page describes:
-
-- {Stream classes}[rdoc-ref:io_streams.rdoc@Stream+Classes].
-- {Pre-existing streams}[rdoc-ref:io_streams.rdoc@Pre-Existing+Streams].
-- {User-created streams}[rdoc-ref:io_streams.rdoc@User-Created+Streams].
-- {Basic \IO}[rdoc-ref:io_streams.rdoc@Basic+IO], including:
-
-  - {Position}[rdoc-ref:io_streams.rdoc@Position].
-  - {Open and closed streams}[rdoc-ref:io_streams.rdoc@Open+and+Closed+Streams].
-  - {End-of-stream}[rdoc-ref:io_streams.rdoc@End-of-Stream].
-
-- {Line \IO}[rdoc-ref:io_streams.rdoc@Line+IO], including:
-
-  - {Line separator}[rdoc-ref:io_streams.rdoc@Line+Separator].
-  - {Line limit}[rdoc-ref:io_streams.rdoc@Line+Limit].
-  - {Line number}[rdoc-ref:io_streams.rdoc@Line+Number].
-  - {Line options}[rdoc-ref:io_streams.rdoc@Line+Options].
-
-- {Character \IO}[rdoc-ref:io_streams.rdoc@Character+IO].
-- {Byte \IO}[rdoc-ref:io_streams.rdoc@Byte+IO].
-- {Codepoint \IO}[rdoc-ref:io_streams.rdoc@Codepoint+IO].
-
-=== Stream Classes
-
-Ruby supports processing data as \IO streams;
-that is, as data that may be read, re-read, written, re-written,
-and traversed via iteration.
-
-Core classes with such support include:
-
-- IO, and its derived class File.
-- {StringIO}[rdoc-ref:StringIO]: for processing a string.
-- {ARGF}[rdoc-ref:ARGF]: for processing files cited on the command line.
-
-Except as noted, the instance methods described on this page
-are available in classes \ARGF, \File, \IO, and \StringIO.
-A few, also noted, are available in class \Kernel.
-
-=== Pre-Existing Streams
-
-Pre-existing streams that are referenced by constants include:
-
-- $stdin: read-only instance of \IO.
-- $stdout: write-only instance of \IO.
-- $stderr: read-only instance of \IO.
-- \ARGF: read-only instance of \ARGF.
-
-=== User-Created Streams
-
-You can create streams:
-
-- \File:
-
-  - File.new: returns a new \File object;
-    the file should be closed when no longer needed.
-  - File.open: passes a new \File object to given the block;
-    the file is automatically closed on block exit.
-
-- \IO:
-
-  - IO.new: returns a new \IO object for the given integer file descriptor;
-    the \IO object should be closed when no longer needed.
-  - IO.open: passes a new \IO object to the given block;
-    the \IO object is automatically closed on block exit.
-  - IO.popen: returns a new \IO object that is connected to the $stdin
-    and $stdout of a newly-launched subprocess.
-  - Kernel#open: returns a new \IO object connected to a given source:
-    stream, file, or subprocess;
-    the \IO object should be closed when no longer needed.
-
-- \StringIO:
-
-  - StringIO.new: returns a new \StringIO object;
-    the \StringIO object should be closed when no longer needed.
-  - StringIO.open: passes a new \StringIO object to the given block;
-    the \StringIO object is automatically closed on block exit.
-
-(You cannot create an \ARGF object, but one already exists.)
-
-=== About the Examples
-
-Many examples here use these variables:
-
-  :include: doc/examples/files.rdoc
-
-=== Basic \IO
-
-You can perform basic stream \IO with these methods:
-
-- IO#read: Returns all remaining or the next _n_ bytes read from the stream,
-  for a given _n_:
-
-    f = File.new('t.txt')
-    f.read     # => "First line\nSecond line\n\nFourth line\nFifth line\n"
-    f.rewind
-    f.read(30) # => "First line\r\nSecond line\r\n\r\nFou"
-    f.read(30) # => "rth line\r\nFifth line\r\n"
-    f.read(30) # => nil
-    f.close
-
-- IO#write: Writes one or more given strings to the stream:
-
-    $stdout.write('Hello', ', ', 'World!', "\n") # => 14
-    $stdout.write('foo', :bar, 2, "\n")
-
-  Output:
-
-    Hello, World!
-    foobar2
-
-==== Position
-
-An \IO stream has a nonnegative integer _position_,
-which is the byte offset at which the next read or write is to occur;
-the relevant methods:
-
-- IO#tell (aliased as +#pos+):
-  Returns the current position (in bytes) in the stream:
-
-    f = File.new('t.txt')
-    f.tell # => 0
-    f.gets # => "First line\n"
-    f.tell # => 12
-    f.close
-
-- IO#pos=: Sets the position of the stream (in bytes):
-
-    f = File.new('t.txt')
-    f.tell     # => 0
-    f.pos = 20 # => 20
-    f.tell     # => 20
-    f.close
-
-- IO#seek: Sets the position of the stream to a given integer +offset+
-  (in bytes), with respect to a given constant +whence+, which is one of:
-
-  - +:CUR+ or <tt>IO::SEEK_CUR</tt>:
-    Repositions the stream to its current position plus the given +offset+:
-
-      f = File.new('t.txt')
-      f.tell            # => 0
-      f.seek(20, :CUR)  # => 0
-      f.tell            # => 20
-      f.seek(-10, :CUR) # => 0
-      f.tell            # => 10
-      f.close
-
-  - +:END+ or <tt>IO::SEEK_END</tt>:
-    Repositions the stream to its end plus the given +offset+:
-
-      f = File.new('t.txt')
-      f.tell            # => 0
-      f.seek(0, :END)   # => 0  # Repositions to stream end.
-      f.tell            # => 52
-      f.seek(-20, :END) # => 0
-      f.tell            # => 32
-      f.seek(-40, :END) # => 0
-      f.tell            # => 12
-      f.close
-
-  - +:SET+ or <tt>IO:SEEK_SET</tt>:
-    Repositions the stream to the given +offset+:
-
-      f = File.new('t.txt')
-      f.tell            # => 0
-      f.seek(20, :SET) # => 0
-      f.tell           # => 20
-      f.seek(40, :SET) # => 0
-      f.tell           # => 40
-      f.close
-
-- IO#rewind: Positions the stream to the beginning:
-
-    f = File.new('t.txt')
-    f.tell     # => 0
-    f.gets     # => "First line\n"
-    f.tell     # => 12
-    f.rewind   # => 0
-    f.tell     # => 0
-    f.close
-
-==== Open and Closed Streams
-
-A new \IO stream may be open for reading, open for writing, or both.
-
-You can close a stream using these methods:
-
-- IO#close: Closes the stream for both reading and writing.
-- IO#close_read (not in \ARGF): Closes the stream for reading.
-- IO#close_write (not in \ARGF): Closes the stream for writing.
-
-You can query whether a stream is closed using this method:
-
-- IO#closed?: Returns whether the stream is closed.
-
-==== End-of-Stream
-
-You can query whether a stream is positioned at its end using
-method IO#eof? (also aliased as +#eof+).
-
-You can reposition to end-of-stream by reading all stream content:
-
-  f = File.new('t.txt')
-  f.eof? # => false
-  f.read # => "First line\nSecond line\n\nFourth line\nFifth line\n"
-  f.eof? # => true
-
-Or by using method IO#seek:
-
-  f = File.new('t.txt')
-  f.eof? # => false
-  f.seek(0, :END)
-  f.eof? # => true
-
-=== Line \IO
-
-You can read an \IO stream line-by-line using these methods:
-
-- IO#each_line: Passes each line to the block:
-
-    f = File.new('t.txt')
-    f.each_line {|line| p line }
-
-  Output:
-
-    "First line\n"
-    "Second line\n"
-    "\n"
-    "Fourth line\n"
-    "Fifth line\n"
-
-  The reading may begin mid-line:
-
-    f = File.new('t.txt')
-    f.pos = 27
-    f.each_line {|line| p line }
-
-  Output:
-
-    "rth line\n"
-    "Fifth line\n"
-
-- IO#gets (also in Kernel): Returns the next line (which may begin mid-line):
-
-    f = File.new('t.txt')
-    f.gets      # => "First line\n"
-    f.gets      # => "Second line\n"
-    f.pos = 27
-    f.gets      # => "rth line\n"
-    f.readlines # => ["Fifth line\n"]
-    f.gets      # => nil
-
-- IO#readline (also in Kernel; not in StringIO):
-  Like #gets, but raises an exception at end-of-stream.
-
-- IO#readlines (also in Kernel): Returns all remaining lines in an array;
-  may begin mid-line:
-
-    f = File.new('t.txt')
-    f.pos = 19
-    f.readlines # => ["ine\n", "\n", "Fourth line\n", "Fifth line\n"]
-    f.readlines # => []
-
-Each of these reader methods may be called with:
-
-- An optional line separator, +sep+.
-- An optional line-size limit, +limit+.
-- Both +sep+ and +limit+.
-
-You can write to an \IO stream line-by-line using this method:
-
-- IO#puts (also in Kernel; not in \StringIO): Writes objects to the stream:
-
-    f = File.new('t.tmp', 'w')
-    f.puts('foo', :bar, 1, 2.0, Complex(3, 0))
-    f.flush
-    File.read('t.tmp') # => "foo\nbar\n1\n2.0\n3+0i\n"
-
-==== Line Separator
-
-The default line separator is the given by the global variable <tt>$/</tt>,
-whose value is by default <tt>"\n"</tt>.
-The line to be read next is all data from the current position
-to the next line separator:
-
-  f = File.new('t.txt')
-  f.gets # => "First line\n"
-  f.gets # => "Second line\n"
-  f.gets # => "\n"
-  f.gets # => "Fourth line\n"
-  f.gets # => "Fifth line\n"
-  f.close
-
-You can specify a different line separator:
-
-  f = File.new('t.txt')
-  f.gets('l')   # => "First l"
-  f.gets('li')  # => "ine\nSecond li"
-  f.gets('lin') # => "ne\n\nFourth lin"
-  f.gets        # => "e\n"
-  f.close
-
-There are two special line separators:
-
-- +nil+: The entire stream is read into a single string:
-
-    f = File.new('t.txt')
-    f.gets(nil) # => "First line\nSecond line\n\nFourth line\nFifth line\n"
-    f.close
-
-- <tt>''</tt> (the empty string): The next "paragraph" is read
-  (paragraphs being separated by two consecutive line separators):
-
-    f = File.new('t.txt')
-    f.gets('') # => "First line\nSecond line\n\n"
-    f.gets('') # => "Fourth line\nFifth line\n"
-    f.close
-
-==== Line Limit
-
-The line to be read may be further defined by an optional integer argument +limit+,
-which specifies that the number of bytes returned may not be (much) longer
-than the given +limit+;
-a multi-byte character will not be split, and so a line may be slightly longer
-than the given limit.
-
-If +limit+ is not given, the line is determined only by +sep+.
-
-  # Text with 1-byte characters.
-  File.new('t.txt') {|f| f.gets(1) }  # => "F"
-  File.new('t.txt') {|f| f.gets(2) }  # => "Fi"
-  File.new('t.txt') {|f| f.gets(3) }  # => "Fir"
-  File.new('t.txt') {|f| f.gets(4) }  # => "Firs"
-  # No more than one line.
-  File.new('t.txt') {|f| f.gets(10) } # => "First line"
-  File.new('t.txt') {|f| f.gets(11) } # => "First line\n"
-  File.new('t.txt') {|f| f.gets(12) } # => "First line\n"
-
-  # Text with 2-byte characters, which will not be split.
-  File.new('r.rus') {|f| f.gets(1).size } # => 1
-  File.new('r.rus') {|f| f.gets(2).size } # => 1
-  File.new('r.rus') {|f| f.gets(3).size } # => 2
-  File.new('r.rus') {|f| f.gets(4).size } # => 2
-
-==== Line Separator and Line Limit
-
-With arguments +sep+ and +limit+ given,
-combines the two behaviors:
-
-- Returns the next line as determined by line separator +sep+.
-- But returns no more bytes than are allowed by the limit.
-
-Example:
-
-  File.new('t.txt') {|f| f.gets('li', 20) } # => "First li"
-  File.new('t.txt') {|f| f.gets('li', 2) }  # => "Fi"
-
-==== Line Number
-
-A readable \IO stream has a _line_ _number_,
-which is the non-negative integer line number
-in the stream where the next read will occur.
-
-A new stream is initially has line number +0+.
-
-\Method IO#lineno returns the line number.
-
-Reading lines from a stream usually changes its line number:
-
-  f = File.new('t.txt', 'r')
-  f.lineno   # => 0
-  f.readline # => "This is line one.\n"
-  f.lineno   # => 1
-  f.readline # => "This is the second line.\n"
-  f.lineno   # => 2
-  f.readline # => "Here's the third line.\n"
-  f.lineno   # => 3
-  f.eof?     # => true
-  f.close
-
-Iterating over lines in a stream usually changes its line number:
-
-  File.open('t.txt') do |f|
-    f.each_line do |line|
-      p "position=#{f.pos} eof?=#{f.eof?} lineno=#{f.lineno}"
-    end
-  end
-
-Output:
-
-  "position=11 eof?=false lineno=1"
-  "position=23 eof?=false lineno=2"
-  "position=24 eof?=false lineno=3"
-  "position=36 eof?=false lineno=4"
-  "position=47 eof?=true lineno=5"
-
-==== Line Options
-
-A number of \IO methods accept optional keyword arguments
-that determine how lines in a stream are to be treated:
-
-- +:chomp+: If +true+, line separators are omitted; default is +false+.
-
-=== Character \IO
-
-You can process an \IO stream character-by-character using these methods:
-
-- IO#getc: Reads and returns the next character from the stream:
-
-    f = File.new('t.rus')
-    f.getc # => "т"
-    f.getc # => "е"
-    f.getc # => "с"
-    f.getc # => "т"
-    f.getc # => nil
-
-- IO#readchar (not in \StringIO):
-  Like #getc, but raises an exception at end-of-stream:
-
-    f.readchar # Raises EOFError.
-
-- IO#ungetc (not in \ARGF):
-  Pushes back ("unshifts") a character or integer onto the stream:
-
-    path = 't.tmp'
-    File.write(path, 'foo')
-    File.open(path) do |f|
-      f.ungetc('т')
-      f.read # => "тfoo"
-    end
-
-- IO#putc (also in Kernel): Writes a character to the stream:
-
-    File.open('t.tmp', 'w') do |f|
-      f.putc('т')
-      f.putc('е')
-      f.putc('с')
-      f.putc('т')
-    end
-    File.read('t.tmp') # => "тест"
-
-- IO#each_char: Reads each remaining character in the stream,
-  passing the character to the given block:
-
-    File.open('t.rus') do |f|
-      f.pos = 4
-      f.each_char {|c| p c }
-    end
-
-  Output:
-
-    "с"
-    "т"
-
-=== Byte \IO
-
-You can process an \IO stream byte-by-byte using these methods:
-
-- IO#getbyte: Returns the next 8-bit byte as an integer in range 0..255:
-
-    File.read('t.dat')
-    # => "\xFE\xFF\x99\x90\x99\x91\x99\x92\x99\x93\x99\x94"
-    File.read('t.dat')
-    # => "\xFE\xFF\x99\x90\x99\x91\x99\x92\x99\x93\x99\x94"
-    f = File.new('t.dat')
-    f.getbyte # => 254
-    f.getbyte # => 255
-    f.seek(-2, :END)
-    f.getbyte # => 153
-    f.getbyte # => 148
-    f.getbyte # => nil
-
-- IO#readbyte (not in \StringIO):
-  Like #getbyte, but raises an exception if at end-of-stream:
-
-    f.readbyte # Raises EOFError.
-
-- IO#ungetbyte (not in \ARGF):
-  Pushes back ("unshifts") a byte back onto the stream:
-
-    f.ungetbyte(0)
-    f.ungetbyte(01)
-    f.read # => "\u0001\u0000"
-
-- IO#each_byte: Reads each remaining byte in the stream,
-  passing the byte to the given block:
-
-    f.seek(-4, :END)
-    f.each_byte {|b| p b }
-
-  Output:
-
-    153
-    147
-    153
-    148
-
-=== Codepoint \IO
-
-You can process an \IO stream codepoint-by-codepoint using method
-+#each_codepoint+:
-
-  a = []
-  File.open('t.rus') do |f|
-    f.each_codepoint {|c| a << c }
-  end
-  a # => [1090, 1077, 1089, 1090]
diff --git a/doc/mjit.md b/doc/mjit.md
deleted file mode 100644
index 9622a3bc26..0000000000
--- a/doc/mjit.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# MJIT
-
-This document has some tips that might be useful when you work on MJIT.
-
-## Supported platforms
-
-The following platforms are either tested on CI or assumed to work.
-
-* OS: Linux, macOS
-* Arch: x86\_64, aarch64, arm64, i686, i386
-
-### Not supported
-
-The MJIT support for the following platforms is no longer maintained.
-
-* OS: Windows (mswin, MinGW), Solaris
-* Arch: SPARC, s390x
-
-### Architectures
-
-## Bindgen
-
-If you see an "MJIT bindgen" GitHub Actions failure, please commit the `git diff` shown on the failed job.
-
-Refer to the following instructions for doing the same thing locally.
-Similar to `make yjit-bindgen`, `make mjit-bindgen` requires libclang.
-See also: [mjit-bindgen.yml](../.github/workflows/mjit-bindgen.yml)
-
-macOS seems to have libclang by default, but I'm not sure how to deal with 32bit architectures.
-For now, you may generate c\_64.rb with a 64bit binary, and then manually modify c\_32.rb accordingly.
-
-### x86\_64-linux
-
-```sh
-sudo apt install \
-  build-essential \
-  libssl-dev libyaml-dev libreadline6-dev \
-  zlib1g-dev libncurses5-dev libffi-dev \
-  libclang1
-./autogen.sh
-./configure --enable-yjit=dev_nodebug --disable-install-doc
-make -j
-make mjit-bindgen
-```
-
-### i686-linux
-
-```sh
-sudo dpkg --add-architecture i386
-sudo apt install \
-  crossbuild-essential:i386 \
-  libssl-dev:i386 libyaml-dev:i386 libreadline6-dev:i386 \
-  zlib1g-dev:i386 libncurses5-dev:i386 libffi-dev:i386 \
-  libclang1:i386
-./autogen.sh
-./configure --disable-install-doc
-make -j
-make mjit-bindgen
-```
-
-Note that you cannot run x86\_64 bindgen with an i686 binary, and vice versa.
-Also, when you install libclang1:i386, libclang1 will be uninstalled.
-You can have only either of these at a time.
-
-## Local development
-
-### Always run make install
-
-Always run `make install` before running MJIT. It could easily cause a SEGV if you don't.
-MJIT looks for the installed header for security reasons.
-
-### --mjit-debug vs --mjit-debug=-ggdb3
-
-`--mjit-debug=[flags]` allows you to specify arbitrary flags while keeping other compiler flags like `-O3`,
-which is useful for profiling benchmarks.
-
-`--mjit-debug` alone, on the other hand, disables `-O3` and adds debug flags.
-If you're debugging MJIT, what you need to use is not `--mjit-debug=-ggdb3` but `--mjit-debug`.
diff --git a/doc/mjit/mjit.md b/doc/mjit/mjit.md
new file mode 100644
index 0000000000..6f19ab3ea7
--- /dev/null
+++ b/doc/mjit/mjit.md
@@ -0,0 +1,39 @@
+# MJIT
+
+This document has some tips that might be useful when you work on MJIT.
+
+## Supported platforms
+
+The following platforms are either tested on CI or assumed to work.
+
+* OS: Linux, macOS
+* Arch: x86\_64, aarch64, arm64, i686, i386
+
+### Not supported
+
+The MJIT support for the following platforms is no longer maintained.
+
+* OS: Windows (mswin, MinGW), Solaris
+* Arch: SPARC, s390x
+
+## Developing MJIT
+
+### Bindgen
+
+If you see an "MJIT bindgen" GitHub Actions failure, please commit the `git diff` shown on the failed job.
+
+For doing the same thing locally, run `make mjit-bindgen` after installing libclang.
+macOS seems to have libclang by default. On Ubuntu, you can install it with `apt install libclang1`.
+
+### Always run make install
+
+Always run `make install` before running MJIT. It could easily cause a SEGV if you don't.
+MJIT looks for the installed header for security reasons.
+
+### --mjit-debug vs --mjit-debug=-ggdb3
+
+`--mjit-debug=[flags]` allows you to specify arbitrary flags while keeping other compiler flags like `-O3`,
+which is useful for profiling benchmarks.
+
+`--mjit-debug` alone, on the other hand, disables `-O3` and adds debug flags.
+If you're debugging MJIT, what you need to use is not `--mjit-debug=-ggdb3` but `--mjit-debug`.
diff --git a/doc/net-http/examples.rdoc b/doc/net-http/examples.rdoc
new file mode 100644
index 0000000000..c1366e7ad1
--- /dev/null
+++ b/doc/net-http/examples.rdoc
@@ -0,0 +1,31 @@
+Examples here assume that <tt>net/http</tt> has been required
+(which also requires +uri+):
+
+  require 'net/http'
+
+Many code examples here use these example websites:
+
+- https://jsonplaceholder.typicode.com.
+- http://example.com.
+
+Some examples also assume these variables:
+
+  uri = URI('https://jsonplaceholder.typicode.com/')
+  uri.freeze # Examples may not modify.
+  hostname = uri.hostname # => "jsonplaceholder.typicode.com"
+  path = uri.path         # => "/"
+  port = uri.port         # => 443
+
+So that example requests may be written as:
+
+  Net::HTTP.get(uri)
+  Net::HTTP.get(hostname, '/index.html')
+  Net::HTTP.start(hostname) do |http|
+    http.get('/todos/1')
+    http.get('/todos/2')
+  end
+
+An example that needs a modified URI first duplicates +uri+, then modifies the duplicate:
+
+  _uri = uri.dup
+  _uri.path = '/todos/1'
diff --git a/doc/net-http/included_getters.rdoc b/doc/net-http/included_getters.rdoc
new file mode 100644
index 0000000000..7ac327f4b4
--- /dev/null
+++ b/doc/net-http/included_getters.rdoc
@@ -0,0 +1,3 @@
+This class also includes (indirectly) module Net::HTTPHeader,
+which gives access to its
+{methods for getting headers}[rdoc-ref:Net::HTTPHeader@Getters].
diff --git a/doc/packed_data.rdoc b/doc/packed_data.rdoc
new file mode 100644
index 0000000000..ec13b24c69
--- /dev/null
+++ b/doc/packed_data.rdoc
@@ -0,0 +1,590 @@
+== Packed \Data
+
+Certain Ruby core methods deal with packing and unpacking data:
+
+- \Method Array#pack:
+  Formats each element in array +self+ into a binary string;
+  returns that string.
+- \Method String#unpack:
+  Extracts data from string +self+,
+  forming objects that become the elements of a new array;
+  returns that array.
+- \Method String#unpack1:
+  Does the same, but unpacks and returns only the first extracted object.
+
+Each of these methods accepts a string +template+,
+consisting of zero or more _directive_ characters,
+each followed by zero or more _modifier_ characters.
+
+Examples (directive <tt>'C'</tt> specifies 'unsigned character'):
+
+  [65].pack('C')      # => "A"  # One element, one directive.
+  [65, 66].pack('CC') # => "AB" # Two elements, two directives.
+  [65, 66].pack('C')  # => "A"  # Extra element is ignored.
+  [65].pack('')       # => ""   # No directives.
+  [65].pack('CC')               # Extra directive raises ArgumentError.
+
+  'A'.unpack('C')   # => [65]      # One character, one directive.
+  'AB'.unpack('CC') # => [65, 66]  # Two characters, two directives.
+  'AB'.unpack('C')  # => [65]      # Extra character is ignored.
+  'A'.unpack('CC')  # => [65, nil] # Extra directive generates nil.
+  'AB'.unpack('')   # => []        # No directives.
+
+The string +template+ may contain any mixture of valid directives
+(directive <tt>'c'</tt> specifies 'signed character'):
+
+  [65, -1].pack('cC')  # => "A\xFF"
+  "A\xFF".unpack('cC') # => [65, 255]
+
+The string +template+ may contain whitespace (which is ignored)
+and comments, each of which begins with character <tt>'#'</tt>
+and continues up to and including the next following newline:
+
+  [0,1].pack("  C  #foo \n  C  ")    # => "\x00\x01"
+  "\0\1".unpack("  C  #foo \n  C  ") # => [0, 1]
+
+Any directive may be followed by either of these modifiers:
+
+- <tt>'*'</tt> - The directive is to be applied as many times as needed:
+
+    [65, 66].pack('C*') # => "AB"
+    'AB'.unpack('C*')   # => [65, 66]
+
+- Integer +count+ - The directive is to be applied +count+ times:
+
+    [65, 66].pack('C2') # => "AB"
+    [65, 66].pack('C3') # Raises ArgumentError.
+    'AB'.unpack('C2')   # => [65, 66]
+    'AB'.unpack('C3')   # => [65, 66, nil]
+
+  Note: Directives in <tt>%w[A a Z m]</tt> use +count+ differently;
+  see {String Directives}[rdoc-ref:packed_data.rdoc@String+Directives].
+
+If elements don't fit the provided directive, only least significant bits are encoded:
+
+    [257].pack("C").unpack("C") # => [1]
+
+=== Packing \Method
+
+\Method Array#pack accepts optional keyword argument
++buffer+ that specifies the target string (instead of a new string):
+
+  [65, 66].pack('C*', buffer: 'foo') # => "fooAB"
+
+The method can accept a block:
+
+  # Packed string is passed to the block.
+  [65, 66].pack('C*') {|s| p s }    # => "AB"
+
+=== Unpacking Methods
+
+Methods String#unpack and String#unpack1 each accept
+an optional keyword argument +offset+ that specifies an offset
+into the string:
+
+  'ABC'.unpack('C*', offset: 1)  # => [66, 67]
+  'ABC'.unpack1('C*', offset: 1) # => 66
+
+Both methods can accept a block:
+
+  # Each unpacked object is passed to the block.
+  ret = []
+  "ABCD".unpack("C*") {|c| ret << c }
+  ret # => [65, 66, 67, 68]
+
+  # The single unpacked object is passed to the block.
+  'AB'.unpack1('C*') {|ele| p ele } # => 65
+
+=== \Integer Directives
+
+Each integer directive specifies the packing or unpacking
+for one element in the input or output array.
+
+==== 8-Bit \Integer Directives
+
+- <tt>'c'</tt> - 8-bit signed integer
+  (like C <tt>signed char</tt>):
+
+    [0, 1, 255].pack('c*')  # => "\x00\x01\xFF"
+    s = [0, 1, -1].pack('c*') # => "\x00\x01\xFF"
+    s.unpack('c*') # => [0, 1, -1]
+
+- <tt>'C'</tt> - 8-bit signed integer
+  (like C <tt>unsigned char</tt>):
+
+    [0, 1, 255].pack('C*')    # => "\x00\x01\xFF"
+    s = [0, 1, -1].pack('C*') # => "\x00\x01\xFF"
+    s.unpack('C*')            # => [0, 1, 255]
+
+==== 16-Bit \Integer Directives
+
+- <tt>'s'</tt> - 16-bit signed integer, native-endian
+  (like C <tt>int16_t</tt>):
+
+    [513, -514].pack('s*')      # => "\x01\x02\xFE\xFD"
+    s = [513, 65022].pack('s*') # => "\x01\x02\xFE\xFD"
+    s.unpack('s*')              # => [513, -514]
+
+- <tt>'S'</tt> - 16-bit unsigned integer, native-endian
+  (like C <tt>uint16_t</tt>):
+
+    [513, -514].pack('S*')      # => "\x01\x02\xFE\xFD"
+    s = [513, 65022].pack('S*') # => "\x01\x02\xFE\xFD"
+    s.unpack('S*')              # => [513, 65022]
+
+- <tt>'n'</tt> - 16-bit network integer, big-endian:
+
+    s = [0, 1, -1, 32767, -32768, 65535].pack('n*')
+    # => "\x00\x00\x00\x01\xFF\xFF\x7F\xFF\x80\x00\xFF\xFF"
+    s.unpack('n*')
+    # => [0, 1, 65535, 32767, 32768, 65535]
+
+- <tt>'v'</tt> - 16-bit VAX integer, little-endian:
+
+    s = [0, 1, -1, 32767, -32768, 65535].pack('v*')
+    # => "\x00\x00\x01\x00\xFF\xFF\xFF\x7F\x00\x80\xFF\xFF"
+    s.unpack('v*')
+    # => [0, 1, 65535, 32767, 32768, 65535]
+
+==== 32-Bit \Integer Directives
+
+- <tt>'l'</tt> - 32-bit signed integer, native-endian
+  (like C <tt>int32_t</tt>):
+
+    s = [67305985, -50462977].pack('l*')
+    # => "\x01\x02\x03\x04\xFF\xFE\xFD\xFC"
+    s.unpack('l*')
+    # => [67305985, -50462977]
+
+- <tt>'L'</tt> - 32-bit unsigned integer, native-endian
+  (like C <tt>uint32_t</tt>):
+
+    s = [67305985, 4244504319].pack('L*')
+    # => "\x01\x02\x03\x04\xFF\xFE\xFD\xFC"
+    s.unpack('L*')
+    # => [67305985, 4244504319]
+
+- <tt>'N'</tt> - 32-bit network integer, big-endian:
+
+    s = [0,1,-1].pack('N*')
+    # => "\x00\x00\x00\x00\x00\x00\x00\x01\xFF\xFF\xFF\xFF"
+    s.unpack('N*')
+    # => [0, 1, 4294967295]
+
+- <tt>'V'</tt> - 32-bit VAX integer, little-endian:
+
+    s = [0,1,-1].pack('V*')
+    # => "\x00\x00\x00\x00\x01\x00\x00\x00\xFF\xFF\xFF\xFF"
+    s.unpack('v*')
+    # => [0, 0, 1, 0, 65535, 65535]
+
+==== 64-Bit \Integer Directives
+
+- <tt>'q'</tt> - 64-bit signed integer, native-endian
+  (like C <tt>int64_t</tt>):
+
+    s = [578437695752307201, -506097522914230529].pack('q*')
+    # => "\x01\x02\x03\x04\x05\x06\a\b\xFF\xFE\xFD\xFC\xFB\xFA\xF9\xF8"
+    s.unpack('q*')
+    # => [578437695752307201, -506097522914230529]
+
+- <tt>'Q'</tt> - 64-bit unsigned integer, native-endian
+  (like C <tt>uint64_t</tt>):
+
+    s = [578437695752307201, 17940646550795321087].pack('Q*')
+    # => "\x01\x02\x03\x04\x05\x06\a\b\xFF\xFE\xFD\xFC\xFB\xFA\xF9\xF8"
+    s.unpack('Q*')
+    # => [578437695752307201, 17940646550795321087]
+
+==== Platform-Dependent \Integer Directives
+
+- <tt>'i'</tt> - Platform-dependent width signed integer,
+  native-endian (like C <tt>int</tt>):
+
+    s = [67305985, -50462977].pack('i*')
+    # => "\x01\x02\x03\x04\xFF\xFE\xFD\xFC"
+    s.unpack('i*')
+    # => [67305985, -50462977]
+
+- <tt>'I'</tt> - Platform-dependent width unsigned integer,
+  native-endian (like C <tt>unsigned int</tt>):
+
+    s = [67305985, -50462977].pack('I*')
+    # => "\x01\x02\x03\x04\xFF\xFE\xFD\xFC"
+    s.unpack('I*')
+    # => [67305985, 4244504319]
+
+==== Pointer Directives
+
+- <tt>'j'</tt> - 64-bit pointer-width signed integer,
+  native-endian (like C <tt>intptr_t</tt>):
+
+    s = [67305985, -50462977].pack('j*')
+    # => "\x01\x02\x03\x04\x00\x00\x00\x00\xFF\xFE\xFD\xFC\xFF\xFF\xFF\xFF"
+    s.unpack('j*')
+    # => [67305985, -50462977]
+
+- <tt>'j'</tt> - 64-bit pointer-width unsigned integer,
+  native-endian (like C <tt>uintptr_t</tt>):
+
+    s = [67305985, 4244504319].pack('J*')
+    # => "\x01\x02\x03\x04\x00\x00\x00\x00\xFF\xFE\xFD\xFC\x00\x00\x00\x00"
+    s.unpack('J*')
+    # => [67305985, 4244504319]
+
+==== Other \Integer Directives
+:
+- <tt>'U'</tt> - UTF-8 character:
+
+    s = [4194304].pack('U*')
+    # => "\xF8\x90\x80\x80\x80"
+    s.unpack('U*')
+    # => [4194304]
+
+- <tt>'w'</tt> - BER-encoded integer
+  (see {BER enocding}[https://en.wikipedia.org/wiki/X.690#BER_encoding]):
+
+    s = [1073741823].pack('w*')
+    # => "\x83\xFF\xFF\xFF\x7F"
+    s.unpack('w*')
+    # => [1073741823]
+
+==== Modifiers for \Integer Directives
+
+For directives in
+<tt>'i'</tt>,
+<tt>'I'</tt>,
+<tt>'s'</tt>,
+<tt>'S'</tt>,
+<tt>'l'</tt>,
+<tt>'L'</tt>,
+<tt>'q'</tt>,
+<tt>'Q'</tt>,
+<tt>'j'</tt>, and
+<tt>'J'</tt>,
+these modifiers may be suffixed:
+
+- <tt>'!'</tt> or <tt>'_'</tt> - Underlying platform’s native size.
+- <tt>'>'</tt> - Big-endian.
+- <tt>'<'</tt> - Little-endian.
+
+=== \Float Directives
+
+Each float directive specifies the packing or unpacking
+for one element in the input or output array.
+
+==== Single-Precision \Float Directives
+
+- <tt>'F'</tt> or <tt>'f'</tt> - Native format:
+
+    s = [3.0].pack('F') # => "\x00\x00@@"
+    s.unpack('F')       # => [3.0]
+
+- <tt>'e'</tt> - Little-endian:
+
+    s = [3.0].pack('e') # => "\x00\x00@@"
+    s.unpack('e')       # => [3.0]
+
+- <tt>'g'</tt> - Big-endian:
+
+    s = [3.0].pack('g') # => "@@\x00\x00"
+    s.unpack('g')       # => [3.0]
+
+==== Double-Precision \Float Directives
+
+- <tt>'D'</tt> or <tt>'d'</tt> - Native format:
+
+    s = [3.0].pack('D') # => "\x00\x00\x00\x00\x00\x00\b@"
+    s.unpack('D')       # => [3.0]
+
+- <tt>'E'</tt> - Little-endian:
+
+    s = [3.0].pack('E') # => "\x00\x00\x00\x00\x00\x00\b@"
+    s.unpack('E')       # => [3.0]
+
+- <tt>'G'</tt> - Big-endian:
+
+    s = [3.0].pack('G') # => "@\b\x00\x00\x00\x00\x00\x00"
+    s.unpack('G')       # => [3.0]
+
+A float directive may be infinity or not-a-number:
+
+  inf = 1.0/0.0                  # => Infinity
+  [inf].pack('f')                # => "\x00\x00\x80\x7F"
+  "\x00\x00\x80\x7F".unpack('f') # => [Infinity]
+
+  nan = inf/inf                  # => NaN
+  [nan].pack('f')                # => "\x00\x00\xC0\x7F"
+  "\x00\x00\xC0\x7F".unpack('f') # => [NaN]
+
+=== \String Directives
+
+Each string directive specifies the packing or unpacking
+for one byte in the input or output string.
+
+==== Binary \String Directives
+
+- <tt>'A'</tt> - Arbitrary binary string (space padded; count is width);
+  +nil+ is treated as the empty string:
+
+    ['foo'].pack('A')    # => "f"
+    ['foo'].pack('A*')   # => "foo"
+    ['foo'].pack('A2')   # => "fo"
+    ['foo'].pack('A4')   # => "foo "
+    [nil].pack('A')      # => " "
+    [nil].pack('A*')     # => ""
+    [nil].pack('A2')     # => "  "
+    [nil].pack('A4')     # => "    "
+
+    "foo\0".unpack('A')      # => ["f"]
+    "foo\0".unpack('A4')     # => ["foo"]
+    "foo\0bar".unpack('A10') # => ["foo\x00bar"] # Reads past "\0".
+    "foo ".unpack('A')       # => ["f"]
+    "foo ".unpack('A4')      # => ["foo"]
+    "foo".unpack('A4')       # => ["foo"]
+
+    russian = "\u{442 435 441 442}" # => "тест"
+    russian.size         # => 4
+    russian.bytesize     # => 8
+    [russian].pack('A')  # => "\xD1"
+    [russian].pack('A*') # => "\xD1\x82\xD0\xB5\xD1\x81\xD1\x82"
+    russian.unpack('A')  # => ["\xD1"]
+    russian.unpack('A2') # => ["\xD1\x82"]
+    russian.unpack('A4') # => ["\xD1\x82\xD0\xB5"]
+    russian.unpack('A*') # => ["\xD1\x82\xD0\xB5\xD1\x81\xD1\x82"]
+
+- <tt>'a'</tt> - Arbitrary binary string (null padded; count is width):
+
+    ["foo"].pack('a')    # => "f"
+    ["foo"].pack('a*')   # => "foo"
+    ["foo"].pack('a2')   # => "fo"
+    ["foo\0"].pack('a4') # => "foo\x00"
+    [nil].pack('a')      # => "\x00"
+    [nil].pack('a*')     # => ""
+    [nil].pack('a2')     # => "\x00\x00"
+    [nil].pack('a4')     # => "\x00\x00\x00\x00"
+
+    "foo\0".unpack('a')     # => ["f"]
+    "foo\0".unpack('a4')    # => ["foo\x00"]
+    "foo ".unpack('a4')     # => ["foo "]
+    "foo".unpack('a4')      # => ["foo"]
+    "foo\0bar".unpack('a4') # => ["foo\x00"] # Reads past "\0".
+
+- <tt>'Z'</tt> - Same as <tt>'a'</tt>,
+  except that null is added or ignored with <tt>'*'</tt>:
+
+    ["foo"].pack('Z*')   # => "foo\x00"
+    [nil].pack('Z*')     # => "\x00"
+
+    "foo\0".unpack('Z*')    # => ["foo"]
+    "foo".unpack('Z*')      # => ["foo"]
+    "foo\0bar".unpack('Z*') # => ["foo"] # Does not read past "\0".
+
+==== Bit \String Directives
+
+- <tt>'B'</tt> - Bit string (high byte first):
+
+    ['11111111' + '00000000'].pack('B*') # => "\xFF\x00"
+    ['10000000' + '01000000'].pack('B*') # => "\x80@"
+
+    ['1'].pack('B0') # => ""
+    ['1'].pack('B1') # => "\x80"
+    ['1'].pack('B2') # => "\x80\x00"
+    ['1'].pack('B3') # => "\x80\x00"
+    ['1'].pack('B4') # => "\x80\x00\x00"
+    ['1'].pack('B5') # => "\x80\x00\x00"
+    ['1'].pack('B6') # => "\x80\x00\x00\x00"
+
+    "\xff\x00".unpack("B*") # => ["1111111100000000"]
+    "\x01\x02".unpack("B*") # => ["0000000100000010"]
+
+    "".unpack("B0")     # => [""]
+    "\x80".unpack("B1") # => ["1"]
+    "\x80".unpack("B2") # => ["10"]
+    "\x80".unpack("B3") # => ["100"]
+
+- <tt>'b'</tt> - Bit string (low byte first):
+
+    ['11111111' + '00000000'].pack('b*') # => "\xFF\x00"
+    ['10000000' + '01000000'].pack('b*') # => "\x01\x02"
+
+    ['1'].pack('b0') # => ""
+    ['1'].pack('b1') # => "\x01"
+    ['1'].pack('b2') # => "\x01\x00"
+    ['1'].pack('b3') # => "\x01\x00"
+    ['1'].pack('b4') # => "\x01\x00\x00"
+    ['1'].pack('b5') # => "\x01\x00\x00"
+    ['1'].pack('b6') # => "\x01\x00\x00\x00"
+
+    "\xff\x00".unpack("b*") # => ["1111111100000000"]
+    "\x01\x02".unpack("b*") # => ["1000000001000000"]
+
+    "".unpack("b0")     # => [""]
+    "\x01".unpack("b1") # => ["1"]
+    "\x01".unpack("b2") # => ["10"]
+    "\x01".unpack("b3") # => ["100"]
+
+==== Hex \String Directives
+
+- <tt>'H'</tt> - Hex string (high nibble first):
+
+    ['10ef'].pack('H*')    # => "\x10\xEF"
+    ['10ef'].pack('H0')    # => ""
+    ['10ef'].pack('H3')    # => "\x10\xE0"
+    ['10ef'].pack('H5')    # => "\x10\xEF\x00"
+
+    ['fff'].pack('H3')    # => "\xFF\xF0"
+    ['fff'].pack('H4')    # => "\xFF\xF0"
+    ['fff'].pack('H5')    # => "\xFF\xF0\x00"
+    ['fff'].pack('H6')    # => "\xFF\xF0\x00"
+    ['fff'].pack('H7')    # => "\xFF\xF0\x00\x00"
+    ['fff'].pack('H8')    # => "\xFF\xF0\x00\x00"
+
+    "\x10\xef".unpack('H*')    # => ["10ef"]
+    "\x10\xef".unpack('H0')    # => [""]
+    "\x10\xef".unpack('H1')    # => ["1"]
+    "\x10\xef".unpack('H2')    # => ["10"]
+    "\x10\xef".unpack('H3')    # => ["10e"]
+    "\x10\xef".unpack('H4')    # => ["10ef"]
+    "\x10\xef".unpack('H5')    # => ["10ef"]
+
+- <tt>'h'</tt> - Hex string (low nibble first):
+
+    ['10ef'].pack('h*') # => "\x01\xFE"
+    ['10ef'].pack('h0') # => ""
+    ['10ef'].pack('h3') # => "\x01\x0E"
+    ['10ef'].pack('h5') # => "\x01\xFE\x00"
+
+    ['fff'].pack('h3') # => "\xFF\x0F"
+    ['fff'].pack('h4') # => "\xFF\x0F"
+    ['fff'].pack('h5') # => "\xFF\x0F\x00"
+    ['fff'].pack('h6') # => "\xFF\x0F\x00"
+    ['fff'].pack('h7') # => "\xFF\x0F\x00\x00"
+    ['fff'].pack('h8') # => "\xFF\x0F\x00\x00"
+
+    "\x01\xfe".unpack('h*') # => ["10ef"]
+    "\x01\xfe".unpack('h0') # => [""]
+    "\x01\xfe".unpack('h1') # => ["1"]
+    "\x01\xfe".unpack('h2') # => ["10"]
+    "\x01\xfe".unpack('h3') # => ["10e"]
+    "\x01\xfe".unpack('h4') # => ["10ef"]
+    "\x01\xfe".unpack('h5') # => ["10ef"]
+
+==== Pointer \String Directives
+
+- <tt>'P'</tt> - Pointer to a structure (fixed-length string):
+
+    s = ['abc'].pack('P')  # => "\xE0O\x7F\xE5\xA1\x01\x00\x00"
+    s.unpack('P*')         # => ["abc"]
+    ".".unpack("P")        # => []
+    ("\0" * 8).unpack("P") # => [nil]
+    [nil].pack("P")        # => "\x00\x00\x00\x00\x00\x00\x00\x00"
+
+- <tt>'p'</tt> - Pointer to a null-terminated string:
+
+    s = ['abc'].pack('p')  # => "(\xE4u\xE5\xA1\x01\x00\x00"
+    s.unpack('p*')         # => ["abc"]
+    ".".unpack("p")        # => []
+    ("\0" * 8).unpack("p") # => [nil]
+    [nil].pack("p")        # => "\x00\x00\x00\x00\x00\x00\x00\x00"
+
+==== Other \String Directives
+
+- <tt>'M'</tt> - Quoted printable, MIME encoding;
+  text mode, but input must use LF and output LF;
+  (see {RFC 2045}[https://www.ietf.org/rfc/rfc2045.txt]):
+
+    ["a b c\td \ne"].pack('M') # => "a b c\td =\n\ne=\n"
+    ["\0"].pack('M')           # => "=00=\n"
+
+    ["a"*1023].pack('M') == ("a"*73+"=\n")*14+"a=\n"     # => true
+    ("a"*73+"=\na=\n").unpack('M') == ["a"*74]           # => true
+    (("a"*73+"=\n")*14+"a=\n").unpack('M') == ["a"*1023] # => true
+
+    "a b c\td =\n\ne=\n".unpack('M')    # => ["a b c\td \ne"]
+    "=00=\n".unpack('M')    # => ["\x00"]
+
+    "pre=31=32=33after".unpack('M') # => ["pre123after"]
+    "pre=\nafter".unpack('M')       # => ["preafter"]
+    "pre=\r\nafter".unpack('M')     # => ["preafter"]
+    "pre=".unpack('M')              # => ["pre="]
+    "pre=\r".unpack('M')            # => ["pre=\r"]
+    "pre=hoge".unpack('M')          # => ["pre=hoge"]
+    "pre==31after".unpack('M')      # => ["pre==31after"]
+    "pre===31after".unpack('M')     # => ["pre===31after"]
+
+- <tt>'m'</tt> - Base64 encoded string;
+  count specifies input bytes between each newline,
+  rounded down to nearest multiple of 3;
+  if count is zero, no newlines are added;
+  (see {RFC 4648}[https://www.ietf.org/rfc/rfc4648.txt]):
+
+    [""].pack('m')             # => ""
+    ["\0"].pack('m')           # => "AA==\n"
+    ["\0\0"].pack('m')         # => "AAA=\n"
+    ["\0\0\0"].pack('m')       # => "AAAA\n"
+    ["\377"].pack('m')         # => "/w==\n"
+    ["\377\377"].pack('m')     # => "//8=\n"
+    ["\377\377\377"].pack('m') # => "////\n"
+
+    "".unpack('m')       # => [""]
+    "AA==\n".unpack('m') # => ["\x00"]
+    "AAA=\n".unpack('m') # => ["\x00\x00"]
+    "AAAA\n".unpack('m') # => ["\x00\x00\x00"]
+    "/w==\n".unpack('m') # => ["\xFF"]
+    "//8=\n".unpack('m') # => ["\xFF\xFF"]
+    "////\n".unpack('m') # => ["\xFF\xFF\xFF"]
+    "A\n".unpack('m')    # => [""]
+    "AA\n".unpack('m')   # => ["\x00"]
+    "AA=\n".unpack('m')  # => ["\x00"]
+    "AAA\n".unpack('m')  # => ["\x00\x00"]
+
+    [""].pack('m0')             # => ""
+    ["\0"].pack('m0')           # => "AA=="
+    ["\0\0"].pack('m0')         # => "AAA="
+    ["\0\0\0"].pack('m0')       # => "AAAA"
+    ["\377"].pack('m0')         # => "/w=="
+    ["\377\377"].pack('m0')     # => "//8="
+    ["\377\377\377"].pack('m0') # => "////"
+
+    "".unpack('m0')     # => [""]
+    "AA==".unpack('m0') # => ["\x00"]
+    "AAA=".unpack('m0') # => ["\x00\x00"]
+    "AAAA".unpack('m0') # => ["\x00\x00\x00"]
+    "/w==".unpack('m0') # => ["\xFF"]
+    "//8=".unpack('m0') # => ["\xFF\xFF"]
+    "////".unpack('m0') # => ["\xFF\xFF\xFF"]
+
+- <tt>'u'</tt> - UU-encoded string:
+
+    [0].pack("U")          # => "\u0000"
+    [0x3fffffff].pack("U") # => "\xFC\xBF\xBF\xBF\xBF\xBF"
+    [0x40000000].pack("U") # => "\xFD\x80\x80\x80\x80\x80"
+    [0x7fffffff].pack("U") # => "\xFD\xBF\xBF\xBF\xBF\xBF"
+
+=== Offset Directives
+
+- <tt>'@'</tt> - Begin packing at the given byte offset;
+  for packing, null fill if necessary:
+
+    [1, 2].pack("C@0C") # => "\x02"
+    [1, 2].pack("C@1C") # => "\x01\x02"
+    [1, 2].pack("C@5C") # => "\x01\x00\x00\x00\x00\x02"
+
+    "\x01\x00\x00\x02".unpack("C@3C") # => [1, 2]
+    "\x00".unpack("@1C")              # => [nil]
+
+- <tt>'X'</tt> - Back up a byte:
+
+    [0, 1, 2].pack("CCXC")    # => "\x00\x02"
+    [0, 1, 2].pack("CCX2C")   # => "\x02"
+    "\x00\x02".unpack("CCXC") # => [0, 2, 2]
+
+=== Null Byte Direcive
+
+- <tt>'x'</tt> - Null byte:
+
+    [].pack("x0")                # => ""
+    [].pack("x")                 # => "\x00"
+    [].pack("x8")                # => "\x00\x00\x00\x00\x00\x00\x00\x00"
+    "\x00\x00\x02".unpack("CxC") # => [0, 2]
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index a7e2a0786e..92c7ecf66e 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -28,7 +28,7 @@ Specifically, <tt>/st/</tt> requires that the string contains the letter
 _s_ followed by the letter _t_, so it matches _haystack_, also.
 
 Note that any Regexp matching will raise a RuntimeError if timeout is set and
-exceeded. See "Timeout" section in detail.
+exceeded. See {"Timeout"}[#label-Timeout] section in detail.
 
 == \Regexp Interpolation
 
@@ -781,7 +781,7 @@ with <i>a{0,29}</i>:
 
 == Timeout
 
-There are two APIs to set timeout. One is Timeout.timeout=, which is
+There are two APIs to set timeout. One is Regexp.timeout=, which is
 process-global configuration of timeout for Regexp matching.
 
     Regexp.timeout = 3
@@ -796,6 +796,6 @@ The other is timeout keyword of Regexp.new.
 
 When using Regexps to process untrusted input, you should use the timeout
 feature to avoid excessive backtracking. Otherwise, a malicious user can
-provide input to Regexp causing Denail-of-Service attack.
+provide input to Regexp causing Denial-of-Service attack.
 Note that the timeout is not set by default because an appropriate limit
 highly depends on an application requirement and context.
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
index 5e10e6a140..b641433249 100644
--- a/doc/syntax/literals.rdoc
+++ b/doc/syntax/literals.rdoc
@@ -277,6 +277,12 @@ the content.  Note that empty lines and lines consisting solely of literal tabs
 and spaces will be ignored for the purposes of determining indentation, but
 escaped tabs and spaces are considered non-indentation characters.
 
+For the purpose of measuring an indentation, a horizontal tab is regarded as a
+sequence of one to eight spaces such that the column position corresponding to
+its end is a multiple of eight.  The amount to be removed is counted in terms
+of the number of spaces.  If the boundary appears in the middle of a tab, that
+tab is not removed.
+
 A heredoc allows interpolation and escaped characters.  You may disable
 interpolation and escaping by surrounding the opening identifier with single
 quotes:
diff --git a/doc/yjit/yjit.md b/doc/yjit/yjit.md
index c2521eba42..67b2ffa5f0 100644
--- a/doc/yjit/yjit.md
+++ b/doc/yjit/yjit.md
@@ -8,16 +8,20 @@
 YJIT - Yet Another Ruby JIT
 ===========================
 
-**DISCLAIMER: Please note that this project is experimental. It is very much a work in progress, it may cause your software to crash, and current performance results will vary widely, especially on larger applications.**
-
 YJIT is a lightweight, minimalistic Ruby JIT built inside CRuby.
-It lazily compiles code using a Basic Block Versioning (BBV) architecture. The target use case is that of servers running
-Ruby on Rails, an area where MJIT has not yet managed to deliver speedups.
-To simplify development, we currently support only macOS and Linux on x86-64, but an ARM64 backend
-is part of future plans.
+It lazily compiles code using a Basic Block Versioning (BBV) architecture.
+The target use case is that of servers running Ruby on Rails.
+YJIT is currently supported for macOS, Linux and BSD on x86-64 and arm64/aarch64 CPUs.
 This project is open source and falls under the same license as CRuby.
 
+<p align="center"><b>
+    If you're using YJIT in production, please
+    <a href="mailto:maxime.chevalierboisvert@shopify.com">share your success stories with us!</a>
+ </b></p>
+
 If you wish to learn more about the approach taken, here are some conference talks and publications:
+- RubyKaigi 2022 keynote: [Stories from developing YJIT](https://www.youtube.com/watch?v=EMchdR9C8XM)
+- RubyKaigi 2022 talk: [Building a Lightweight IR and Backend for YJIT](https://www.youtube.com/watch?v=BbLGqTxTRp0)
 - RubyKaigi 2021 talk: [YJIT: Building a New JIT Compiler Inside CRuby](https://www.youtube.com/watch?v=PBVLf3yfMs8)
 - Blog post: [YJIT: Building a New JIT Compiler Inside CRuby](https://pointersgonewild.com/2021/06/02/yjit-building-a-new-jit-compiler-inside-cruby/)
 - VMIL 2021 paper: [YJIT: A Basic Block Versioning JIT Compiler for CRuby](https://dl.acm.org/doi/10.1145/3486606.3486781)
@@ -27,28 +31,31 @@ If you wish to learn more about the approach taken, here are some conference tal
 - ECOOP 2015 talk: [Simple and Effective Type Check Removal through Lazy Basic Block Versioning](https://www.youtube.com/watch?v=S-aHBuoiYE0)
 - ECOOP 2015 paper: [Simple and Effective Type Check Removal through Lazy Basic Block Versioning](https://arxiv.org/pdf/1411.0352.pdf)
 
-To cite this repository in your publications, please use this bibtex snippet:
-
-```
-@misc{yjit_ruby_jit,
-  author = {Chevalier-Boisvert, Maxime and Wu, Alan and Patterson, Aaron},
-  title = {YJIT - Yet Another Ruby JIT},
-  year = {2021},
-  publisher = {GitHub},
-  journal = {GitHub repository},
-  howpublished = {\url{https://github.com/Shopify/yjit}},
+To cite YJIT in your publications, please cite the VMIL 2021 paper:
+
+```
+@inproceedings{yjit_vmil2021,
+author = {Chevalier-Boisvert, Maxime and Gibbs, Noah and Boussier, Jean and Wu, Si Xing (Alan) and Patterson, Aaron and Newton, Kevin and Hawthorn, John},
+title = {YJIT: A Basic Block Versioning JIT Compiler for CRuby},
+year = {2021},
+isbn = {9781450391092},
+publisher = {Association for Computing Machinery},
+address = {New York, NY, USA},
+url = {https://doi.org/10.1145/3486606.3486781},
+doi = {10.1145/3486606.3486781},
+booktitle = {Proceedings of the 13th ACM SIGPLAN International Workshop on Virtual Machines and Intermediate Languages},
+pages = {25–32},
+numpages = {8},
+keywords = {ruby, dynamically typed, compiler, optimization, just-in-time, bytecode},
+location = {Chicago, IL, USA},
+series = {VMIL 2021}
 }
 ```
 
 ## Current Limitations
 
-YJIT is a work in progress and as such may not yet be mature enough for mission-critical software. Below is a list of known limitations, all of which we plan to eventually address:
-
-- No garbage collection for generated code.
-- Currently supports only macOS and Linux.
-- Supports x86-64 and arm64/aarch64 CPUs only.
-
-Because there is no GC for generated code yet, your software could run out of executable memory if it is large enough. You can change how much executable memory is allocated using [YJIT's command-line options](#command-line-options).
+YJIT may not be suitable for certain applications. It currently only supports macOS and Linux on x86-64 and arm64/aarch64 CPUs. YJIT will use more memory than the Ruby interpreter because the JIT compiler needs to generate machine code in memory and maintain additional state information.
+You can change how much executable memory is allocated using [YJIT's command-line options](#command-line-options). There is a slight performance tradeoff because allocating less executable memory could result in the generated machine code being collected more often.
 
 ## Installation
 
@@ -58,7 +65,7 @@ You will need to install:
 - A C compiler such as GCC or Clang
 - GNU Make and Autoconf
 - The Rust compiler `rustc` and Cargo (if you want to build in dev/debug mode)
-  - The Rust version must be [>= 1.58.1](../../yjit/Cargo.toml).
+  - The Rust version must be [>= 1.58.0](../../yjit/Cargo.toml).
 
 To install the Rust build toolchain, we suggest following the [recommended installation method][rust-install]. Rust also provides first class [support][editor-tools] for many source code editors.
 
@@ -69,51 +76,62 @@ To install the Rust build toolchain, we suggest following the [recommended insta
 
 Start by cloning the `ruby/ruby` repository:
 
-```
+```sh
 git clone https://github.com/ruby/ruby yjit
 cd yjit
 ```
 
-The YJIT `ruby` binary can be built with either GCC or Clang. It can be built either in dev (debug) mode or in release mode. For maximum performance, compile YJIT in release mode with GCC. More detailed build instructions are provided in the [Ruby README](https://github.com/ruby/ruby#how-to-compile-and-install).
+The YJIT `ruby` binary can be built with either GCC or Clang. It can be built either in dev (debug) mode or in release mode. For maximum performance, compile YJIT in release mode with GCC. More detailed build instructions are provided in the [Ruby README](https://github.com/ruby/ruby#how-to-build).
 
-```
+```sh
 # Configure in release mode for maximum performance, build and install
 ./autogen.sh
 ./configure --enable-yjit --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc
-make -j install
+make -j && make install
 ```
 
 or
 
-```
-# Configure in dev (debug) mode for development, build and install
+```sh
+# Configure in lower-performance dev (debug) mode for development, build and install
 ./autogen.sh
 ./configure --enable-yjit=dev --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc
-make -j install
+make -j && make install
 ```
 
-On macOS, you may need to specify where to find some libraries:
+Dev mode includes extended YJIT statistics, but can be slow. For only statistics you can configure in stats mode:
 
+```sh
+# Configure in extended-stats mode without slow runtime checks, build and install
+./autogen.sh
+./configure --enable-yjit=stats --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc
+make -j && make install
 ```
+
+On macOS, you may need to specify where to find some libraries:
+
+```sh
 # Install dependencies
 brew install openssl readline libyaml
 
 # Configure in dev (debug) mode for development, build and install
 ./autogen.sh
 ./configure --enable-yjit=dev --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc --with-opt-dir="$(brew --prefix openssl):$(brew --prefix readline):$(brew --prefix libyaml)"
-make -j install
+make -j && make install
 ```
 
 Typically configure will choose the default C compiler. To specify the C compiler, use
-```
+
+```sh
 # Choosing a specific c compiler
 export CC=/path/to/my/chosen/c/compiler
 ```
+
 before running `./configure`.
 
 You can test that YJIT works correctly by running:
 
-```
+```sh
 # Quick tests found in /bootstraptest
 make btest
 
@@ -128,71 +146,111 @@ make -j test-all
 Once YJIT is built, you can either use `./miniruby` from within your build directory, or switch to the YJIT version of `ruby`
 by using the `chruby` tool:
 
-```
+```sh
 chruby ruby-yjit
 ruby myscript.rb
 ```
 
 You can dump statistics about compilation and execution by running YJIT with the `--yjit-stats` command-line option:
 
-```
+```sh
 ./miniruby --yjit-stats myscript.rb
 ```
 
 The machine code generated for a given method can be printed by adding `puts RubyVM::YJIT.disasm(method(:method_name))` to a Ruby script. Note that no code will be generated if the method is not compiled.
 
-
 ### Command-Line Options
 
 YJIT supports all command-line options supported by upstream CRuby, but also adds a few YJIT-specific options:
 
 - `--yjit`: enable YJIT (disabled by default)
-- `--yjit-call-threshold=N`: number of calls after which YJIT begins to compile a function (default 2)
-- `--yjit-exec-mem-size=N`: size of the executable memory block to allocate, in MiB (default 256 MiB)
-- `--yjit-stats`: produce statistics after the execution of a program (must compile with `cppflags=-DRUBY_DEBUG` to use this)
-- `--yjit-max-versions=N`: maximum number of versions to generate per basic block (default 4)
-- `--yjit-greedy-versioning`: greedy versioning mode (disabled by default, may increase code size)
+- `--yjit-call-threshold=N`: number of calls after which YJIT begins to compile a function (default 30)
+- `--yjit-exec-mem-size=N`: size of the executable memory block to allocate, in MiB (default 64 MiB)
+- `--yjit-stats`: print statistics after the execution of a program (incurs a run-time cost)
+- `--yjit-trace-exits`: produce a Marshal dump of backtraces from specific exits. Automatically enables `--yjit-stats`
+
+Note that there is also an environment variable `RUBY_YJIT_ENABLE` which can be used to enable YJIT.
+This can be useful for some deployment scripts where specifying an extra command-line option to Ruby is not practical.
 
 ### Benchmarking
 
 We have collected a set of benchmarks and implemented a simple benchmarking harness in the [yjit-bench](https://github.com/Shopify/yjit-bench) repository. This benchmarking harness is designed to disable CPU frequency scaling, set process affinity and disable address space randomization so that the variance between benchmarking runs will be as small as possible. Please kindly note that we are at an early stage in this project.
 
-### Performance Tips
+## Performance Tips for Production Deployments
+
+While YJIT options default to what we think would work well for most workloads,
+they might not necessarily be the best configuration for your application.
+
+This section covers tips on improving YJIT performance in case YJIT does not
+speed up your application in production.
+
+### Increasing --yjit-exec-mem-size
+
+When JIT code size (`RubyVM::YJIT.runtime_stats[:code_region_size]`) reaches this value,
+YJIT triggers "code GC" that frees all JIT code and starts recompiling everything.
+Compiling code takes some time, so scheduling code GC too frequently slows down your application.
+Increasing `--yjit-exec-mem-size` may speed up your application if `RubyVM::YJIT.runtime_stats[:code_gc_count]` is not 0 or 1.
+
+### Running workers as long as possible
+
+It's helpful to call the same code as many times as possible before a process restarts.
+If a process is killed too frequently, the time taken for compiling methods may outweigh
+the speedup obtained by compiling them.
+
+You should monitor the number of requests each process has served.
+If you're periodically killing worker processes, e.g. with `unicorn-worker-killer` or `puma_worker_killer`,
+you may want to reduce the killing frequency or increase the limit.
+
+## Saving YJIT Memory Usage
 
-This section contains tips on writing Ruby code that will run as fast as possible on YJIT. Some of this advice is based on current limitations of YJIT, while other advice is broadly applicable. It probably won't be practical to apply these tips everywhere in your codebase, but you can profile your code using a tool such as [stackprof](https://github.com/tmm1/stackprof) and refactor the specific methods that make up the largest fractions of the execution time.
+YJIT allocates memory for JIT code and metadata. Enabling YJIT generally results in more memory usage.
 
-- Use exceptions for error recovery only, not as part of normal control-flow
+This section goes over tips on minimizing YJIT memory usage in case it uses more than your capacity.
+
+### Increasing --yjit-call-threshold
+
+As of Ruby 3.2, `--yjit-call-threshold` defaults to 30. With this default, some applications end up
+compiling methods that are used only during the application boot. Increasing this option may help
+you reduce the size of JIT code and metadata. It's worth trying different values like `--yjit-call-threshold=100`.
+
+Note that increasing the value too much may result in compiling code too late.
+You should monitor how many requests each worker processes before it's restarted. For example,
+if each process only handles 1000 requests, `--yjit-call-threshold=1000` might be too large for your application.
+
+### Decreasing --yjit-exec-mem-size
+
+`--yjit-exec-mem-size` specifies the JIT code size, but YJIT also uses memory for its metadata,
+which often consumes more memory than JIT code. Generally, YJIT adds memory overhead by roughly
+3-4x of `--yjit-exec-mem-size` in production as of Ruby 3.2. You should multiply that by the number
+of worker processes to estimate the worst case memory overhead.
+
+Running code GC adds overhead, but it could be still faster than recovering from a whole process killed by OOM.
+
+## Code Optimization Tips
+
+This section contains tips on writing Ruby code that will run as fast as possible on YJIT. Some of this advice is based on current limitations of YJIT, while other advice is broadly applicable. It probably won't be practical to apply these tips everywhere in your codebase. You should ideally start by profiling your application using a tool such as [stackprof](https://github.com/tmm1/stackprof) so that you can determine which methods make up most of the execution time. You can then refactor the specific methods that make up the largest fractions of the execution time. We do not recommend modifying your entire codebase based on the current limitations of YJIT.
+
+- Avoid using `OpenStruct`
 - Avoid redefining basic integer operations (i.e. +, -, <, >, etc.)
 - Avoid redefining the meaning of `nil`, equality, etc.
 - Avoid allocating objects in the hot parts of your code
-- Use while loops if you can, instead of `integer.times`
 - Minimize layers of indirection
   - Avoid classes that wrap objects if you can
   - Avoid methods that just call another method, trivial one liner methods
-- CRuby method calls are costly. Favor larger methods over smaller methods.
 - Try to write code so that the same variables always have the same type
+- Use `while` loops if you can, instead of C methods like `Array#each`
+  - This is not idiomatic Ruby, but could help in hot methods
+- CRuby method calls are costly. Avoid things such as methods that only return a value from a hash or return a constant.
 
-You can also compile YJIT in debug mode and use the `--yjit-stats` command-line option to see which bytecodes cause YJIT to exit, and refactor your code to avoid using these instructions in the hottest methods of your code.
-
-### Memory Statistics
-
-YJIT, including in production configuration, keeps track of the size of generated code. If you check YJIT.runtime_stats you can see them:
-
-```
-$ RUBYOPT="--yjit" irb
-irb(main):001:0> RubyVM::YJIT.runtime_stats
-=> {:inline_code_size=>331945, :outlined_code_size=>272980}
-```
-
-These are the size in bytes of generated inlined code and generated outlined code. If the combined sizes for generated code are very close to the total YJIT exec-mem-size (see above), YJIT will stop generating code once the limit is reached. Try to make sure you have enough exec-mem-size for the program you're running. By default YJIT will allocate 268,435,456 bytes (256 MiB) of space for generated inlined and outlined code.
+You can also use the `--yjit-stats` command-line option to see which bytecodes cause YJIT to exit, and refactor your code to avoid using these instructions in the hottest methods of your code.
 
 ### Other Statistics
 
-If you compile Ruby with RUBY_DEBUG and/or YJIT_STATS defined and run with "--yjit --yjit-stats", YJIT will track and return performance statistics in RubyVM::YJIT.runtime_stats.
+If you run `ruby` with `--yjit --yjit-stats`, YJIT will track and return performance statistics in `RubyVM::YJIT.runtime_stats`.
 
-```
+```rb
 $ RUBYOPT="--yjit --yjit-stats" irb
-irb(main):001:0> YJIT.runtime_stats
+irb(main):001:0> RubyVM::YJIT.runtime_stats
 =>
 {:inline_code_size=>340745,
  :outlined_code_size=>297664,
@@ -206,16 +264,24 @@ irb(main):001:0> YJIT.runtime_stats
 
 Some of the counters include:
 
-:exec_instruction - how many Ruby bytecode instructions have been executed
-:binding_allocations - number of bindings allocated
-:binding_set - number of variables set via a binding
-:vm_insns_count - number of instructions executed by the Ruby interpreter
-:compiled_iseq_count - number of bytecode sequences compiled
+* :exec_instruction - how many Ruby bytecode instructions have been executed
+* :binding_allocations - number of bindings allocated
+* :binding_set - number of variables set via a binding
+* :code_gc_count - number of garbage collections of compiled code since process start
+* :vm_insns_count - number of instructions executed by the Ruby interpreter
+* :compiled_iseq_count - number of bytecode sequences compiled
+* :inline_code_size - size in bytes of compiled YJIT blocks
+* :outline_code_size - size in bytes of YJIT error-handling compiled code
+* :side_exit_count - number of side exits taken at runtime
+* :total_exit_count - number of exits, including side exits, taken at runtime
+* :avg_len_in_yjit - avg. number of instructions in compiled blocks before exiting to interpreter
 
 Counters starting with "exit_" show reasons for YJIT code taking a side exit (return to the interpreter.) See yjit_hacking.md for more details.
 
 Performance counter names are not guaranteed to remain the same between Ruby versions. If you're curious what one does, it's usually best to search the source code for it &mdash; but it may change in a later Ruby version.
 
+The printed text after a --yjit-stats run includes other information that may be named differently than the information in runtime_stats.
+
 ## Contributing
 
 We welcome open source contributors. You should feel free to open new issues to report bugs or just to ask questions.
@@ -243,8 +309,6 @@ The YJIT source code is divided between:
 - `yjit/src/options.rs`: handling of command-line options
 - `yjit/bindgen/src/main.rs`: C bindings exposed to the Rust codebase through bindgen
 - `yjit/src/cruby.rs`: C bindings manually exposed to the Rust codebase
-- `misc/test_yjit_asm.sh`: script to compile and run the in-memory assembler tests
-- `misc/yjit_asm_tests.c`: tests for the in-memory assembler
 
 The core of CRuby's interpreter logic is found in:
 - `insns.def`: defines Ruby's bytecode instructions (gets compiled into `vm.inc`)
@@ -275,38 +339,38 @@ There are 3 test suites:
 
 The tests can be run in parallel like this:
 
-```
+```sh
 make -j test-all RUN_OPTS="--yjit-call-threshold=1"
 ```
 
 Or single-threaded like this, to more easily identify which specific test is failing:
 
-```
+```sh
 make test-all TESTOPTS=--verbose RUN_OPTS="--yjit-call-threshold=1"
 ```
 
 To debug a single test in `test-all`:
 
-```
+```sh
 make test-all TESTS='test/-ext-/marshal/test_usrmarshal.rb' RUNRUBYOPT=--debugger=lldb RUN_OPTS="--yjit-call-threshold=1"
 ```
 
 You can also run one specific test in `btest`:
 
-```
+```sh
 make btest BTESTS=bootstraptest/test_ractor.rb RUN_OPTS="--yjit-call-threshold=1"
 ```
 
 There are shortcuts to run/debug your own test/repro in `test.rb`:
 
-```
+```sh
 make run  # runs ./miniruby test.rb
 make lldb # launches ./miniruby test.rb in lldb
 ```
 
 You can use the Intel syntax for disassembly in LLDB, keeping it consistent with YJIT's disassembly:
 
-```
+```sh
 echo "settings set target.x86-disassembly-flavor intel" >> ~/.lldbinit
 ```
 
@@ -317,7 +381,7 @@ instructions below, but there are a few caveats listed further down.
 
 First, install Rosetta:
 
-```
+```sh
 $ softwareupdate --install-rosetta
 ```
 
@@ -325,13 +389,13 @@ Now any command can be run with Rosetta via the `arch` command line tool.
 
 Then you can start your shell in an x86 environment:
 
-```
+```sh
 $ arch -x86_64 zsh
 ```
 
 You can double check your current architecture via the `arch` command:
 
-```
+```sh
 $ arch -x86_64 zsh
 $ arch
 i386
@@ -339,7 +403,7 @@ i386
 
 You may need to set the default target for `rustc` to x86-64, e.g.
 
-```
+```sh
 $ rustup default stable-x86_64-apple-darwin
 ```
 
diff --git a/enc/Makefile.in b/enc/Makefile.in
index dd8ca1b528..9d0c367134 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -51,7 +51,7 @@ optflags = @optflags@
 debugflags = @debugflags@
 warnflags = @warnflags@
 CCDLFLAGS = @CCDLFLAGS@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir) @incflags@
 DEFS = @DEFS@
 CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
 LDFLAGS = @LDFLAGS@
diff --git a/enc/cesu_8.c b/enc/cesu_8.c
index decbb928f4..75f62df280 100644
--- a/enc/cesu_8.c
+++ b/enc/cesu_8.c
@@ -42,6 +42,8 @@
 #define VALID_CODE_LIMIT  0x0010ffff
 
 #define utf8_islead(c)     ((UChar )((c) & 0xc0) != 0x80)
+#define utf16_is_high_surrogate(v) ((v >> 10) == 0x36)
+#define utf16_is_low_surrogate(v)  ((v >> 10) == 0x37)
 
 static const int EncLen_CESU8[] = {
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -283,6 +285,12 @@ is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc)
   return 0;
 }
 
+static int
+utf8_decode_3byte_sequence(const UChar* p)
+{
+    return ((p[0] & 0xF) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
+}
+
 static OnigCodePoint
 mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
 {
@@ -295,11 +303,11 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
     case 2:
       return ((p[0] & 0x1F)  << 6) | (p[1] & 0x3f);
     case 3:
-      return ((p[0] & 0xF) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
+      return utf8_decode_3byte_sequence(p);
     case 6:
       {
-          int high = ((p[0] & 0xF) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
-          int low  = ((p[3] & 0xF) << 12) | ((p[4] & 0x3f) << 6) | (p[5] & 0x3f);
+          int high = utf8_decode_3byte_sequence(p);
+          int low  = utf8_decode_3byte_sequence(p + 3);
           return ((high & 0x03ff) << 10) + (low & 0x03ff) + 0x10000;
       }
   }
@@ -410,7 +418,6 @@ get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out,
   return onigenc_unicode_ctype_code_range(ctype, ranges);
 }
 
-
 static UChar*
 left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
 {
@@ -420,6 +427,14 @@ left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, Onig
   p = s;
 
   while (!utf8_islead(*p) && p > start) p--;
+
+  if (p > start && s - p == 2 && utf16_is_low_surrogate(utf8_decode_3byte_sequence(p))) {
+    const UChar *p_surrogate_pair = p - 1;
+    while (!utf8_islead(*p_surrogate_pair) && p_surrogate_pair > start) p_surrogate_pair--;
+    if (p - p_surrogate_pair == 3 && utf16_is_high_surrogate(utf8_decode_3byte_sequence(p_surrogate_pair))) {
+      return (UChar* )p_surrogate_pair;
+    }
+  }
   return (UChar* )p;
 }
 
diff --git a/enc/depend b/enc/depend
index 60c5a3ebb2..973ad93010 100644
--- a/enc/depend
+++ b/enc/depend
@@ -7018,6 +7018,7 @@ enc/trans/iso2022.$(OBJEXT): internal/attr/nodiscard.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/noexcept.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/noinline.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/nonstring.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/noreturn.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/pure.h
 enc/trans/iso2022.$(OBJEXT): internal/attr/restrict.h
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index bc0597e3f4..fcfc2c9267 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -134,7 +134,7 @@ else
 end
 mkin = File.read(File.join($srcdir, "Makefile.in"))
 mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
-open(ARGV[0], 'wb') {|f|
+File.open(ARGV[0], 'wb') {|f|
   f.puts mkin, dep
 }
 if MODULE_TYPE == :static
diff --git a/enc/unicode/14.0.0/casefold.h b/enc/unicode/15.0.0/casefold.h
index d387cff628..51120d867d 100644
--- a/enc/unicode/14.0.0/casefold.h
+++ b/enc/unicode/15.0.0/casefold.h
@@ -1,15 +1,15 @@
 /* DO NOT EDIT THIS FILE. */
-/* Generated by enc/unicode/case-folding.rb */
+/* Generated by enc-case-folding.rb */
 
 #if defined ONIG_UNICODE_VERSION_STRING && !( \
-      ONIG_UNICODE_VERSION_MAJOR == 14 && \
+      ONIG_UNICODE_VERSION_MAJOR == 15 && \
       ONIG_UNICODE_VERSION_MINOR == 0 && \
       ONIG_UNICODE_VERSION_TEENY == 0 && \
       1)
 # error ONIG_UNICODE_VERSION_STRING mismatch
 #endif
-#define ONIG_UNICODE_VERSION_STRING "14.0.0"
-#define ONIG_UNICODE_VERSION_MAJOR 14
+#define ONIG_UNICODE_VERSION_STRING "15.0.0"
+#define ONIG_UNICODE_VERSION_MAJOR 15
 #define ONIG_UNICODE_VERSION_MINOR 0
 #define ONIG_UNICODE_VERSION_TEENY 0
 
diff --git a/enc/unicode/14.0.0/name2ctype.h b/enc/unicode/15.0.0/name2ctype.h
index 61c16bafc2..a2c996423d 100644
--- a/enc/unicode/14.0.0/name2ctype.h
+++ b/enc/unicode/15.0.0/name2ctype.h
@@ -43,7 +43,7 @@ static const OnigCodePoint CR_NEWLINE[] = {
 
 /* 'Alpha': [[:Alpha:]] */
 static const OnigCodePoint CR_Alpha[] = {
-	722,
+	732,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -178,8 +178,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x0bca, 0x0bcc,
 	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
+	0x0c00, 0x0c0c,
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c39,
@@ -202,7 +201,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x0cd5, 0x0cd6,
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d3a,
@@ -240,7 +239,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x0f00, 0x0f00,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
+	0x0f71, 0x0f83,
 	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
@@ -542,7 +541,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x10fe0, 0x10ff6,
 	0x11000, 0x11045,
 	0x11071, 0x11075,
-	0x11082, 0x110b8,
+	0x11080, 0x110b8,
 	0x110c2, 0x110c2,
 	0x110d0, 0x110e8,
 	0x11100, 0x11132,
@@ -557,7 +556,7 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x11200, 0x11211,
 	0x11213, 0x11234,
 	0x11237, 0x11237,
-	0x1123e, 0x1123e,
+	0x1123e, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -637,12 +636,16 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x11d93, 0x11d96,
 	0x11d98, 0x11d98,
 	0x11ee0, 0x11ef6,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f40,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13441, 0x13446,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -666,7 +669,9 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -705,16 +710,20 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x1d7aa, 0x1d7c2,
 	0x1d7c4, 0x1d7cb,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e137, 0x1e13d,
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
+	0x1e4d0, 0x1e4eb,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -760,12 +769,13 @@ static const OnigCodePoint CR_Alpha[] = {
 	0x1f150, 0x1f169,
 	0x1f170, 0x1f189,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_Alpha */
 
 /* 'Blank': [[:Blank:]] */
@@ -790,7 +800,7 @@ static const OnigCodePoint CR_Cntrl[] = {
 
 /* 'Digit': [[:Digit:]] */
 static const OnigCodePoint CR_Digit[] = {
-	62,
+	64,
 	0x0030, 0x0039,
 	0x0660, 0x0669,
 	0x06f0, 0x06f9,
@@ -845,19 +855,21 @@ static const OnigCodePoint CR_Digit[] = {
 	0x11c50, 0x11c59,
 	0x11d50, 0x11d59,
 	0x11da0, 0x11da9,
+	0x11f50, 0x11f59,
 	0x16a60, 0x16a69,
 	0x16ac0, 0x16ac9,
 	0x16b50, 0x16b59,
 	0x1d7ce, 0x1d7ff,
 	0x1e140, 0x1e149,
 	0x1e2f0, 0x1e2f9,
+	0x1e4f0, 0x1e4f9,
 	0x1e950, 0x1e959,
 	0x1fbf0, 0x1fbf9,
 }; /* CR_Digit */
 
 /* 'Graph': [[:Graph:]] */
 static const OnigCodePoint CR_Graph[] = {
-	703,
+	712,
 	0x0021, 0x007e,
 	0x00a1, 0x0377,
 	0x037a, 0x037f,
@@ -980,7 +992,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -1010,7 +1022,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f47,
@@ -1285,7 +1297,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f27,
+	0x10efd, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -1302,7 +1314,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x11180, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
-	0x11213, 0x1123e,
+	0x11213, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -1355,6 +1367,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x11a00, 0x11a47,
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
+	0x11b00, 0x11b09,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -1376,6 +1389,9 @@ static const OnigCodePoint CR_Graph[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -1383,8 +1399,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x12470, 0x12474,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
-	0x13000, 0x1342e,
-	0x13430, 0x13438,
+	0x13000, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -1411,7 +1426,9 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -1426,6 +1443,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1ea,
 	0x1d200, 0x1d245,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d378,
@@ -1453,11 +1471,14 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
@@ -1465,6 +1486,7 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
+	0x1e4d0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -1523,10 +1545,10 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -1537,25 +1559,24 @@ static const OnigCodePoint CR_Graph[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
@@ -1565,7 +1586,7 @@ static const OnigCodePoint CR_Graph[] = {
 
 /* 'Lower': [[:Lower:]] */
 static const OnigCodePoint CR_Lower[] = {
-	664,
+	671,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
 	0x00b5, 0x00b5,
@@ -1842,7 +1863,7 @@ static const OnigCodePoint CR_Lower[] = {
 	0x052f, 0x052f,
 	0x0560, 0x0588,
 	0x10d0, 0x10fa,
-	0x10fd, 0x10ff,
+	0x10fc, 0x10ff,
 	0x13f8, 0x13fd,
 	0x1c80, 0x1c88,
 	0x1d00, 0x1dbf,
@@ -2182,10 +2203,11 @@ static const OnigCodePoint CR_Lower[] = {
 	0xa7d5, 0xa7d5,
 	0xa7d7, 0xa7d7,
 	0xa7d9, 0xa7d9,
+	0xa7f2, 0xa7f4,
 	0xa7f6, 0xa7f6,
 	0xa7f8, 0xa7fa,
 	0xab30, 0xab5a,
-	0xab5c, 0xab68,
+	0xab5c, 0xab69,
 	0xab70, 0xabbf,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
@@ -2196,6 +2218,10 @@ static const OnigCodePoint CR_Lower[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x10780, 0x10780,
+	0x10783, 0x10785,
+	0x10787, 0x107b0,
+	0x107b2, 0x107ba,
 	0x10cc0, 0x10cf2,
 	0x118c0, 0x118df,
 	0x16e60, 0x16e7f,
@@ -2229,12 +2255,14 @@ static const OnigCodePoint CR_Lower[] = {
 	0x1d7cb, 0x1d7cb,
 	0x1df00, 0x1df09,
 	0x1df0b, 0x1df1e,
+	0x1df25, 0x1df2a,
+	0x1e030, 0x1e06d,
 	0x1e922, 0x1e943,
 }; /* CR_Lower */
 
 /* 'Print': [[:Print:]] */
 static const OnigCodePoint CR_Print[] = {
-	700,
+	709,
 	0x0020, 0x007e,
 	0x00a0, 0x0377,
 	0x037a, 0x037f,
@@ -2357,7 +2385,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -2387,7 +2415,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f47,
@@ -2659,7 +2687,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f27,
+	0x10efd, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -2676,7 +2704,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x11180, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
-	0x11213, 0x1123e,
+	0x11213, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -2729,6 +2757,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x11a00, 0x11a47,
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
+	0x11b00, 0x11b09,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -2750,6 +2779,9 @@ static const OnigCodePoint CR_Print[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -2757,8 +2789,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x12470, 0x12474,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
-	0x13000, 0x1342e,
-	0x13430, 0x13438,
+	0x13000, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -2785,7 +2816,9 @@ static const OnigCodePoint CR_Print[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -2800,6 +2833,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1ea,
 	0x1d200, 0x1d245,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d378,
@@ -2827,11 +2861,14 @@ static const OnigCodePoint CR_Print[] = {
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
@@ -2839,6 +2876,7 @@ static const OnigCodePoint CR_Print[] = {
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
+	0x1e4d0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -2897,10 +2935,10 @@ static const OnigCodePoint CR_Print[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -2911,25 +2949,24 @@ static const OnigCodePoint CR_Print[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
@@ -2939,7 +2976,7 @@ static const OnigCodePoint CR_Print[] = {
 
 /* 'XPosixPunct': [[:Punct:]] */
 static const OnigCodePoint CR_XPosixPunct[] = {
-	184,
+	186,
 	0x0021, 0x002f,
 	0x003a, 0x0040,
 	0x005b, 0x0060,
@@ -3109,9 +3146,11 @@ static const OnigCodePoint CR_XPosixPunct[] = {
 	0x11a3f, 0x11a46,
 	0x11a9a, 0x11a9c,
 	0x11a9e, 0x11aa2,
+	0x11b00, 0x11b09,
 	0x11c41, 0x11c45,
 	0x11c70, 0x11c71,
 	0x11ef7, 0x11ef8,
+	0x11f43, 0x11f4f,
 	0x11fff, 0x11fff,
 	0x12470, 0x12474,
 	0x12ff1, 0x12ff2,
@@ -3807,7 +3846,7 @@ static const OnigCodePoint CR_XDigit[] = {
 
 /* 'Word': [[:Word:]] */
 static const OnigCodePoint CR_Word[] = {
-	758,
+	770,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -3965,7 +4004,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -3998,7 +4037,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f00,
@@ -4311,7 +4350,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f1c,
+	0x10efd, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f50,
 	0x10f70, 0x10f85,
@@ -4334,7 +4373,7 @@ static const OnigCodePoint CR_Word[] = {
 	0x111dc, 0x111dc,
 	0x11200, 0x11211,
 	0x11213, 0x11237,
-	0x1123e, 0x1123e,
+	0x1123e, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -4415,12 +4454,17 @@ static const OnigCodePoint CR_Word[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef6,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f42,
+	0x11f50, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13440, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -4448,7 +4492,9 @@ static const OnigCodePoint CR_Word[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -4502,17 +4548,21 @@ static const OnigCodePoint CR_Word[] = {
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
+	0x1e4d0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -4559,18 +4609,19 @@ static const OnigCodePoint CR_Word[] = {
 	0x1f170, 0x1f189,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 	0xe0100, 0xe01ef,
 }; /* CR_Word */
 
 /* 'Alnum': [[:Alnum:]] */
 static const OnigCodePoint CR_Alnum[] = {
-	760,
+	772,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
@@ -4709,8 +4760,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0bd0, 0x0bd0,
 	0x0bd7, 0x0bd7,
 	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
+	0x0c00, 0x0c0c,
 	0x0c0e, 0x0c10,
 	0x0c12, 0x0c28,
 	0x0c2a, 0x0c39,
@@ -4735,7 +4785,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d3a,
@@ -4778,7 +4828,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x0f20, 0x0f29,
 	0x0f40, 0x0f47,
 	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
+	0x0f71, 0x0f83,
 	0x0f88, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x1000, 0x1036,
@@ -5088,7 +5138,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x11000, 0x11045,
 	0x11066, 0x1106f,
 	0x11071, 0x11075,
-	0x11082, 0x110b8,
+	0x11080, 0x110b8,
 	0x110c2, 0x110c2,
 	0x110d0, 0x110e8,
 	0x110f0, 0x110f9,
@@ -5104,7 +5154,7 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x11200, 0x11211,
 	0x11213, 0x11234,
 	0x11237, 0x11237,
-	0x1123e, 0x1123e,
+	0x1123e, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -5194,12 +5244,17 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x11d98, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef6,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f40,
+	0x11f50, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13441, 0x13446,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -5226,7 +5281,9 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -5266,11 +5323,14 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1d7c4, 0x1d7cb,
 	0x1d7ce, 0x1d7ff,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e137, 0x1e13d,
 	0x1e140, 0x1e149,
@@ -5278,6 +5338,8 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
 	0x1e2f0, 0x1e2f9,
+	0x1e4d0, 0x1e4eb,
+	0x1e4f0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -5325,12 +5387,13 @@ static const OnigCodePoint CR_Alnum[] = {
 	0x1f170, 0x1f189,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_Alnum */
 
 /* 'ASCII': [[:ASCII:]] */
@@ -5341,7 +5404,7 @@ static const OnigCodePoint CR_ASCII[] = {
 
 /* 'Punct' */
 static const OnigCodePoint CR_Punct[] = {
-	189,
+	191,
 	0x0021, 0x0023,
 	0x0025, 0x002a,
 	0x002c, 0x002f,
@@ -5516,9 +5579,11 @@ static const OnigCodePoint CR_Punct[] = {
 	0x11a3f, 0x11a46,
 	0x11a9a, 0x11a9c,
 	0x11a9e, 0x11aa2,
+	0x11b00, 0x11b09,
 	0x11c41, 0x11c45,
 	0x11c70, 0x11c71,
 	0x11ef7, 0x11ef8,
+	0x11f43, 0x11f4f,
 	0x11fff, 0x11fff,
 	0x12470, 0x12474,
 	0x12ff1, 0x12ff2,
@@ -5542,7 +5607,7 @@ static const OnigCodePoint CR_Any[] = {
 
 /* 'Assigned': - */
 static const OnigCodePoint CR_Assigned[] = {
-	698,
+	707,
 	0x0000, 0x0377,
 	0x037a, 0x037f,
 	0x0384, 0x038a,
@@ -5664,7 +5729,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -5694,7 +5759,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f47,
@@ -5965,7 +6030,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10ead,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f27,
+	0x10efd, 0x10f27,
 	0x10f30, 0x10f59,
 	0x10f70, 0x10f89,
 	0x10fb0, 0x10fcb,
@@ -5982,7 +6047,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x11180, 0x111df,
 	0x111e1, 0x111f4,
 	0x11200, 0x11211,
-	0x11213, 0x1123e,
+	0x11213, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -6035,6 +6100,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x11a00, 0x11a47,
 	0x11a50, 0x11aa2,
 	0x11ab0, 0x11af8,
+	0x11b00, 0x11b09,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c36,
 	0x11c38, 0x11c45,
@@ -6056,6 +6122,9 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef8,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -6063,8 +6132,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x12470, 0x12474,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
-	0x13000, 0x1342e,
-	0x13430, 0x13438,
+	0x13000, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -6091,7 +6159,9 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -6106,6 +6176,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1d100, 0x1d126,
 	0x1d129, 0x1d1ea,
 	0x1d200, 0x1d245,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d378,
@@ -6133,11 +6204,14 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
@@ -6145,6 +6219,7 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
+	0x1e4d0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -6203,10 +6278,10 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -6217,25 +6292,24 @@ static const OnigCodePoint CR_Assigned[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 	0xe0001, 0xe0001,
 	0xe0020, 0xe007f,
 	0xe0100, 0xe01ef,
@@ -6245,7 +6319,7 @@ static const OnigCodePoint CR_Assigned[] = {
 
 /* 'C': Major Category */
 static const OnigCodePoint CR_C[] = {
-	701,
+	712,
 	0x0000, 0x001f,
 	0x007f, 0x009f,
 	0x00ad, 0x00ad,
@@ -6372,7 +6446,7 @@ static const OnigCodePoint CR_C[] = {
 	0x0cdf, 0x0cdf,
 	0x0ce4, 0x0ce5,
 	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0cff,
+	0x0cf4, 0x0cff,
 	0x0d0d, 0x0d0d,
 	0x0d11, 0x0d11,
 	0x0d45, 0x0d45,
@@ -6402,7 +6476,7 @@ static const OnigCodePoint CR_C[] = {
 	0x0ebe, 0x0ebf,
 	0x0ec5, 0x0ec5,
 	0x0ec7, 0x0ec7,
-	0x0ece, 0x0ecf,
+	0x0ecf, 0x0ecf,
 	0x0eda, 0x0edb,
 	0x0ee0, 0x0eff,
 	0x0f48, 0x0f48,
@@ -6674,7 +6748,7 @@ static const OnigCodePoint CR_C[] = {
 	0x10e7f, 0x10e7f,
 	0x10eaa, 0x10eaa,
 	0x10eae, 0x10eaf,
-	0x10eb2, 0x10eff,
+	0x10eb2, 0x10efc,
 	0x10f28, 0x10f2f,
 	0x10f5a, 0x10f6f,
 	0x10f8a, 0x10faf,
@@ -6692,7 +6766,7 @@ static const OnigCodePoint CR_C[] = {
 	0x111e0, 0x111e0,
 	0x111f5, 0x111ff,
 	0x11212, 0x11212,
-	0x1123f, 0x1127f,
+	0x11242, 0x1127f,
 	0x11287, 0x11287,
 	0x11289, 0x11289,
 	0x1128e, 0x1128e,
@@ -6744,7 +6818,8 @@ static const OnigCodePoint CR_C[] = {
 	0x119e5, 0x119ff,
 	0x11a48, 0x11a4f,
 	0x11aa3, 0x11aaf,
-	0x11af9, 0x11bff,
+	0x11af9, 0x11aff,
+	0x11b0a, 0x11bff,
 	0x11c09, 0x11c09,
 	0x11c37, 0x11c37,
 	0x11c46, 0x11c4f,
@@ -6765,7 +6840,10 @@ static const OnigCodePoint CR_C[] = {
 	0x11d92, 0x11d92,
 	0x11d99, 0x11d9f,
 	0x11daa, 0x11edf,
-	0x11ef9, 0x11faf,
+	0x11ef9, 0x11eff,
+	0x11f11, 0x11f11,
+	0x11f3b, 0x11f3d,
+	0x11f5a, 0x11faf,
 	0x11fb1, 0x11fbf,
 	0x11ff2, 0x11ffe,
 	0x1239a, 0x123ff,
@@ -6773,7 +6851,8 @@ static const OnigCodePoint CR_C[] = {
 	0x12475, 0x1247f,
 	0x12544, 0x12f8f,
 	0x12ff3, 0x12fff,
-	0x1342f, 0x143ff,
+	0x13430, 0x1343f,
+	0x13456, 0x143ff,
 	0x14647, 0x167ff,
 	0x16a39, 0x16a3f,
 	0x16a5f, 0x16a5f,
@@ -6799,8 +6878,10 @@ static const OnigCodePoint CR_C[] = {
 	0x1aff4, 0x1aff4,
 	0x1affc, 0x1affc,
 	0x1afff, 0x1afff,
-	0x1b123, 0x1b14f,
-	0x1b153, 0x1b163,
+	0x1b123, 0x1b131,
+	0x1b133, 0x1b14f,
+	0x1b153, 0x1b154,
+	0x1b156, 0x1b163,
 	0x1b168, 0x1b16f,
 	0x1b2fc, 0x1bbff,
 	0x1bc6b, 0x1bc6f,
@@ -6815,7 +6896,8 @@ static const OnigCodePoint CR_C[] = {
 	0x1d127, 0x1d128,
 	0x1d173, 0x1d17a,
 	0x1d1eb, 0x1d1ff,
-	0x1d246, 0x1d2df,
+	0x1d246, 0x1d2bf,
+	0x1d2d4, 0x1d2df,
 	0x1d2f4, 0x1d2ff,
 	0x1d357, 0x1d35f,
 	0x1d379, 0x1d3ff,
@@ -6842,19 +6924,23 @@ static const OnigCodePoint CR_C[] = {
 	0x1da8c, 0x1da9a,
 	0x1daa0, 0x1daa0,
 	0x1dab0, 0x1deff,
-	0x1df1f, 0x1dfff,
+	0x1df1f, 0x1df24,
+	0x1df2b, 0x1dfff,
 	0x1e007, 0x1e007,
 	0x1e019, 0x1e01a,
 	0x1e022, 0x1e022,
 	0x1e025, 0x1e025,
-	0x1e02b, 0x1e0ff,
+	0x1e02b, 0x1e02f,
+	0x1e06e, 0x1e08e,
+	0x1e090, 0x1e0ff,
 	0x1e12d, 0x1e12f,
 	0x1e13e, 0x1e13f,
 	0x1e14a, 0x1e14d,
 	0x1e150, 0x1e28f,
 	0x1e2af, 0x1e2bf,
 	0x1e2fa, 0x1e2fe,
-	0x1e300, 0x1e7df,
+	0x1e300, 0x1e4cf,
+	0x1e4fa, 0x1e7df,
 	0x1e7e7, 0x1e7e7,
 	0x1e7ec, 0x1e7ec,
 	0x1e7ef, 0x1e7ef,
@@ -6912,11 +6998,11 @@ static const OnigCodePoint CR_C[] = {
 	0x1f249, 0x1f24f,
 	0x1f252, 0x1f25f,
 	0x1f266, 0x1f2ff,
-	0x1f6d8, 0x1f6dc,
+	0x1f6d8, 0x1f6db,
 	0x1f6ed, 0x1f6ef,
 	0x1f6fd, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d9, 0x1f7df,
+	0x1f777, 0x1f77a,
+	0x1f7da, 0x1f7df,
 	0x1f7ec, 0x1f7ef,
 	0x1f7f1, 0x1f7ff,
 	0x1f80c, 0x1f80f,
@@ -6927,25 +7013,24 @@ static const OnigCodePoint CR_C[] = {
 	0x1f8b2, 0x1f8ff,
 	0x1fa54, 0x1fa5f,
 	0x1fa6e, 0x1fa6f,
-	0x1fa75, 0x1fa77,
 	0x1fa7d, 0x1fa7f,
-	0x1fa87, 0x1fa8f,
-	0x1faad, 0x1faaf,
-	0x1fabb, 0x1fabf,
-	0x1fac6, 0x1facf,
-	0x1fada, 0x1fadf,
-	0x1fae8, 0x1faef,
-	0x1faf7, 0x1faff,
+	0x1fa89, 0x1fa8f,
+	0x1fabe, 0x1fabe,
+	0x1fac6, 0x1facd,
+	0x1fadc, 0x1fadf,
+	0x1fae9, 0x1faef,
+	0x1faf9, 0x1faff,
 	0x1fb93, 0x1fb93,
 	0x1fbcb, 0x1fbef,
 	0x1fbfa, 0x1ffff,
 	0x2a6e0, 0x2a6ff,
-	0x2b739, 0x2b73f,
+	0x2b73a, 0x2b73f,
 	0x2b81e, 0x2b81f,
 	0x2cea2, 0x2ceaf,
 	0x2ebe1, 0x2f7ff,
 	0x2fa1e, 0x2ffff,
-	0x3134b, 0xe00ff,
+	0x3134b, 0x3134f,
+	0x323b0, 0xe00ff,
 	0xe01f0, 0x10ffff,
 }; /* CR_C */
 
@@ -6971,7 +7056,7 @@ static const OnigCodePoint CR_Cf[] = {
 	0xfff9, 0xfffb,
 	0x110bd, 0x110bd,
 	0x110cd, 0x110cd,
-	0x13430, 0x13438,
+	0x13430, 0x1343f,
 	0x1bca0, 0x1bca3,
 	0x1d173, 0x1d17a,
 	0xe0001, 0xe0001,
@@ -6980,7 +7065,7 @@ static const OnigCodePoint CR_Cf[] = {
 
 /* 'Cn': General Category */
 static const OnigCodePoint CR_Cn[] = {
-	698,
+	707,
 	0x0378, 0x0379,
 	0x0380, 0x0383,
 	0x038b, 0x038b,
@@ -7102,7 +7187,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0cdf, 0x0cdf,
 	0x0ce4, 0x0ce5,
 	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0cff,
+	0x0cf4, 0x0cff,
 	0x0d0d, 0x0d0d,
 	0x0d11, 0x0d11,
 	0x0d45, 0x0d45,
@@ -7132,7 +7217,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x0ebe, 0x0ebf,
 	0x0ec5, 0x0ec5,
 	0x0ec7, 0x0ec7,
-	0x0ece, 0x0ecf,
+	0x0ecf, 0x0ecf,
 	0x0eda, 0x0edb,
 	0x0ee0, 0x0eff,
 	0x0f48, 0x0f48,
@@ -7402,7 +7487,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x10e7f, 0x10e7f,
 	0x10eaa, 0x10eaa,
 	0x10eae, 0x10eaf,
-	0x10eb2, 0x10eff,
+	0x10eb2, 0x10efc,
 	0x10f28, 0x10f2f,
 	0x10f5a, 0x10f6f,
 	0x10f8a, 0x10faf,
@@ -7420,7 +7505,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x111e0, 0x111e0,
 	0x111f5, 0x111ff,
 	0x11212, 0x11212,
-	0x1123f, 0x1127f,
+	0x11242, 0x1127f,
 	0x11287, 0x11287,
 	0x11289, 0x11289,
 	0x1128e, 0x1128e,
@@ -7472,7 +7557,8 @@ static const OnigCodePoint CR_Cn[] = {
 	0x119e5, 0x119ff,
 	0x11a48, 0x11a4f,
 	0x11aa3, 0x11aaf,
-	0x11af9, 0x11bff,
+	0x11af9, 0x11aff,
+	0x11b0a, 0x11bff,
 	0x11c09, 0x11c09,
 	0x11c37, 0x11c37,
 	0x11c46, 0x11c4f,
@@ -7493,7 +7579,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x11d92, 0x11d92,
 	0x11d99, 0x11d9f,
 	0x11daa, 0x11edf,
-	0x11ef9, 0x11faf,
+	0x11ef9, 0x11eff,
+	0x11f11, 0x11f11,
+	0x11f3b, 0x11f3d,
+	0x11f5a, 0x11faf,
 	0x11fb1, 0x11fbf,
 	0x11ff2, 0x11ffe,
 	0x1239a, 0x123ff,
@@ -7501,8 +7590,7 @@ static const OnigCodePoint CR_Cn[] = {
 	0x12475, 0x1247f,
 	0x12544, 0x12f8f,
 	0x12ff3, 0x12fff,
-	0x1342f, 0x1342f,
-	0x13439, 0x143ff,
+	0x13456, 0x143ff,
 	0x14647, 0x167ff,
 	0x16a39, 0x16a3f,
 	0x16a5f, 0x16a5f,
@@ -7528,8 +7616,10 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1aff4, 0x1aff4,
 	0x1affc, 0x1affc,
 	0x1afff, 0x1afff,
-	0x1b123, 0x1b14f,
-	0x1b153, 0x1b163,
+	0x1b123, 0x1b131,
+	0x1b133, 0x1b14f,
+	0x1b153, 0x1b154,
+	0x1b156, 0x1b163,
 	0x1b168, 0x1b16f,
 	0x1b2fc, 0x1bbff,
 	0x1bc6b, 0x1bc6f,
@@ -7543,7 +7633,8 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1d0f6, 0x1d0ff,
 	0x1d127, 0x1d128,
 	0x1d1eb, 0x1d1ff,
-	0x1d246, 0x1d2df,
+	0x1d246, 0x1d2bf,
+	0x1d2d4, 0x1d2df,
 	0x1d2f4, 0x1d2ff,
 	0x1d357, 0x1d35f,
 	0x1d379, 0x1d3ff,
@@ -7570,19 +7661,23 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1da8c, 0x1da9a,
 	0x1daa0, 0x1daa0,
 	0x1dab0, 0x1deff,
-	0x1df1f, 0x1dfff,
+	0x1df1f, 0x1df24,
+	0x1df2b, 0x1dfff,
 	0x1e007, 0x1e007,
 	0x1e019, 0x1e01a,
 	0x1e022, 0x1e022,
 	0x1e025, 0x1e025,
-	0x1e02b, 0x1e0ff,
+	0x1e02b, 0x1e02f,
+	0x1e06e, 0x1e08e,
+	0x1e090, 0x1e0ff,
 	0x1e12d, 0x1e12f,
 	0x1e13e, 0x1e13f,
 	0x1e14a, 0x1e14d,
 	0x1e150, 0x1e28f,
 	0x1e2af, 0x1e2bf,
 	0x1e2fa, 0x1e2fe,
-	0x1e300, 0x1e7df,
+	0x1e300, 0x1e4cf,
+	0x1e4fa, 0x1e7df,
 	0x1e7e7, 0x1e7e7,
 	0x1e7ec, 0x1e7ec,
 	0x1e7ef, 0x1e7ef,
@@ -7640,11 +7735,11 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1f249, 0x1f24f,
 	0x1f252, 0x1f25f,
 	0x1f266, 0x1f2ff,
-	0x1f6d8, 0x1f6dc,
+	0x1f6d8, 0x1f6db,
 	0x1f6ed, 0x1f6ef,
 	0x1f6fd, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d9, 0x1f7df,
+	0x1f777, 0x1f77a,
+	0x1f7da, 0x1f7df,
 	0x1f7ec, 0x1f7ef,
 	0x1f7f1, 0x1f7ff,
 	0x1f80c, 0x1f80f,
@@ -7655,25 +7750,24 @@ static const OnigCodePoint CR_Cn[] = {
 	0x1f8b2, 0x1f8ff,
 	0x1fa54, 0x1fa5f,
 	0x1fa6e, 0x1fa6f,
-	0x1fa75, 0x1fa77,
 	0x1fa7d, 0x1fa7f,
-	0x1fa87, 0x1fa8f,
-	0x1faad, 0x1faaf,
-	0x1fabb, 0x1fabf,
-	0x1fac6, 0x1facf,
-	0x1fada, 0x1fadf,
-	0x1fae8, 0x1faef,
-	0x1faf7, 0x1faff,
+	0x1fa89, 0x1fa8f,
+	0x1fabe, 0x1fabe,
+	0x1fac6, 0x1facd,
+	0x1fadc, 0x1fadf,
+	0x1fae9, 0x1faef,
+	0x1faf9, 0x1faff,
 	0x1fb93, 0x1fb93,
 	0x1fbcb, 0x1fbef,
 	0x1fbfa, 0x1ffff,
 	0x2a6e0, 0x2a6ff,
-	0x2b739, 0x2b73f,
+	0x2b73a, 0x2b73f,
 	0x2b81e, 0x2b81f,
 	0x2cea2, 0x2ceaf,
 	0x2ebe1, 0x2f7ff,
 	0x2fa1e, 0x2ffff,
-	0x3134b, 0xe0000,
+	0x3134b, 0x3134f,
+	0x323b0, 0xe0000,
 	0xe0002, 0xe001f,
 	0xe0080, 0xe00ff,
 	0xe01f0, 0xeffff,
@@ -7697,7 +7791,7 @@ static const OnigCodePoint CR_Cs[] = {
 
 /* 'L': Major Category */
 static const OnigCodePoint CR_L[] = {
-	648,
+	659,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -8167,6 +8261,7 @@ static const OnigCodePoint CR_L[] = {
 	0x111dc, 0x111dc,
 	0x11200, 0x11211,
 	0x11213, 0x1122b,
+	0x1123f, 0x11240,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -8229,11 +8324,15 @@ static const OnigCodePoint CR_L[] = {
 	0x11d6a, 0x11d89,
 	0x11d98, 0x11d98,
 	0x11ee0, 0x11ef2,
+	0x11f02, 0x11f02,
+	0x11f04, 0x11f10,
+	0x11f12, 0x11f33,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13441, 0x13446,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -8256,7 +8355,9 @@ static const OnigCodePoint CR_L[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -8294,11 +8395,14 @@ static const OnigCodePoint CR_L[] = {
 	0x1d7aa, 0x1d7c2,
 	0x1d7c4, 0x1d7cb,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
+	0x1e030, 0x1e06d,
 	0x1e100, 0x1e12c,
 	0x1e137, 0x1e13d,
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
+	0x1e4d0, 0x1e4eb,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -8340,17 +8444,18 @@ static const OnigCodePoint CR_L[] = {
 	0x1eea5, 0x1eea9,
 	0x1eeab, 0x1eebb,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_L */
 
 /* 'LC': General Category */
 static const OnigCodePoint CR_LC[] = {
-	142,
+	143,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
@@ -8492,12 +8597,13 @@ static const OnigCodePoint CR_LC[] = {
 	0x1d7c4, 0x1d7cb,
 	0x1df00, 0x1df09,
 	0x1df0b, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e900, 0x1e943,
 }; /* CR_LC */
 
 /* 'Ll': General Category */
 static const OnigCodePoint CR_Ll[] = {
-	657,
+	658,
 	0x0061, 0x007a,
 	0x00b5, 0x00b5,
 	0x00df, 0x00f6,
@@ -9154,12 +9260,13 @@ static const OnigCodePoint CR_Ll[] = {
 	0x1d7cb, 0x1d7cb,
 	0x1df00, 0x1df09,
 	0x1df0b, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e922, 0x1e943,
 }; /* CR_Ll */
 
 /* 'Lm': General Category */
 static const OnigCodePoint CR_Lm[] = {
-	69,
+	71,
 	0x02b0, 0x02c1,
 	0x02c6, 0x02d1,
 	0x02e0, 0x02e4,
@@ -9227,13 +9334,15 @@ static const OnigCodePoint CR_Lm[] = {
 	0x1aff0, 0x1aff3,
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
+	0x1e030, 0x1e06d,
 	0x1e137, 0x1e13d,
+	0x1e4eb, 0x1e4eb,
 	0x1e94b, 0x1e94b,
 }; /* CR_Lm */
 
 /* 'Lo': General Category */
 static const OnigCodePoint CR_Lo[] = {
-	501,
+	510,
 	0x00aa, 0x00aa,
 	0x00ba, 0x00ba,
 	0x01bb, 0x01bb,
@@ -9598,6 +9707,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x111dc, 0x111dc,
 	0x11200, 0x11211,
 	0x11213, 0x1122b,
+	0x1123f, 0x11240,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -9659,11 +9769,15 @@ static const OnigCodePoint CR_Lo[] = {
 	0x11d6a, 0x11d89,
 	0x11d98, 0x11d98,
 	0x11ee0, 0x11ef2,
+	0x11f02, 0x11f02,
+	0x11f04, 0x11f10,
+	0x11f12, 0x11f33,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13441, 0x13446,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -9678,7 +9792,9 @@ static const OnigCodePoint CR_Lo[] = {
 	0x18800, 0x18cd5,
 	0x18d00, 0x18d08,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -9690,6 +9806,7 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
+	0x1e4d0, 0x1e4ea,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -9729,12 +9846,13 @@ static const OnigCodePoint CR_Lo[] = {
 	0x1eea5, 0x1eea9,
 	0x1eeab, 0x1eebb,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_Lo */
 
 /* 'Lt': General Category */
@@ -10405,7 +10523,7 @@ static const OnigCodePoint CR_Lu[] = {
 
 /* 'M': Major Category */
 static const OnigCodePoint CR_M[] = {
-	299,
+	310,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -10486,6 +10604,7 @@ static const OnigCodePoint CR_M[] = {
 	0x0cca, 0x0ccd,
 	0x0cd5, 0x0cd6,
 	0x0ce2, 0x0ce3,
+	0x0cf3, 0x0cf3,
 	0x0d00, 0x0d03,
 	0x0d3b, 0x0d3c,
 	0x0d3e, 0x0d44,
@@ -10504,7 +10623,7 @@ static const OnigCodePoint CR_M[] = {
 	0x0e47, 0x0e4e,
 	0x0eb1, 0x0eb1,
 	0x0eb4, 0x0ebc,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0f18, 0x0f19,
 	0x0f35, 0x0f35,
 	0x0f37, 0x0f37,
@@ -10606,6 +10725,7 @@ static const OnigCodePoint CR_M[] = {
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
 	0x10eab, 0x10eac,
+	0x10efd, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11000, 0x11002,
@@ -10625,6 +10745,7 @@ static const OnigCodePoint CR_M[] = {
 	0x111ce, 0x111cf,
 	0x1122c, 0x11237,
 	0x1123e, 0x1123e,
+	0x11241, 0x11241,
 	0x112df, 0x112ea,
 	0x11300, 0x11303,
 	0x1133b, 0x1133c,
@@ -10672,6 +10793,12 @@ static const OnigCodePoint CR_M[] = {
 	0x11d90, 0x11d91,
 	0x11d93, 0x11d97,
 	0x11ef3, 0x11ef6,
+	0x11f00, 0x11f01,
+	0x11f03, 0x11f03,
+	0x11f34, 0x11f3a,
+	0x11f3e, 0x11f42,
+	0x13440, 0x13440,
+	0x13447, 0x13455,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
@@ -10699,9 +10826,11 @@ static const OnigCodePoint CR_M[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e08f, 0x1e08f,
 	0x1e130, 0x1e136,
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
+	0x1e4ec, 0x1e4ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0xe0100, 0xe01ef,
@@ -10709,7 +10838,7 @@ static const OnigCodePoint CR_M[] = {
 
 /* 'Mc': General Category */
 static const OnigCodePoint CR_Mc[] = {
-	177,
+	182,
 	0x0903, 0x0903,
 	0x093b, 0x093b,
 	0x093e, 0x0940,
@@ -10745,6 +10874,7 @@ static const OnigCodePoint CR_Mc[] = {
 	0x0cc7, 0x0cc8,
 	0x0cca, 0x0ccb,
 	0x0cd5, 0x0cd6,
+	0x0cf3, 0x0cf3,
 	0x0d02, 0x0d03,
 	0x0d3e, 0x0d40,
 	0x0d46, 0x0d48,
@@ -10883,6 +11013,10 @@ static const OnigCodePoint CR_Mc[] = {
 	0x11d93, 0x11d94,
 	0x11d96, 0x11d96,
 	0x11ef5, 0x11ef6,
+	0x11f03, 0x11f03,
+	0x11f34, 0x11f35,
+	0x11f3e, 0x11f3f,
+	0x11f41, 0x11f41,
 	0x16f51, 0x16f87,
 	0x16ff0, 0x16ff1,
 	0x1d165, 0x1d166,
@@ -10901,7 +11035,7 @@ static const OnigCodePoint CR_Me[] = {
 
 /* 'Mn': General Category */
 static const OnigCodePoint CR_Mn[] = {
-	336,
+	346,
 	0x0300, 0x036f,
 	0x0483, 0x0487,
 	0x0591, 0x05bd,
@@ -10994,7 +11128,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x0e47, 0x0e4e,
 	0x0eb1, 0x0eb1,
 	0x0eb4, 0x0ebc,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0f18, 0x0f19,
 	0x0f35, 0x0f35,
 	0x0f37, 0x0f37,
@@ -11125,6 +11259,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
 	0x10eab, 0x10eac,
+	0x10efd, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -11147,6 +11282,7 @@ static const OnigCodePoint CR_Mn[] = {
 	0x11234, 0x11234,
 	0x11236, 0x11237,
 	0x1123e, 0x1123e,
+	0x11241, 0x11241,
 	0x112df, 0x112df,
 	0x112e3, 0x112ea,
 	0x11300, 0x11301,
@@ -11208,6 +11344,12 @@ static const OnigCodePoint CR_Mn[] = {
 	0x11d95, 0x11d95,
 	0x11d97, 0x11d97,
 	0x11ef3, 0x11ef4,
+	0x11f00, 0x11f01,
+	0x11f36, 0x11f3a,
+	0x11f40, 0x11f40,
+	0x11f42, 0x11f42,
+	0x13440, 0x13440,
+	0x13447, 0x13455,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
@@ -11232,9 +11374,11 @@ static const OnigCodePoint CR_Mn[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e08f, 0x1e08f,
 	0x1e130, 0x1e136,
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
+	0x1e4ec, 0x1e4ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0xe0100, 0xe01ef,
@@ -11242,7 +11386,7 @@ static const OnigCodePoint CR_Mn[] = {
 
 /* 'N': Major Category */
 static const OnigCodePoint CR_N[] = {
-	134,
+	137,
 	0x0030, 0x0039,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
@@ -11356,6 +11500,7 @@ static const OnigCodePoint CR_N[] = {
 	0x11c50, 0x11c6c,
 	0x11d50, 0x11d59,
 	0x11da0, 0x11da9,
+	0x11f50, 0x11f59,
 	0x11fc0, 0x11fd4,
 	0x12400, 0x1246e,
 	0x16a60, 0x16a69,
@@ -11363,11 +11508,13 @@ static const OnigCodePoint CR_N[] = {
 	0x16b50, 0x16b59,
 	0x16b5b, 0x16b61,
 	0x16e80, 0x16e96,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d360, 0x1d378,
 	0x1d7ce, 0x1d7ff,
 	0x1e140, 0x1e149,
 	0x1e2f0, 0x1e2f9,
+	0x1e4f0, 0x1e4f9,
 	0x1e8c7, 0x1e8cf,
 	0x1e950, 0x1e959,
 	0x1ec71, 0x1ecab,
@@ -11401,7 +11548,7 @@ static const OnigCodePoint CR_Nl[] = {
 
 /* 'No': General Category */
 static const OnigCodePoint CR_No[] = {
-	71,
+	72,
 	0x00b2, 0x00b3,
 	0x00b9, 0x00b9,
 	0x00bc, 0x00be,
@@ -11464,6 +11611,7 @@ static const OnigCodePoint CR_No[] = {
 	0x11fc0, 0x11fd4,
 	0x16b5b, 0x16b61,
 	0x16e80, 0x16e96,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d360, 0x1d378,
 	0x1e8c7, 0x1e8cf,
@@ -11627,7 +11775,7 @@ static const OnigCodePoint CR_Pi[] = {
 
 /* 'Po': General Category */
 static const OnigCodePoint CR_Po[] = {
-	185,
+	187,
 	0x0021, 0x0023,
 	0x0025, 0x0027,
 	0x002a, 0x002a,
@@ -11798,9 +11946,11 @@ static const OnigCodePoint CR_Po[] = {
 	0x11a3f, 0x11a46,
 	0x11a9a, 0x11a9c,
 	0x11a9e, 0x11aa2,
+	0x11b00, 0x11b09,
 	0x11c41, 0x11c45,
 	0x11c70, 0x11c71,
 	0x11ef7, 0x11ef8,
+	0x11f43, 0x11f4f,
 	0x11fff, 0x11fff,
 	0x12470, 0x12474,
 	0x12ff1, 0x12ff2,
@@ -11901,7 +12051,7 @@ static const OnigCodePoint CR_Ps[] = {
 
 /* 'S': Major Category */
 static const OnigCodePoint CR_S[] = {
-	234,
+	232,
 	0x0024, 0x0024,
 	0x002b, 0x002b,
 	0x003c, 0x003e,
@@ -12111,10 +12261,10 @@ static const OnigCodePoint CR_S[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -12125,15 +12275,13 @@ static const OnigCodePoint CR_S[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 }; /* CR_S */
@@ -12271,7 +12419,7 @@ static const OnigCodePoint CR_Sm[] = {
 
 /* 'So': General Category */
 static const OnigCodePoint CR_So[] = {
-	186,
+	184,
 	0x00a6, 0x00a6,
 	0x00a9, 0x00a9,
 	0x00ae, 0x00ae,
@@ -12433,10 +12581,10 @@ static const OnigCodePoint CR_So[] = {
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f3fa,
 	0x1f400, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -12447,15 +12595,13 @@ static const OnigCodePoint CR_So[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 }; /* CR_So */
@@ -12651,7 +12797,7 @@ static const OnigCodePoint CR_Math[] = {
 
 /* 'Cased': Derived Property */
 static const OnigCodePoint CR_Cased[] = {
-	151,
+	157,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -12683,7 +12829,7 @@ static const OnigCodePoint CR_Cased[] = {
 	0x10c7, 0x10c7,
 	0x10cd, 0x10cd,
 	0x10d0, 0x10fa,
-	0x10fd, 0x10ff,
+	0x10fc, 0x10ff,
 	0x13a0, 0x13f5,
 	0x13f8, 0x13fd,
 	0x1c80, 0x1c88,
@@ -12743,10 +12889,10 @@ static const OnigCodePoint CR_Cased[] = {
 	0xa7d0, 0xa7d1,
 	0xa7d3, 0xa7d3,
 	0xa7d5, 0xa7d9,
-	0xa7f5, 0xa7f6,
+	0xa7f2, 0xa7f6,
 	0xa7f8, 0xa7fa,
 	0xab30, 0xab5a,
-	0xab5c, 0xab68,
+	0xab5c, 0xab69,
 	0xab70, 0xabbf,
 	0xfb00, 0xfb06,
 	0xfb13, 0xfb17,
@@ -12763,6 +12909,10 @@ static const OnigCodePoint CR_Cased[] = {
 	0x105a3, 0x105b1,
 	0x105b3, 0x105b9,
 	0x105bb, 0x105bc,
+	0x10780, 0x10780,
+	0x10783, 0x10785,
+	0x10787, 0x107b0,
+	0x107b2, 0x107ba,
 	0x10c80, 0x10cb2,
 	0x10cc0, 0x10cf2,
 	0x118a0, 0x118df,
@@ -12799,6 +12949,8 @@ static const OnigCodePoint CR_Cased[] = {
 	0x1d7c4, 0x1d7cb,
 	0x1df00, 0x1df09,
 	0x1df0b, 0x1df1e,
+	0x1df25, 0x1df2a,
+	0x1e030, 0x1e06d,
 	0x1e900, 0x1e943,
 	0x1f130, 0x1f149,
 	0x1f150, 0x1f169,
@@ -12807,7 +12959,7 @@ static const OnigCodePoint CR_Cased[] = {
 
 /* 'Case_Ignorable': Derived Property */
 static const OnigCodePoint CR_Case_Ignorable[] = {
-	427,
+	437,
 	0x0027, 0x0027,
 	0x002e, 0x002e,
 	0x003a, 0x003a,
@@ -12921,7 +13073,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x0eb1, 0x0eb1,
 	0x0eb4, 0x0ebc,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0f18, 0x0f19,
 	0x0f35, 0x0f35,
 	0x0f37, 0x0f37,
@@ -13110,6 +13262,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
 	0x10eab, 0x10eac,
+	0x10efd, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -13134,6 +13287,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x11234, 0x11234,
 	0x11236, 0x11237,
 	0x1123e, 0x1123e,
+	0x11241, 0x11241,
 	0x112df, 0x112df,
 	0x112e3, 0x112ea,
 	0x11300, 0x11301,
@@ -13195,7 +13349,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x11d95, 0x11d95,
 	0x11d97, 0x11d97,
 	0x11ef3, 0x11ef4,
-	0x13430, 0x13438,
+	0x11f00, 0x11f01,
+	0x11f36, 0x11f3a,
+	0x11f40, 0x11f40,
+	0x11f42, 0x11f42,
+	0x13430, 0x13440,
+	0x13447, 0x13455,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16b40, 0x16b43,
@@ -13226,9 +13385,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e130, 0x1e13d,
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
+	0x1e4eb, 0x1e4ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94b,
 	0x1f3fb, 0x1f3ff,
@@ -15879,7 +16041,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
 
 /* 'ID_Start': Derived Property */
 static const OnigCodePoint CR_ID_Start[] = {
-	648,
+	659,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -16348,6 +16510,7 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x111dc, 0x111dc,
 	0x11200, 0x11211,
 	0x11213, 0x1122b,
+	0x1123f, 0x11240,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -16410,12 +16573,16 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x11d6a, 0x11d89,
 	0x11d98, 0x11d98,
 	0x11ee0, 0x11ef2,
+	0x11f02, 0x11f02,
+	0x11f04, 0x11f10,
+	0x11f12, 0x11f33,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13441, 0x13446,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -16438,7 +16605,9 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -16476,11 +16645,14 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1d7aa, 0x1d7c2,
 	0x1d7c4, 0x1d7cb,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
+	0x1e030, 0x1e06d,
 	0x1e100, 0x1e12c,
 	0x1e137, 0x1e13d,
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
+	0x1e4d0, 0x1e4eb,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -16522,17 +16694,18 @@ static const OnigCodePoint CR_ID_Start[] = {
 	0x1eea5, 0x1eea9,
 	0x1eeab, 0x1eebb,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_ID_Start */
 
 /* 'ID_Continue': Derived Property */
 static const OnigCodePoint CR_ID_Continue[] = {
-	756,
+	768,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -16691,7 +16864,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -16724,7 +16897,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f00,
@@ -17037,7 +17210,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f1c,
+	0x10efd, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f50,
 	0x10f70, 0x10f85,
@@ -17060,7 +17233,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x111dc, 0x111dc,
 	0x11200, 0x11211,
 	0x11213, 0x11237,
-	0x1123e, 0x1123e,
+	0x1123e, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -17141,12 +17314,17 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef6,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f42,
+	0x11f50, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13440, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -17174,7 +17352,9 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -17228,17 +17408,21 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
+	0x1e4d0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -17282,18 +17466,19 @@ static const OnigCodePoint CR_ID_Continue[] = {
 	0x1eeab, 0x1eebb,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 	0xe0100, 0xe01ef,
 }; /* CR_ID_Continue */
 
 /* 'XID_Start': Derived Property */
 static const OnigCodePoint CR_XID_Start[] = {
-	655,
+	666,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -17769,6 +17954,7 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x111dc, 0x111dc,
 	0x11200, 0x11211,
 	0x11213, 0x1122b,
+	0x1123f, 0x11240,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -17831,12 +18017,16 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x11d6a, 0x11d89,
 	0x11d98, 0x11d98,
 	0x11ee0, 0x11ef2,
+	0x11f02, 0x11f02,
+	0x11f04, 0x11f10,
+	0x11f12, 0x11f33,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13441, 0x13446,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -17859,7 +18049,9 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -17897,11 +18089,14 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1d7aa, 0x1d7c2,
 	0x1d7c4, 0x1d7cb,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
+	0x1e030, 0x1e06d,
 	0x1e100, 0x1e12c,
 	0x1e137, 0x1e13d,
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ad,
 	0x1e2c0, 0x1e2eb,
+	0x1e4d0, 0x1e4eb,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -17943,17 +18138,18 @@ static const OnigCodePoint CR_XID_Start[] = {
 	0x1eea5, 0x1eea9,
 	0x1eeab, 0x1eebb,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_XID_Start */
 
 /* 'XID_Continue': Derived Property */
 static const OnigCodePoint CR_XID_Continue[] = {
-	763,
+	775,
 	0x0030, 0x0039,
 	0x0041, 0x005a,
 	0x005f, 0x005f,
@@ -18112,7 +18308,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d00, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d44,
@@ -18145,7 +18341,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 	0x0f00, 0x0f00,
@@ -18465,7 +18661,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x10e80, 0x10ea9,
 	0x10eab, 0x10eac,
 	0x10eb0, 0x10eb1,
-	0x10f00, 0x10f1c,
+	0x10efd, 0x10f1c,
 	0x10f27, 0x10f27,
 	0x10f30, 0x10f50,
 	0x10f70, 0x10f85,
@@ -18488,7 +18684,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x111dc, 0x111dc,
 	0x11200, 0x11211,
 	0x11213, 0x11237,
-	0x1123e, 0x1123e,
+	0x1123e, 0x11241,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -18569,12 +18765,17 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x11d93, 0x11d98,
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef6,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f42,
+	0x11f50, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x12000, 0x12399,
 	0x12400, 0x1246e,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff0,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13440, 0x13455,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -18602,7 +18803,9 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -18656,17 +18859,21 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1da9b, 0x1da9f,
 	0x1daa1, 0x1daaf,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 	0x1e000, 0x1e006,
 	0x1e008, 0x1e018,
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 	0x1e100, 0x1e12c,
 	0x1e130, 0x1e13d,
 	0x1e140, 0x1e149,
 	0x1e14e, 0x1e14e,
 	0x1e290, 0x1e2ae,
 	0x1e2c0, 0x1e2f9,
+	0x1e4d0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -18710,12 +18917,13 @@ static const OnigCodePoint CR_XID_Continue[] = {
 	0x1eeab, 0x1eebb,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 	0xe0100, 0xe01ef,
 }; /* CR_XID_Continue */
 
@@ -18743,7 +18951,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
 
 /* 'Grapheme_Extend': Derived Property */
 static const OnigCodePoint CR_Grapheme_Extend[] = {
-	353,
+	363,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -18846,7 +19054,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x0e47, 0x0e4e,
 	0x0eb1, 0x0eb1,
 	0x0eb4, 0x0ebc,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0f18, 0x0f19,
 	0x0f35, 0x0f35,
 	0x0f37, 0x0f37,
@@ -18975,6 +19183,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
 	0x10eab, 0x10eac,
+	0x10efd, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -18997,6 +19206,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x11234, 0x11234,
 	0x11236, 0x11237,
 	0x1123e, 0x1123e,
+	0x11241, 0x11241,
 	0x112df, 0x112df,
 	0x112e3, 0x112ea,
 	0x11300, 0x11301,
@@ -19064,6 +19274,12 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x11d95, 0x11d95,
 	0x11d97, 0x11d97,
 	0x11ef3, 0x11ef4,
+	0x11f00, 0x11f01,
+	0x11f36, 0x11f3a,
+	0x11f40, 0x11f40,
+	0x11f42, 0x11f42,
+	0x13440, 0x13440,
+	0x13447, 0x13455,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
@@ -19090,9 +19306,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e08f, 0x1e08f,
 	0x1e130, 0x1e136,
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
+	0x1e4ec, 0x1e4ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0xe0020, 0xe007f,
@@ -19101,7 +19319,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
 
 /* 'Grapheme_Base': Derived Property */
 static const OnigCodePoint CR_Grapheme_Base[] = {
-	861,
+	875,
 	0x0020, 0x007e,
 	0x00a0, 0x00ac,
 	0x00ae, 0x02ff,
@@ -19251,7 +19469,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce1,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 	0x0d02, 0x0d0c,
 	0x0d0e, 0x0d10,
 	0x0d12, 0x0d3a,
@@ -19670,6 +19888,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11232, 0x11233,
 	0x11235, 0x11235,
 	0x11238, 0x1123d,
+	0x1123f, 0x11240,
 	0x11280, 0x11286,
 	0x11288, 0x11288,
 	0x1128a, 0x1128d,
@@ -19756,6 +19975,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11a97, 0x11a97,
 	0x11a9a, 0x11aa2,
 	0x11ab0, 0x11af8,
+	0x11b00, 0x11b09,
 	0x11c00, 0x11c08,
 	0x11c0a, 0x11c2f,
 	0x11c3e, 0x11c3e,
@@ -19779,6 +19999,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x11da0, 0x11da9,
 	0x11ee0, 0x11ef2,
 	0x11ef5, 0x11ef8,
+	0x11f02, 0x11f10,
+	0x11f12, 0x11f35,
+	0x11f3e, 0x11f3f,
+	0x11f41, 0x11f41,
+	0x11f43, 0x11f59,
 	0x11fb0, 0x11fb0,
 	0x11fc0, 0x11ff1,
 	0x11fff, 0x12399,
@@ -19786,7 +20011,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x12470, 0x12474,
 	0x12480, 0x12543,
 	0x12f90, 0x12ff2,
-	0x13000, 0x1342e,
+	0x13000, 0x1342f,
+	0x13441, 0x13446,
 	0x14400, 0x14646,
 	0x16800, 0x16a38,
 	0x16a40, 0x16a5e,
@@ -19814,7 +20040,9 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1aff5, 0x1affb,
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 	0x1b170, 0x1b2fb,
 	0x1bc00, 0x1bc6a,
@@ -19834,6 +20062,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1d1ae, 0x1d1ea,
 	0x1d200, 0x1d241,
 	0x1d245, 0x1d245,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d378,
@@ -19863,6 +20092,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1da76, 0x1da83,
 	0x1da85, 0x1da8b,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
+	0x1e030, 0x1e06d,
 	0x1e100, 0x1e12c,
 	0x1e137, 0x1e13d,
 	0x1e140, 0x1e149,
@@ -19871,6 +20102,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1e2c0, 0x1e2eb,
 	0x1e2f0, 0x1e2f9,
 	0x1e2ff, 0x1e2ff,
+	0x1e4d0, 0x1e4eb,
+	0x1e4f0, 0x1e4f9,
 	0x1e7e0, 0x1e7e6,
 	0x1e7e8, 0x1e7eb,
 	0x1e7ed, 0x1e7ee,
@@ -19930,10 +20163,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -19944,30 +20177,29 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 	0x1fbf0, 0x1fbf9,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_Grapheme_Base */
 
 /* 'Grapheme_Link': Derived Property */
 static const OnigCodePoint CR_Grapheme_Link[] = {
-	55,
+	56,
 	0x094d, 0x094d,
 	0x09cd, 0x09cd,
 	0x0a4d, 0x0a4d,
@@ -20023,11 +20255,12 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
 	0x11c3f, 0x11c3f,
 	0x11d44, 0x11d45,
 	0x11d97, 0x11d97,
+	0x11f41, 0x11f42,
 }; /* CR_Grapheme_Link */
 
 /* 'Common': Script */
 static const OnigCodePoint CR_Common[] = {
-	174,
+	173,
 	0x0000, 0x0040,
 	0x005b, 0x0060,
 	0x007b, 0x00a9,
@@ -20134,6 +20367,7 @@ static const OnigCodePoint CR_Common[] = {
 	0x1d183, 0x1d184,
 	0x1d18c, 0x1d1a9,
 	0x1d1ae, 0x1d1ea,
+	0x1d2c0, 0x1d2d3,
 	0x1d2e0, 0x1d2f3,
 	0x1d300, 0x1d356,
 	0x1d360, 0x1d378,
@@ -20174,10 +20408,10 @@ static const OnigCodePoint CR_Common[] = {
 	0x1f250, 0x1f251,
 	0x1f260, 0x1f265,
 	0x1f300, 0x1f6d7,
-	0x1f6dd, 0x1f6ec,
+	0x1f6dc, 0x1f6ec,
 	0x1f6f0, 0x1f6fc,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d8,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
 	0x1f7e0, 0x1f7eb,
 	0x1f7f0, 0x1f7f0,
 	0x1f800, 0x1f80b,
@@ -20188,15 +20422,13 @@ static const OnigCodePoint CR_Common[] = {
 	0x1f8b0, 0x1f8b1,
 	0x1f900, 0x1fa53,
 	0x1fa60, 0x1fa6d,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 	0x1fb00, 0x1fb92,
 	0x1fb94, 0x1fbca,
 	0x1fbf0, 0x1fbf9,
@@ -20206,7 +20438,7 @@ static const OnigCodePoint CR_Common[] = {
 
 /* 'Latin': Script */
 static const OnigCodePoint CR_Latin[] = {
-	38,
+	39,
 	0x0041, 0x005a,
 	0x0061, 0x007a,
 	0x00aa, 0x00aa,
@@ -20245,6 +20477,7 @@ static const OnigCodePoint CR_Latin[] = {
 	0x10787, 0x107b0,
 	0x107b2, 0x107ba,
 	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
 }; /* CR_Latin */
 
 /* 'Greek': Script */
@@ -20290,7 +20523,7 @@ static const OnigCodePoint CR_Greek[] = {
 
 /* 'Cyrillic': Script */
 static const OnigCodePoint CR_Cyrillic[] = {
-	8,
+	10,
 	0x0400, 0x0484,
 	0x0487, 0x052f,
 	0x1c80, 0x1c88,
@@ -20299,6 +20532,8 @@ static const OnigCodePoint CR_Cyrillic[] = {
 	0x2de0, 0x2dff,
 	0xa640, 0xa69f,
 	0xfe2e, 0xfe2f,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
 }; /* CR_Cyrillic */
 
 /* 'Armenian': Script */
@@ -20326,7 +20561,7 @@ static const OnigCodePoint CR_Hebrew[] = {
 
 /* 'Arabic': Script */
 static const OnigCodePoint CR_Arabic[] = {
-	57,
+	58,
 	0x0600, 0x0604,
 	0x0606, 0x060b,
 	0x060d, 0x061a,
@@ -20350,6 +20585,7 @@ static const OnigCodePoint CR_Arabic[] = {
 	0xfe70, 0xfe74,
 	0xfe76, 0xfefc,
 	0x10e60, 0x10e7e,
+	0x10efd, 0x10eff,
 	0x1ee00, 0x1ee03,
 	0x1ee05, 0x1ee1f,
 	0x1ee21, 0x1ee22,
@@ -20403,11 +20639,12 @@ static const OnigCodePoint CR_Thaana[] = {
 
 /* 'Devanagari': Script */
 static const OnigCodePoint CR_Devanagari[] = {
-	4,
+	5,
 	0x0900, 0x0950,
 	0x0955, 0x0963,
 	0x0966, 0x097f,
 	0xa8e0, 0xa8ff,
+	0x11b00, 0x11b09,
 }; /* CR_Devanagari */
 
 /* 'Bengali': Script */
@@ -20544,7 +20781,7 @@ static const OnigCodePoint CR_Kannada[] = {
 	0x0cdd, 0x0cde,
 	0x0ce0, 0x0ce3,
 	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
+	0x0cf1, 0x0cf3,
 }; /* CR_Kannada */
 
 /* 'Malayalam': Script */
@@ -20595,7 +20832,7 @@ static const OnigCodePoint CR_Lao[] = {
 	0x0ea7, 0x0ebd,
 	0x0ec0, 0x0ec4,
 	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0ed0, 0x0ed9,
 	0x0edc, 0x0edf,
 }; /* CR_Lao */
@@ -20746,17 +20983,18 @@ static const OnigCodePoint CR_Mongolian[] = {
 
 /* 'Hiragana': Script */
 static const OnigCodePoint CR_Hiragana[] = {
-	5,
+	6,
 	0x3041, 0x3096,
 	0x309d, 0x309f,
 	0x1b001, 0x1b11f,
+	0x1b132, 0x1b132,
 	0x1b150, 0x1b152,
 	0x1f200, 0x1f200,
 }; /* CR_Hiragana */
 
 /* 'Katakana': Script */
 static const OnigCodePoint CR_Katakana[] = {
-	13,
+	14,
 	0x30a1, 0x30fa,
 	0x30fd, 0x30ff,
 	0x31f0, 0x31ff,
@@ -20769,6 +21007,7 @@ static const OnigCodePoint CR_Katakana[] = {
 	0x1affd, 0x1affe,
 	0x1b000, 0x1b000,
 	0x1b120, 0x1b122,
+	0x1b155, 0x1b155,
 	0x1b164, 0x1b167,
 }; /* CR_Katakana */
 
@@ -20782,7 +21021,7 @@ static const OnigCodePoint CR_Bopomofo[] = {
 
 /* 'Han': Script */
 static const OnigCodePoint CR_Han[] = {
-	20,
+	21,
 	0x2e80, 0x2e99,
 	0x2e9b, 0x2ef3,
 	0x2f00, 0x2fd5,
@@ -20797,12 +21036,13 @@ static const OnigCodePoint CR_Han[] = {
 	0x16fe2, 0x16fe3,
 	0x16ff0, 0x16ff1,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_Han */
 
 /* 'Yi': Script */
@@ -21165,9 +21405,8 @@ static const OnigCodePoint CR_Avestan[] = {
 
 /* 'Egyptian_Hieroglyphs': Script */
 static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	2,
-	0x13000, 0x1342e,
-	0x13430, 0x13438,
+	1,
+	0x13000, 0x13455,
 }; /* CR_Egyptian_Hieroglyphs */
 
 /* 'Samaritan': Script */
@@ -21382,7 +21621,7 @@ static const OnigCodePoint CR_Pahawh_Hmong[] = {
 static const OnigCodePoint CR_Khojki[] = {
 	2,
 	0x11200, 0x11211,
-	0x11213, 0x1123e,
+	0x11213, 0x11241,
 }; /* CR_Khojki */
 
 /* 'Linear_A': Script */
@@ -21772,6 +22011,20 @@ static const OnigCodePoint CR_Vithkuqi[] = {
 	0x105bb, 0x105bc,
 }; /* CR_Vithkuqi */
 
+/* 'Kawi': Script */
+static const OnigCodePoint CR_Kawi[] = {
+	3,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f59,
+}; /* CR_Kawi */
+
+/* 'Nag_Mundari': Script */
+static const OnigCodePoint CR_Nag_Mundari[] = {
+	1,
+	0x1e4d0, 0x1e4f9,
+}; /* CR_Nag_Mundari */
+
 /* 'White_Space': Binary Property */
 #define CR_White_Space CR_Space
 
@@ -21853,7 +22106,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
 
 /* 'Terminal_Punctuation': Binary Property */
 static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	107,
+	108,
 	0x0021, 0x0021,
 	0x002c, 0x002c,
 	0x002e, 0x002e,
@@ -21953,6 +22206,7 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
 	0x11c41, 0x11c43,
 	0x11c71, 0x11c71,
 	0x11ef7, 0x11ef8,
+	0x11f43, 0x11f44,
 	0x12470, 0x12474,
 	0x16a6e, 0x16a6f,
 	0x16af5, 0x16af5,
@@ -22118,7 +22372,7 @@ static const OnigCodePoint CR_Hex_Digit[] = {
 
 /* 'Other_Alphabetic': Binary Property */
 static const OnigCodePoint CR_Other_Alphabetic[] = {
-	233,
+	240,
 	0x0345, 0x0345,
 	0x05b0, 0x05bd,
 	0x05bf, 0x05bf,
@@ -22178,7 +22432,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0bc6, 0x0bc8,
 	0x0bca, 0x0bcc,
 	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
+	0x0c00, 0x0c04,
 	0x0c3e, 0x0c44,
 	0x0c46, 0x0c48,
 	0x0c4a, 0x0c4c,
@@ -22190,6 +22444,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0cca, 0x0ccc,
 	0x0cd5, 0x0cd6,
 	0x0ce2, 0x0ce3,
+	0x0cf3, 0x0cf3,
 	0x0d00, 0x0d03,
 	0x0d3e, 0x0d44,
 	0x0d46, 0x0d48,
@@ -22208,7 +22463,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x0eb4, 0x0eb9,
 	0x0ebb, 0x0ebc,
 	0x0ecd, 0x0ecd,
-	0x0f71, 0x0f81,
+	0x0f71, 0x0f83,
 	0x0f8d, 0x0f97,
 	0x0f99, 0x0fbc,
 	0x102b, 0x1036,
@@ -22281,7 +22536,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x11000, 0x11002,
 	0x11038, 0x11045,
 	0x11073, 0x11074,
-	0x11082, 0x11082,
+	0x11080, 0x11082,
 	0x110b0, 0x110b8,
 	0x110c2, 0x110c2,
 	0x11100, 0x11102,
@@ -22293,6 +22548,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1122c, 0x11234,
 	0x11237, 0x11237,
 	0x1123e, 0x1123e,
+	0x11241, 0x11241,
 	0x112df, 0x112e8,
 	0x11300, 0x11303,
 	0x1133e, 0x11344,
@@ -22338,6 +22594,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x11d90, 0x11d91,
 	0x11d93, 0x11d96,
 	0x11ef3, 0x11ef6,
+	0x11f00, 0x11f01,
+	0x11f03, 0x11f03,
+	0x11f34, 0x11f3a,
+	0x11f3e, 0x11f40,
 	0x16f4f, 0x16f4f,
 	0x16f51, 0x16f87,
 	0x16f8f, 0x16f92,
@@ -22348,6 +22608,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e08f, 0x1e08f,
 	0x1e947, 0x1e947,
 	0x1f130, 0x1f149,
 	0x1f150, 0x1f169,
@@ -22356,7 +22617,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
 
 /* 'Ideographic': Binary Property */
 static const OnigCodePoint CR_Ideographic[] = {
-	19,
+	20,
 	0x3006, 0x3007,
 	0x3021, 0x3029,
 	0x3038, 0x303a,
@@ -22370,17 +22631,18 @@ static const OnigCodePoint CR_Ideographic[] = {
 	0x18d00, 0x18d08,
 	0x1b170, 0x1b2fb,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x2f800, 0x2fa1d,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_Ideographic */
 
 /* 'Diacritic': Binary Property */
 static const OnigCodePoint CR_Diacritic[] = {
-	192,
+	195,
 	0x005e, 0x005e,
 	0x0060, 0x0060,
 	0x00a8, 0x00a8,
@@ -22520,6 +22782,7 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x107b2, 0x107ba,
 	0x10ae5, 0x10ae6,
 	0x10d22, 0x10d27,
+	0x10efd, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11046, 0x11046,
@@ -22553,6 +22816,7 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x11d42, 0x11d42,
 	0x11d44, 0x11d45,
 	0x11d97, 0x11d97,
+	0x13447, 0x13455,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f8f, 0x16f9f,
@@ -22567,6 +22831,7 @@ static const OnigCodePoint CR_Diacritic[] = {
 	0x1d17b, 0x1d182,
 	0x1d185, 0x1d18b,
 	0x1d1aa, 0x1d1ad,
+	0x1e030, 0x1e06d,
 	0x1e130, 0x1e136,
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
@@ -22615,7 +22880,7 @@ static const OnigCodePoint CR_Extender[] = {
 
 /* 'Other_Lowercase': Binary Property */
 static const OnigCodePoint CR_Other_Lowercase[] = {
-	20,
+	28,
 	0x00aa, 0x00aa,
 	0x00ba, 0x00ba,
 	0x02b0, 0x02b8,
@@ -22623,6 +22888,7 @@ static const OnigCodePoint CR_Other_Lowercase[] = {
 	0x02e0, 0x02e4,
 	0x0345, 0x0345,
 	0x037a, 0x037a,
+	0x10fc, 0x10fc,
 	0x1d2c, 0x1d6a,
 	0x1d78, 0x1d78,
 	0x1d9b, 0x1dbf,
@@ -22634,8 +22900,15 @@ static const OnigCodePoint CR_Other_Lowercase[] = {
 	0x2c7c, 0x2c7d,
 	0xa69c, 0xa69d,
 	0xa770, 0xa770,
+	0xa7f2, 0xa7f4,
 	0xa7f8, 0xa7f9,
 	0xab5c, 0xab5f,
+	0xab69, 0xab69,
+	0x10780, 0x10780,
+	0x10783, 0x10785,
+	0x10787, 0x107b0,
+	0x107b2, 0x107ba,
+	0x1e030, 0x1e06d,
 }; /* CR_Other_Lowercase */
 
 /* 'Other_Uppercase': Binary Property */
@@ -22724,7 +22997,7 @@ static const OnigCodePoint CR_Radical[] = {
 
 /* 'Unified_Ideograph': Binary Property */
 static const OnigCodePoint CR_Unified_Ideograph[] = {
-	15,
+	16,
 	0x3400, 0x4dbf,
 	0x4e00, 0x9fff,
 	0xfa0e, 0xfa0f,
@@ -22735,11 +23008,12 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
 	0xfa23, 0xfa24,
 	0xfa27, 0xfa29,
 	0x20000, 0x2a6df,
-	0x2a700, 0x2b738,
+	0x2a700, 0x2b739,
 	0x2b740, 0x2b81d,
 	0x2b820, 0x2cea1,
 	0x2ceb0, 0x2ebe0,
 	0x30000, 0x3134a,
+	0x31350, 0x323af,
 }; /* CR_Unified_Ideograph */
 
 /* 'Other_Default_Ignorable_Code_Point': Binary Property */
@@ -22773,7 +23047,7 @@ static const OnigCodePoint CR_Deprecated[] = {
 
 /* 'Soft_Dotted': Binary Property */
 static const OnigCodePoint CR_Soft_Dotted[] = {
-	32,
+	34,
 	0x0069, 0x006a,
 	0x012f, 0x012f,
 	0x0249, 0x0249,
@@ -22806,6 +23080,8 @@ static const OnigCodePoint CR_Soft_Dotted[] = {
 	0x1d65e, 0x1d65f,
 	0x1d692, 0x1d693,
 	0x1df1a, 0x1df1a,
+	0x1e04c, 0x1e04d,
+	0x1e068, 0x1e068,
 }; /* CR_Soft_Dotted */
 
 /* 'Logical_Order_Exception': Binary Property */
@@ -22840,7 +23116,7 @@ static const OnigCodePoint CR_Other_ID_Continue[] = {
 
 /* 'Sentence_Terminal': Binary Property */
 static const OnigCodePoint CR_Sentence_Terminal[] = {
-	79,
+	80,
 	0x0021, 0x0021,
 	0x002e, 0x002e,
 	0x003f, 0x003f,
@@ -22913,6 +23189,7 @@ static const OnigCodePoint CR_Sentence_Terminal[] = {
 	0x11a9b, 0x11a9c,
 	0x11c41, 0x11c42,
 	0x11ef7, 0x11ef8,
+	0x11f43, 0x11f44,
 	0x16a6e, 0x16a6f,
 	0x16af5, 0x16af5,
 	0x16b37, 0x16b38,
@@ -22994,7 +23271,7 @@ static const OnigCodePoint CR_Regional_Indicator[] = {
 
 /* 'Emoji': Emoji */
 static const OnigCodePoint CR_Emoji[] = {
-	153,
+	151,
 	0x0023, 0x0023,
 	0x002a, 0x002a,
 	0x0030, 0x0039,
@@ -23129,7 +23406,7 @@ static const OnigCodePoint CR_Emoji[] = {
 	0x1f680, 0x1f6c5,
 	0x1f6cb, 0x1f6d2,
 	0x1f6d5, 0x1f6d7,
-	0x1f6dd, 0x1f6e5,
+	0x1f6dc, 0x1f6e5,
 	0x1f6e9, 0x1f6e9,
 	0x1f6eb, 0x1f6ec,
 	0x1f6f0, 0x1f6f0,
@@ -23139,20 +23416,18 @@ static const OnigCodePoint CR_Emoji[] = {
 	0x1f90c, 0x1f93a,
 	0x1f93c, 0x1f945,
 	0x1f947, 0x1f9ff,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 }; /* CR_Emoji */
 
 /* 'Emoji_Presentation': Emoji */
 static const OnigCodePoint CR_Emoji_Presentation[] = {
-	83,
+	81,
 	0x231a, 0x231b,
 	0x23e9, 0x23ec,
 	0x23f0, 0x23f0,
@@ -23219,7 +23494,7 @@ static const OnigCodePoint CR_Emoji_Presentation[] = {
 	0x1f6cc, 0x1f6cc,
 	0x1f6d0, 0x1f6d2,
 	0x1f6d5, 0x1f6d7,
-	0x1f6dd, 0x1f6df,
+	0x1f6dc, 0x1f6df,
 	0x1f6eb, 0x1f6ec,
 	0x1f6f4, 0x1f6fc,
 	0x1f7e0, 0x1f7eb,
@@ -23227,15 +23502,13 @@ static const OnigCodePoint CR_Emoji_Presentation[] = {
 	0x1f90c, 0x1f93a,
 	0x1f93c, 0x1f945,
 	0x1f947, 0x1f9ff,
-	0x1fa70, 0x1fa74,
-	0x1fa78, 0x1fa7c,
-	0x1fa80, 0x1fa86,
-	0x1fa90, 0x1faac,
-	0x1fab0, 0x1faba,
-	0x1fac0, 0x1fac5,
-	0x1fad0, 0x1fad9,
-	0x1fae0, 0x1fae7,
-	0x1faf0, 0x1faf6,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
 }; /* CR_Emoji_Presentation */
 
 /* 'Emoji_Modifier': Emoji */
@@ -23286,7 +23559,7 @@ static const OnigCodePoint CR_Emoji_Modifier_Base[] = {
 	0x1f9cd, 0x1f9cf,
 	0x1f9d1, 0x1f9dd,
 	0x1fac3, 0x1fac5,
-	0x1faf0, 0x1faf6,
+	0x1faf0, 0x1faf8,
 }; /* CR_Emoji_Modifier_Base */
 
 /* 'Emoji_Component': Emoji */
@@ -23389,7 +23662,7 @@ static const OnigCodePoint CR_Extended_Pictographic[] = {
 
 /* 'Unknown': Script */
 static const OnigCodePoint CR_Unknown[] = {
-	696,
+	705,
 	0x0378, 0x0379,
 	0x0380, 0x0383,
 	0x038b, 0x038b,
@@ -23511,7 +23784,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x0cdf, 0x0cdf,
 	0x0ce4, 0x0ce5,
 	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0cff,
+	0x0cf4, 0x0cff,
 	0x0d0d, 0x0d0d,
 	0x0d11, 0x0d11,
 	0x0d45, 0x0d45,
@@ -23541,7 +23814,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x0ebe, 0x0ebf,
 	0x0ec5, 0x0ec5,
 	0x0ec7, 0x0ec7,
-	0x0ece, 0x0ecf,
+	0x0ecf, 0x0ecf,
 	0x0eda, 0x0edb,
 	0x0ee0, 0x0eff,
 	0x0f48, 0x0f48,
@@ -23811,7 +24084,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x10e7f, 0x10e7f,
 	0x10eaa, 0x10eaa,
 	0x10eae, 0x10eaf,
-	0x10eb2, 0x10eff,
+	0x10eb2, 0x10efc,
 	0x10f28, 0x10f2f,
 	0x10f5a, 0x10f6f,
 	0x10f8a, 0x10faf,
@@ -23829,7 +24102,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x111e0, 0x111e0,
 	0x111f5, 0x111ff,
 	0x11212, 0x11212,
-	0x1123f, 0x1127f,
+	0x11242, 0x1127f,
 	0x11287, 0x11287,
 	0x11289, 0x11289,
 	0x1128e, 0x1128e,
@@ -23881,7 +24154,8 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x119e5, 0x119ff,
 	0x11a48, 0x11a4f,
 	0x11aa3, 0x11aaf,
-	0x11af9, 0x11bff,
+	0x11af9, 0x11aff,
+	0x11b0a, 0x11bff,
 	0x11c09, 0x11c09,
 	0x11c37, 0x11c37,
 	0x11c46, 0x11c4f,
@@ -23902,7 +24176,10 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x11d92, 0x11d92,
 	0x11d99, 0x11d9f,
 	0x11daa, 0x11edf,
-	0x11ef9, 0x11faf,
+	0x11ef9, 0x11eff,
+	0x11f11, 0x11f11,
+	0x11f3b, 0x11f3d,
+	0x11f5a, 0x11faf,
 	0x11fb1, 0x11fbf,
 	0x11ff2, 0x11ffe,
 	0x1239a, 0x123ff,
@@ -23910,8 +24187,7 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x12475, 0x1247f,
 	0x12544, 0x12f8f,
 	0x12ff3, 0x12fff,
-	0x1342f, 0x1342f,
-	0x13439, 0x143ff,
+	0x13456, 0x143ff,
 	0x14647, 0x167ff,
 	0x16a39, 0x16a3f,
 	0x16a5f, 0x16a5f,
@@ -23937,8 +24213,10 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1aff4, 0x1aff4,
 	0x1affc, 0x1affc,
 	0x1afff, 0x1afff,
-	0x1b123, 0x1b14f,
-	0x1b153, 0x1b163,
+	0x1b123, 0x1b131,
+	0x1b133, 0x1b14f,
+	0x1b153, 0x1b154,
+	0x1b156, 0x1b163,
 	0x1b168, 0x1b16f,
 	0x1b2fc, 0x1bbff,
 	0x1bc6b, 0x1bc6f,
@@ -23952,7 +24230,8 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1d0f6, 0x1d0ff,
 	0x1d127, 0x1d128,
 	0x1d1eb, 0x1d1ff,
-	0x1d246, 0x1d2df,
+	0x1d246, 0x1d2bf,
+	0x1d2d4, 0x1d2df,
 	0x1d2f4, 0x1d2ff,
 	0x1d357, 0x1d35f,
 	0x1d379, 0x1d3ff,
@@ -23979,19 +24258,23 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1da8c, 0x1da9a,
 	0x1daa0, 0x1daa0,
 	0x1dab0, 0x1deff,
-	0x1df1f, 0x1dfff,
+	0x1df1f, 0x1df24,
+	0x1df2b, 0x1dfff,
 	0x1e007, 0x1e007,
 	0x1e019, 0x1e01a,
 	0x1e022, 0x1e022,
 	0x1e025, 0x1e025,
-	0x1e02b, 0x1e0ff,
+	0x1e02b, 0x1e02f,
+	0x1e06e, 0x1e08e,
+	0x1e090, 0x1e0ff,
 	0x1e12d, 0x1e12f,
 	0x1e13e, 0x1e13f,
 	0x1e14a, 0x1e14d,
 	0x1e150, 0x1e28f,
 	0x1e2af, 0x1e2bf,
 	0x1e2fa, 0x1e2fe,
-	0x1e300, 0x1e7df,
+	0x1e300, 0x1e4cf,
+	0x1e4fa, 0x1e7df,
 	0x1e7e7, 0x1e7e7,
 	0x1e7ec, 0x1e7ec,
 	0x1e7ef, 0x1e7ef,
@@ -24049,11 +24332,11 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1f249, 0x1f24f,
 	0x1f252, 0x1f25f,
 	0x1f266, 0x1f2ff,
-	0x1f6d8, 0x1f6dc,
+	0x1f6d8, 0x1f6db,
 	0x1f6ed, 0x1f6ef,
 	0x1f6fd, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d9, 0x1f7df,
+	0x1f777, 0x1f77a,
+	0x1f7da, 0x1f7df,
 	0x1f7ec, 0x1f7ef,
 	0x1f7f1, 0x1f7ff,
 	0x1f80c, 0x1f80f,
@@ -24064,25 +24347,24 @@ static const OnigCodePoint CR_Unknown[] = {
 	0x1f8b2, 0x1f8ff,
 	0x1fa54, 0x1fa5f,
 	0x1fa6e, 0x1fa6f,
-	0x1fa75, 0x1fa77,
 	0x1fa7d, 0x1fa7f,
-	0x1fa87, 0x1fa8f,
-	0x1faad, 0x1faaf,
-	0x1fabb, 0x1fabf,
-	0x1fac6, 0x1facf,
-	0x1fada, 0x1fadf,
-	0x1fae8, 0x1faef,
-	0x1faf7, 0x1faff,
+	0x1fa89, 0x1fa8f,
+	0x1fabe, 0x1fabe,
+	0x1fac6, 0x1facd,
+	0x1fadc, 0x1fadf,
+	0x1fae9, 0x1faef,
+	0x1faf9, 0x1faff,
 	0x1fb93, 0x1fb93,
 	0x1fbcb, 0x1fbef,
 	0x1fbfa, 0x1ffff,
 	0x2a6e0, 0x2a6ff,
-	0x2b739, 0x2b73f,
+	0x2b73a, 0x2b73f,
 	0x2b81e, 0x2b81f,
 	0x2cea2, 0x2ceaf,
 	0x2ebe1, 0x2f7ff,
 	0x2fa1e, 0x2ffff,
-	0x3134b, 0xe0000,
+	0x3134b, 0x3134f,
+	0x323b0, 0xe0000,
 	0xe0002, 0xe001f,
 	0xe0080, 0xe00ff,
 	0xe01f0, 0x10ffff,
@@ -36632,10 +36914,730 @@ static const OnigCodePoint CR_Age_14_0[] = {
 	0xefffe, 0x10ffff,
 }; /* CR_Age_14_0 */
 
+/* 'Age_15_0': Derived Age 15.0 */
+static const OnigCodePoint CR_Age_15_0[] = {
+	715,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x0870, 0x088e,
+	0x0890, 0x0891,
+	0x0898, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b55, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3c, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c5d, 0x0c5d,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cdd, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf3,
+	0x0d00, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d81, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ece,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	0x1700, 0x1715,
+	0x171f, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1ace,
+	0x1b00, 0x1b4c,
+	0x1b50, 0x1b7e,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1f15,
+	0x1f18, 0x1f1d,
+	0x1f20, 0x1f45,
+	0x1f48, 0x1f4d,
+	0x1f50, 0x1f57,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fc4,
+	0x1fc6, 0x1fd3,
+	0x1fd6, 0x1fdb,
+	0x1fdd, 0x1fef,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ffe,
+	0x2000, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20c0,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b97, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e5d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7ca,
+	0xa7d0, 0xa7d1,
+	0xa7d3, 0xa7d3,
+	0xa7d5, 0xa7d9,
+	0xa7f2, 0xa82c,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab6b,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc2,
+	0xfbd3, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdcf, 0xfe19,
+	0xfe20, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019c,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1057a,
+	0x1057c, 0x1058a,
+	0x1058c, 0x10592,
+	0x10594, 0x10595,
+	0x10597, 0x105a1,
+	0x105a3, 0x105b1,
+	0x105b3, 0x105b9,
+	0x105bb, 0x105bc,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10780, 0x10785,
+	0x10787, 0x107b0,
+	0x107b2, 0x107ba,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10e80, 0x10ea9,
+	0x10eab, 0x10ead,
+	0x10eb0, 0x10eb1,
+	0x10efd, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10f70, 0x10f89,
+	0x10fb0, 0x10fcb,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x11075,
+	0x1107f, 0x110c2,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11147,
+	0x11150, 0x11176,
+	0x11180, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x11241,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1145b,
+	0x1145d, 0x11461,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b9,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x11746,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x11906,
+	0x11909, 0x11909,
+	0x1190c, 0x11913,
+	0x11915, 0x11916,
+	0x11918, 0x11935,
+	0x11937, 0x11938,
+	0x1193b, 0x11946,
+	0x11950, 0x11959,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ab0, 0x11af8,
+	0x11b00, 0x11b09,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11f00, 0x11f10,
+	0x11f12, 0x11f3a,
+	0x11f3e, 0x11f59,
+	0x11fb0, 0x11fb0,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x12f90, 0x12ff2,
+	0x13000, 0x13455,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16abe,
+	0x16ac0, 0x16ac9,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe4,
+	0x16ff0, 0x16ff1,
+	0x17000, 0x187f7,
+	0x18800, 0x18cd5,
+	0x18d00, 0x18d08,
+	0x1aff0, 0x1aff3,
+	0x1aff5, 0x1affb,
+	0x1affd, 0x1affe,
+	0x1b000, 0x1b122,
+	0x1b132, 0x1b132,
+	0x1b150, 0x1b152,
+	0x1b155, 0x1b155,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1cf00, 0x1cf2d,
+	0x1cf30, 0x1cf46,
+	0x1cf50, 0x1cfc3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1ea,
+	0x1d200, 0x1d245,
+	0x1d2c0, 0x1d2d3,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a5,
+	0x1d6a8, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1df00, 0x1df1e,
+	0x1df25, 0x1df2a,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e030, 0x1e06d,
+	0x1e08f, 0x1e08f,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e290, 0x1e2ae,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e4d0, 0x1e4f9,
+	0x1e7e0, 0x1e7e6,
+	0x1e7e8, 0x1e7eb,
+	0x1e7ed, 0x1e7ee,
+	0x1e7f0, 0x1e7fe,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f1ad,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d7,
+	0x1f6dc, 0x1f6ec,
+	0x1f6f0, 0x1f6fc,
+	0x1f700, 0x1f776,
+	0x1f77b, 0x1f7d9,
+	0x1f7e0, 0x1f7eb,
+	0x1f7f0, 0x1f7f0,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f8b0, 0x1f8b1,
+	0x1f900, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa7c,
+	0x1fa80, 0x1fa88,
+	0x1fa90, 0x1fabd,
+	0x1fabf, 0x1fac5,
+	0x1face, 0x1fadb,
+	0x1fae0, 0x1fae8,
+	0x1faf0, 0x1faf8,
+	0x1fb00, 0x1fb92,
+	0x1fb94, 0x1fbca,
+	0x1fbf0, 0x1fbf9,
+	0x1fffe, 0x2a6df,
+	0x2a700, 0x2b739,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x3134a,
+	0x31350, 0x323af,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_15_0 */
+
 #endif /* USE_UNICODE_AGE_PROPERTIES */
 /* 'Grapheme_Cluster_Break_Prepend': Grapheme_Cluster_Break=Prepend */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
-	14,
+	15,
 	0x0600, 0x0605,
 	0x06dd, 0x06dd,
 	0x070f, 0x070f,
@@ -36650,6 +37652,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
 	0x11a3a, 0x11a3a,
 	0x11a84, 0x11a89,
 	0x11d46, 0x11d46,
+	0x11f02, 0x11f02,
 }; /* CR_Grapheme_Cluster_Break_Prepend */
 
 /* 'Grapheme_Cluster_Break_CR': Grapheme_Cluster_Break=CR */
@@ -36677,7 +37680,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Control[] = {
 	0x2060, 0x206f,
 	0xfeff, 0xfeff,
 	0xfff0, 0xfffb,
-	0x13430, 0x13438,
+	0x13430, 0x1343f,
 	0x1bca0, 0x1bca3,
 	0x1d173, 0x1d17a,
 	0xe0000, 0xe001f,
@@ -36687,7 +37690,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Control[] = {
 
 /* 'Grapheme_Cluster_Break_Extend': Grapheme_Cluster_Break=Extend */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
-	354,
+	364,
 	0x0300, 0x036f,
 	0x0483, 0x0489,
 	0x0591, 0x05bd,
@@ -36790,7 +37793,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x0e47, 0x0e4e,
 	0x0eb1, 0x0eb1,
 	0x0eb4, 0x0ebc,
-	0x0ec8, 0x0ecd,
+	0x0ec8, 0x0ece,
 	0x0f18, 0x0f19,
 	0x0f35, 0x0f35,
 	0x0f37, 0x0f37,
@@ -36919,6 +37922,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x10ae5, 0x10ae6,
 	0x10d24, 0x10d27,
 	0x10eab, 0x10eac,
+	0x10efd, 0x10eff,
 	0x10f46, 0x10f50,
 	0x10f82, 0x10f85,
 	0x11001, 0x11001,
@@ -36941,6 +37945,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x11234, 0x11234,
 	0x11236, 0x11237,
 	0x1123e, 0x1123e,
+	0x11241, 0x11241,
 	0x112df, 0x112df,
 	0x112e3, 0x112ea,
 	0x11300, 0x11301,
@@ -37008,6 +38013,12 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x11d95, 0x11d95,
 	0x11d97, 0x11d97,
 	0x11ef3, 0x11ef4,
+	0x11f00, 0x11f01,
+	0x11f36, 0x11f3a,
+	0x11f40, 0x11f40,
+	0x11f42, 0x11f42,
+	0x13440, 0x13440,
+	0x13447, 0x13455,
 	0x16af0, 0x16af4,
 	0x16b30, 0x16b36,
 	0x16f4f, 0x16f4f,
@@ -37034,9 +38045,11 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 	0x1e01b, 0x1e021,
 	0x1e023, 0x1e024,
 	0x1e026, 0x1e02a,
+	0x1e08f, 0x1e08f,
 	0x1e130, 0x1e136,
 	0x1e2ae, 0x1e2ae,
 	0x1e2ec, 0x1e2ef,
+	0x1e4ec, 0x1e4ef,
 	0x1e8d0, 0x1e8d6,
 	0x1e944, 0x1e94a,
 	0x1f3fb, 0x1f3ff,
@@ -37049,7 +38062,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
 
 /* 'Grapheme_Cluster_Break_SpacingMark': Grapheme_Cluster_Break=SpacingMark */
 static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
-	161,
+	165,
 	0x0903, 0x0903,
 	0x093b, 0x093b,
 	0x093e, 0x0940,
@@ -37081,6 +38094,7 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x0cc3, 0x0cc4,
 	0x0cc7, 0x0cc8,
 	0x0cca, 0x0ccb,
+	0x0cf3, 0x0cf3,
 	0x0d02, 0x0d03,
 	0x0d3f, 0x0d40,
 	0x0d46, 0x0d48,
@@ -37183,7 +38197,6 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x116ac, 0x116ac,
 	0x116ae, 0x116af,
 	0x116b6, 0x116b6,
-	0x11720, 0x11721,
 	0x11726, 0x11726,
 	0x1182c, 0x1182e,
 	0x11838, 0x11838,
@@ -37207,6 +38220,10 @@ static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
 	0x11d93, 0x11d94,
 	0x11d96, 0x11d96,
 	0x11ef5, 0x11ef6,
+	0x11f03, 0x11f03,
+	0x11f34, 0x11f35,
+	0x11f3e, 0x11f3f,
+	0x11f41, 0x11f41,
 	0x16f51, 0x16f87,
 	0x16ff0, 0x16ff1,
 	0x1d166, 0x1d166,
@@ -39275,6 +40292,12 @@ static const OnigCodePoint CR_In_Yezidi[] = {
 	0x10e80, 0x10ebf,
 }; /* CR_In_Yezidi */
 
+/* 'In_Arabic_Extended_C': Block */
+static const OnigCodePoint CR_In_Arabic_Extended_C[] = {
+	1,
+	0x10ec0, 0x10eff,
+}; /* CR_In_Arabic_Extended_C */
+
 /* 'In_Old_Sogdian': Block */
 static const OnigCodePoint CR_In_Old_Sogdian[] = {
 	1,
@@ -39458,6 +40481,12 @@ static const OnigCodePoint CR_In_Pau_Cin_Hau[] = {
 	0x11ac0, 0x11aff,
 }; /* CR_In_Pau_Cin_Hau */
 
+/* 'In_Devanagari_Extended_A': Block */
+static const OnigCodePoint CR_In_Devanagari_Extended_A[] = {
+	1,
+	0x11b00, 0x11b5f,
+}; /* CR_In_Devanagari_Extended_A */
+
 /* 'In_Bhaiksuki': Block */
 static const OnigCodePoint CR_In_Bhaiksuki[] = {
 	1,
@@ -39488,6 +40517,12 @@ static const OnigCodePoint CR_In_Makasar[] = {
 	0x11ee0, 0x11eff,
 }; /* CR_In_Makasar */
 
+/* 'In_Kawi': Block */
+static const OnigCodePoint CR_In_Kawi[] = {
+	1,
+	0x11f00, 0x11f5f,
+}; /* CR_In_Kawi */
+
 /* 'In_Lisu_Supplement': Block */
 static const OnigCodePoint CR_In_Lisu_Supplement[] = {
 	1,
@@ -39533,7 +40568,7 @@ static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
 /* 'In_Egyptian_Hieroglyph_Format_Controls': Block */
 static const OnigCodePoint CR_In_Egyptian_Hieroglyph_Format_Controls[] = {
 	1,
-	0x13430, 0x1343f,
+	0x13430, 0x1345f,
 }; /* CR_In_Egyptian_Hieroglyph_Format_Controls */
 
 /* 'In_Anatolian_Hieroglyphs': Block */
@@ -39680,6 +40715,12 @@ static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
 	0x1d200, 0x1d24f,
 }; /* CR_In_Ancient_Greek_Musical_Notation */
 
+/* 'In_Kaktovik_Numerals': Block */
+static const OnigCodePoint CR_In_Kaktovik_Numerals[] = {
+	1,
+	0x1d2c0, 0x1d2df,
+}; /* CR_In_Kaktovik_Numerals */
+
 /* 'In_Mayan_Numerals': Block */
 static const OnigCodePoint CR_In_Mayan_Numerals[] = {
 	1,
@@ -39722,6 +40763,12 @@ static const OnigCodePoint CR_In_Glagolitic_Supplement[] = {
 	0x1e000, 0x1e02f,
 }; /* CR_In_Glagolitic_Supplement */
 
+/* 'In_Cyrillic_Extended_D': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_D[] = {
+	1,
+	0x1e030, 0x1e08f,
+}; /* CR_In_Cyrillic_Extended_D */
+
 /* 'In_Nyiakeng_Puachue_Hmong': Block */
 static const OnigCodePoint CR_In_Nyiakeng_Puachue_Hmong[] = {
 	1,
@@ -39740,6 +40787,12 @@ static const OnigCodePoint CR_In_Wancho[] = {
 	0x1e2c0, 0x1e2ff,
 }; /* CR_In_Wancho */
 
+/* 'In_Nag_Mundari': Block */
+static const OnigCodePoint CR_In_Nag_Mundari[] = {
+	1,
+	0x1e4d0, 0x1e4ff,
+}; /* CR_In_Nag_Mundari */
+
 /* 'In_Ethiopic_Extended_B': Block */
 static const OnigCodePoint CR_In_Ethiopic_Extended_B[] = {
 	1,
@@ -39914,6 +40967,12 @@ static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_G[] = {
 	0x30000, 0x3134f,
 }; /* CR_In_CJK_Unified_Ideographs_Extension_G */
 
+/* 'In_CJK_Unified_Ideographs_Extension_H': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_H[] = {
+	1,
+	0x31350, 0x323af,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_H */
+
 /* 'In_Tags': Block */
 static const OnigCodePoint CR_In_Tags[] = {
 	1,
@@ -39952,7 +41011,6 @@ static const OnigCodePoint CR_In_No_Block[] = {
 	0x10bb0, 0x10bff,
 	0x10c50, 0x10c7f,
 	0x10d40, 0x10e5f,
-	0x10ec0, 0x10eff,
 	0x11250, 0x1127f,
 	0x11380, 0x113ff,
 	0x114e0, 0x1157f,
@@ -39960,12 +41018,12 @@ static const OnigCodePoint CR_In_No_Block[] = {
 	0x11750, 0x117ff,
 	0x11850, 0x1189f,
 	0x11960, 0x1199f,
-	0x11b00, 0x11bff,
+	0x11b60, 0x11bff,
 	0x11cc0, 0x11cff,
 	0x11db0, 0x11edf,
-	0x11f00, 0x11faf,
+	0x11f60, 0x11faf,
 	0x12550, 0x12f8f,
-	0x13440, 0x143ff,
+	0x13460, 0x143ff,
 	0x14680, 0x167ff,
 	0x16b90, 0x16e3f,
 	0x16ea0, 0x16eff,
@@ -39974,12 +41032,13 @@ static const OnigCodePoint CR_In_No_Block[] = {
 	0x1b300, 0x1bbff,
 	0x1bcb0, 0x1ceff,
 	0x1cfd0, 0x1cfff,
-	0x1d250, 0x1d2df,
+	0x1d250, 0x1d2bf,
 	0x1d380, 0x1d3ff,
 	0x1dab0, 0x1deff,
-	0x1e030, 0x1e0ff,
+	0x1e090, 0x1e0ff,
 	0x1e150, 0x1e28f,
-	0x1e300, 0x1e7df,
+	0x1e300, 0x1e4cf,
+	0x1e500, 0x1e7df,
 	0x1e8e0, 0x1e8ff,
 	0x1e960, 0x1ec6f,
 	0x1ecc0, 0x1ecff,
@@ -39989,7 +41048,7 @@ static const OnigCodePoint CR_In_No_Block[] = {
 	0x2a6e0, 0x2a6ff,
 	0x2ebf0, 0x2f7ff,
 	0x2fa20, 0x2ffff,
-	0x31350, 0xdffff,
+	0x323b0, 0xdffff,
 	0xe0080, 0xe00ff,
 	0xe01f0, 0xeffff,
 }; /* CR_In_No_Block */
@@ -40233,6 +41292,8 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Tangsa,
   CR_Toto,
   CR_Vithkuqi,
+  CR_Kawi,
+  CR_Nag_Mundari,
   CR_White_Space,
   CR_Bidi_Control,
   CR_Join_Control,
@@ -40299,6 +41360,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_Age_12_1,
   CR_Age_13_0,
   CR_Age_14_0,
+  CR_Age_15_0,
 #endif /* USE_UNICODE_AGE_PROPERTIES */
   CR_Grapheme_Cluster_Break_Prepend,
   CR_Grapheme_Cluster_Break_CR,
@@ -40522,6 +41584,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Hanifi_Rohingya,
   CR_In_Rumi_Numeral_Symbols,
   CR_In_Yezidi,
+  CR_In_Arabic_Extended_C,
   CR_In_Old_Sogdian,
   CR_In_Sogdian,
   CR_In_Old_Uyghur,
@@ -40553,11 +41616,13 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Soyombo,
   CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended_A,
   CR_In_Pau_Cin_Hau,
+  CR_In_Devanagari_Extended_A,
   CR_In_Bhaiksuki,
   CR_In_Marchen,
   CR_In_Masaram_Gondi,
   CR_In_Gunjala_Gondi,
   CR_In_Makasar,
+  CR_In_Kawi,
   CR_In_Lisu_Supplement,
   CR_In_Tamil_Supplement,
   CR_In_Cuneiform,
@@ -40590,6 +41655,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Byzantine_Musical_Symbols,
   CR_In_Musical_Symbols,
   CR_In_Ancient_Greek_Musical_Notation,
+  CR_In_Kaktovik_Numerals,
   CR_In_Mayan_Numerals,
   CR_In_Tai_Xuan_Jing_Symbols,
   CR_In_Counting_Rod_Numerals,
@@ -40597,9 +41663,11 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_Sutton_SignWriting,
   CR_In_Latin_Extended_G,
   CR_In_Glagolitic_Supplement,
+  CR_In_Cyrillic_Extended_D,
   CR_In_Nyiakeng_Puachue_Hmong,
   CR_In_Toto,
   CR_In_Wancho,
+  CR_In_Nag_Mundari,
   CR_In_Ethiopic_Extended_B,
   CR_In_Mende_Kikakui,
   CR_In_Adlam,
@@ -40629,6 +41697,7 @@ static const OnigCodePoint* const CodeRanges[] = {
   CR_In_CJK_Unified_Ideographs_Extension_F,
   CR_In_CJK_Compatibility_Ideographs_Supplement,
   CR_In_CJK_Unified_Ideographs_Extension_G,
+  CR_In_CJK_Unified_Ideographs_Extension_H,
   CR_In_Tags,
   CR_In_Variation_Selectors_Supplement,
   CR_In_Supplementary_Private_Use_Area_A,
@@ -40653,9 +41722,9 @@ static const struct uniname2ctype_struct *uniname2ctype_p(register const char *s
 /* maximum key range = 15, duplicates = 0 */
 #else /* USE_UNICODE_PROPERTIES */
 #ifndef USE_UNICODE_AGE_PROPERTIES
-#define TOTAL_KEYWORDS 856
+#define TOTAL_KEYWORDS 866
 #else /* USE_UNICODE_AGE_PROPERTIES */
-#define TOTAL_KEYWORDS 880
+#define TOTAL_KEYWORDS 891
 #endif /* USE_UNICODE_AGE_PROPERTIES */
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 45
@@ -40704,13 +41773,13 @@ uniname2ctype_hash (register const char *str, register size_t len)
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
 #else /* USE_UNICODE_AGE_PROPERTIES */
       6099, 6099, 6099, 6099, 6099, 6099,   12, 6099,    3,    1,
-         4,    8,   36,   24,   14,   16,   10,    7, 6099, 6099,
+         4,    8,   32,   26,   14,   17,   10,    7, 6099, 6099,
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
       6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
       6099, 6099, 6099, 6099, 6099, 6099, 6099,    1, 1425,  113,
-       437,   37, 1086, 1071, 1051,    4, 1267,    9,  500,   88,
+       437,   37, 1086, 1071, 1051,    4, 1984,    9,  500,   88,
          8,   18, 1371, 1287,   54,  203,  310,  619, 1958,  603,
        275, 1624,   44,    1,   22, 6099, 6099, 6099, 6099, 6099
 #endif /* USE_UNICODE_PROPERTIES */
@@ -40940,6 +42009,7 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str636[sizeof("innewa")];
     char uniname2ctype_pool_str639[sizeof("sk")];
     char uniname2ctype_pool_str642[sizeof("control")];
+    char uniname2ctype_pool_str643[sizeof("inkawi")];
     char uniname2ctype_pool_str645[sizeof("inancientsymbols")];
     char uniname2ctype_pool_str647[sizeof("palm")];
     char uniname2ctype_pool_str650[sizeof("inlycian")];
@@ -40954,6 +42024,7 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str695[sizeof("inwarangciti")];
     char uniname2ctype_pool_str696[sizeof("sora")];
     char uniname2ctype_pool_str697[sizeof("inopticalcharacterrecognition")];
+    char uniname2ctype_pool_str700[sizeof("kawi")];
     char uniname2ctype_pool_str703[sizeof("inoldsogdian")];
     char uniname2ctype_pool_str705[sizeof("inmalayalam")];
     char uniname2ctype_pool_str707[sizeof("bamum")];
@@ -41074,11 +42145,13 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str1182[sizeof("inogham")];
     char uniname2ctype_pool_str1183[sizeof("cher")];
     char uniname2ctype_pool_str1185[sizeof("chakma")];
+    char uniname2ctype_pool_str1186[sizeof("inkaktoviknumerals")];
     char uniname2ctype_pool_str1190[sizeof("emoji")];
     char uniname2ctype_pool_str1191[sizeof("insiddham")];
     char uniname2ctype_pool_str1197[sizeof("cherokee")];
     char uniname2ctype_pool_str1198[sizeof("khar")];
     char uniname2ctype_pool_str1203[sizeof("inmongolian")];
+    char uniname2ctype_pool_str1204[sizeof("innagmundari")];
     char uniname2ctype_pool_str1207[sizeof("incherokeesupplement")];
     char uniname2ctype_pool_str1209[sizeof("manichaean")];
     char uniname2ctype_pool_str1212[sizeof("inolchiki")];
@@ -41122,48 +42195,46 @@ struct uniname2ctype_pool_t
 #ifdef USE_UNICODE_AGE_PROPERTIES
     char uniname2ctype_pool_str1257[sizeof("age=6.0")];
     char uniname2ctype_pool_str1258[sizeof("age=6.2")];
-    char uniname2ctype_pool_str1259[sizeof("age=7.0")];
+    char uniname2ctype_pool_str1259[sizeof("age=15.0")];
+    char uniname2ctype_pool_str1260[sizeof("age=7.0")];
     char uniname2ctype_pool_str1262[sizeof("age=6.3")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1263[sizeof("cwt")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1265[sizeof("age=5.1")];
+    char uniname2ctype_pool_str1265[sizeof("age=14.0")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1266[sizeof("unassigned")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1267[sizeof("age=5.0")];
-    char uniname2ctype_pool_str1268[sizeof("age=5.2")];
-    char uniname2ctype_pool_str1269[sizeof("age=14.0")];
+    char uniname2ctype_pool_str1267[sizeof("age=5.1")];
+    char uniname2ctype_pool_str1269[sizeof("age=5.0")];
+    char uniname2ctype_pool_str1270[sizeof("age=5.2")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1271[sizeof("diacritic")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1273[sizeof("age=4.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1274[sizeof("ahom")];
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1277[sizeof("age=4.1")];
-    char uniname2ctype_pool_str1279[sizeof("age=4.0")];
+    char uniname2ctype_pool_str1275[sizeof("age=4.0")];
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     char uniname2ctype_pool_str1282[sizeof("incjkunifiedideographsextensione")];
-    char uniname2ctype_pool_str1284[sizeof("hani")];
     char uniname2ctype_pool_str1285[sizeof("khmr")];
-    char uniname2ctype_pool_str1287[sizeof("han")];
     char uniname2ctype_pool_str1289[sizeof("insinhala")];
     char uniname2ctype_pool_str1292[sizeof("inmiscellaneoustechnical")];
     char uniname2ctype_pool_str1297[sizeof("saur")];
-    char uniname2ctype_pool_str1298[sizeof("hano")];
     char uniname2ctype_pool_str1300[sizeof("guru")];
     char uniname2ctype_pool_str1301[sizeof("sundanese")];
     char uniname2ctype_pool_str1306[sizeof("punct")];
     char uniname2ctype_pool_str1314[sizeof("paucinhau")];
     char uniname2ctype_pool_str1317[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str1323[sizeof("inkhojki")];
-    char uniname2ctype_pool_str1327[sizeof("hanunoo")];
     char uniname2ctype_pool_str1328[sizeof("chorasmian")];
-    char uniname2ctype_pool_str1330[sizeof("hira")];
     char uniname2ctype_pool_str1331[sizeof("logicalorderexception")];
     char uniname2ctype_pool_str1340[sizeof("khmer")];
     char uniname2ctype_pool_str1343[sizeof("limbu")];
     char uniname2ctype_pool_str1349[sizeof("chrs")];
     char uniname2ctype_pool_str1352[sizeof("oriya")];
     char uniname2ctype_pool_str1354[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str1356[sizeof("incyrillicextendedd")];
     char uniname2ctype_pool_str1358[sizeof("incjkunifiedideographsextensionc")];
     char uniname2ctype_pool_str1360[sizeof("cntrl")];
     char uniname2ctype_pool_str1365[sizeof("inlatinextendedadditional")];
@@ -41231,7 +42302,6 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str1587[sizeof("indogra")];
     char uniname2ctype_pool_str1597[sizeof("arab")];
     char uniname2ctype_pool_str1598[sizeof("medefaidrin")];
-    char uniname2ctype_pool_str1601[sizeof("hatran")];
     char uniname2ctype_pool_str1607[sizeof("inshorthandformatcontrols")];
     char uniname2ctype_pool_str1613[sizeof("phli")];
     char uniname2ctype_pool_str1617[sizeof("inimperialaramaic")];
@@ -41240,7 +42310,6 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str1623[sizeof("inanatolianhieroglyphs")];
     char uniname2ctype_pool_str1629[sizeof("punctuation")];
     char uniname2ctype_pool_str1635[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str1636[sizeof("hatr")];
     char uniname2ctype_pool_str1643[sizeof("cwl")];
     char uniname2ctype_pool_str1644[sizeof("vith")];
     char uniname2ctype_pool_str1654[sizeof("ingeometricshapes")];
@@ -41298,7 +42367,6 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str1845[sizeof("oidc")];
     char uniname2ctype_pool_str1848[sizeof("bopo")];
     char uniname2ctype_pool_str1851[sizeof("cuneiform")];
-    char uniname2ctype_pool_str1857[sizeof("hex")];
     char uniname2ctype_pool_str1866[sizeof("caseignorable")];
     char uniname2ctype_pool_str1871[sizeof("inoldpersian")];
     char uniname2ctype_pool_str1881[sizeof("cwu")];
@@ -41317,10 +42385,8 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str1935[sizeof("oids")];
     char uniname2ctype_pool_str1936[sizeof("inarabicextendeda")];
     char uniname2ctype_pool_str1941[sizeof("modifierletter")];
-    char uniname2ctype_pool_str1948[sizeof("gujr")];
     char uniname2ctype_pool_str1950[sizeof("incjksymbolsandpunctuation")];
     char uniname2ctype_pool_str1956[sizeof("olower")];
-    char uniname2ctype_pool_str1957[sizeof("gujarati")];
     char uniname2ctype_pool_str1958[sizeof("bopomofo")];
     char uniname2ctype_pool_str1964[sizeof("inlisu")];
     char uniname2ctype_pool_str1967[sizeof("inoldpermic")];
@@ -41334,19 +42400,26 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str1993[sizeof("inbalinese")];
     char uniname2ctype_pool_str1994[sizeof("sorasompeng")];
     char uniname2ctype_pool_str1996[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str2001[sizeof("hani")];
     char uniname2ctype_pool_str2002[sizeof("inmayannumerals")];
+    char uniname2ctype_pool_str2004[sizeof("han")];
     char uniname2ctype_pool_str2006[sizeof("inmiscellaneousmathematicalsymbolsb")];
     char uniname2ctype_pool_str2010[sizeof("inlepcha")];
     char uniname2ctype_pool_str2011[sizeof("patsyn")];
     char uniname2ctype_pool_str2012[sizeof("inlisusupplement")];
     char uniname2ctype_pool_str2014[sizeof("insyriacsupplement")];
+    char uniname2ctype_pool_str2015[sizeof("hano")];
     char uniname2ctype_pool_str2016[sizeof("newa")];
     char uniname2ctype_pool_str2023[sizeof("spacingmark")];
     char uniname2ctype_pool_str2024[sizeof("inpalmyrene")];
     char uniname2ctype_pool_str2026[sizeof("takr")];
     char uniname2ctype_pool_str2033[sizeof("xposixpunct")];
+    char uniname2ctype_pool_str2040[sizeof("inkhojki")];
     char uniname2ctype_pool_str2042[sizeof("taile")];
     char uniname2ctype_pool_str2043[sizeof("assigned")];
+    char uniname2ctype_pool_str2044[sizeof("hanunoo")];
+    char uniname2ctype_pool_str2047[sizeof("hira")];
+    char uniname2ctype_pool_str2048[sizeof("inarabicextendedc")];
     char uniname2ctype_pool_str2062[sizeof("newtailue")];
     char uniname2ctype_pool_str2070[sizeof("space")];
     char uniname2ctype_pool_str2073[sizeof("intelugu")];
@@ -41397,41 +42470,35 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2278[sizeof("shaw")];
     char uniname2ctype_pool_str2279[sizeof("palmyrene")];
     char uniname2ctype_pool_str2283[sizeof("soyo")];
+    char uniname2ctype_pool_str2296[sizeof("incjkunifiedideographsextensionh")];
     char uniname2ctype_pool_str2305[sizeof("sgnw")];
     char uniname2ctype_pool_str2308[sizeof("toto")];
     char uniname2ctype_pool_str2312[sizeof("caucasianalbanian")];
     char uniname2ctype_pool_str2315[sizeof("inmathematicalalphanumericsymbols")];
     char uniname2ctype_pool_str2316[sizeof("incjkunifiedideographsextensiong")];
+    char uniname2ctype_pool_str2318[sizeof("hatran")];
     char uniname2ctype_pool_str2321[sizeof("taiviet")];
     char uniname2ctype_pool_str2323[sizeof("meroitichieroglyphs")];
     char uniname2ctype_pool_str2327[sizeof("ingeorgianextended")];
     char uniname2ctype_pool_str2331[sizeof("incjkunifiedideographsextensionf")];
     char uniname2ctype_pool_str2333[sizeof("oldpersian")];
-    char uniname2ctype_pool_str2341[sizeof("mahj")];
     char uniname2ctype_pool_str2343[sizeof("induployan")];
     char uniname2ctype_pool_str2344[sizeof("incyrillicextendedb")];
     char uniname2ctype_pool_str2345[sizeof("dash")];
-    char uniname2ctype_pool_str2350[sizeof("mahajani")];
-    char uniname2ctype_pool_str2351[sizeof("hang")];
+    char uniname2ctype_pool_str2353[sizeof("hatr")];
     char uniname2ctype_pool_str2361[sizeof("innyiakengpuachuehmong")];
     char uniname2ctype_pool_str2364[sizeof("incombiningdiacriticalmarks")];
-    char uniname2ctype_pool_str2370[sizeof("ingujarati")];
     char uniname2ctype_pool_str2373[sizeof("nl")];
     char uniname2ctype_pool_str2374[sizeof("incombiningdiacriticalmarksforsymbols")];
     char uniname2ctype_pool_str2375[sizeof("khudawadi")];
-    char uniname2ctype_pool_str2389[sizeof("ingunjalagondi")];
     char uniname2ctype_pool_str2397[sizeof("incjkradicalssupplement")];
     char uniname2ctype_pool_str2398[sizeof("inglagolitic")];
     char uniname2ctype_pool_str2405[sizeof("orkh")];
-    char uniname2ctype_pool_str2406[sizeof("hiragana")];
     char uniname2ctype_pool_str2414[sizeof("syrc")];
-    char uniname2ctype_pool_str2418[sizeof("inrejang")];
     char uniname2ctype_pool_str2427[sizeof("surrogate")];
-    char uniname2ctype_pool_str2428[sizeof("khoj")];
     char uniname2ctype_pool_str2433[sizeof("indevanagari")];
     char uniname2ctype_pool_str2434[sizeof("avestan")];
     char uniname2ctype_pool_str2437[sizeof("oldpermic")];
-    char uniname2ctype_pool_str2438[sizeof("hmng")];
     char uniname2ctype_pool_str2440[sizeof("ethi")];
     char uniname2ctype_pool_str2451[sizeof("ogam")];
     char uniname2ctype_pool_str2454[sizeof("rohg")];
@@ -41439,7 +42506,7 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2464[sizeof("java")];
     char uniname2ctype_pool_str2470[sizeof("inphagspa")];
     char uniname2ctype_pool_str2475[sizeof("lepcha")];
-    char uniname2ctype_pool_str2476[sizeof("inenclosedcjklettersandmonths")];
+    char uniname2ctype_pool_str2476[sizeof("indevanagariextendeda")];
     char uniname2ctype_pool_str2478[sizeof("intifinagh")];
     char uniname2ctype_pool_str2479[sizeof("intagalog")];
     char uniname2ctype_pool_str2481[sizeof("incombiningdiacriticalmarkssupplement")];
@@ -41449,6 +42516,7 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2513[sizeof("insymbolsandpictographsextendeda")];
     char uniname2ctype_pool_str2530[sizeof("syriac")];
     char uniname2ctype_pool_str2534[sizeof("inbengali")];
+    char uniname2ctype_pool_str2535[sizeof("nagm")];
     char uniname2ctype_pool_str2545[sizeof("extendedpictographic")];
     char uniname2ctype_pool_str2548[sizeof("buhd")];
     char uniname2ctype_pool_str2549[sizeof("javanese")];
@@ -41457,6 +42525,7 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2567[sizeof("inlatin1supplement")];
     char uniname2ctype_pool_str2570[sizeof("ingothic")];
     char uniname2ctype_pool_str2572[sizeof("invariationselectors")];
+    char uniname2ctype_pool_str2574[sizeof("hex")];
     char uniname2ctype_pool_str2575[sizeof("inverticalforms")];
     char uniname2ctype_pool_str2576[sizeof("ebase")];
     char uniname2ctype_pool_str2582[sizeof("incurrencysymbols")];
@@ -41470,15 +42539,15 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2652[sizeof("invedicextensions")];
     char uniname2ctype_pool_str2656[sizeof("inlimbu")];
     char uniname2ctype_pool_str2657[sizeof("olditalic")];
-    char uniname2ctype_pool_str2660[sizeof("rjng")];
+    char uniname2ctype_pool_str2665[sizeof("gujr")];
     char uniname2ctype_pool_str2666[sizeof("mathsymbol")];
     char uniname2ctype_pool_str2670[sizeof("incjkunifiedideographsextensionb")];
+    char uniname2ctype_pool_str2674[sizeof("gujarati")];
     char uniname2ctype_pool_str2688[sizeof("phagspa")];
     char uniname2ctype_pool_str2689[sizeof("invariationselectorssupplement")];
     char uniname2ctype_pool_str2694[sizeof("currencysymbol")];
     char uniname2ctype_pool_str2705[sizeof("inlinearbsyllabary")];
     char uniname2ctype_pool_str2726[sizeof("wancho")];
-    char uniname2ctype_pool_str2738[sizeof("hmnp")];
     char uniname2ctype_pool_str2750[sizeof("inpaucinhau")];
     char uniname2ctype_pool_str2761[sizeof("other")];
     char uniname2ctype_pool_str2762[sizeof("otheridcontinue")];
@@ -41488,7 +42557,6 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2772[sizeof("warangciti")];
     char uniname2ctype_pool_str2775[sizeof("othernumber")];
     char uniname2ctype_pool_str2786[sizeof("digit")];
-    char uniname2ctype_pool_str2787[sizeof("hebr")];
     char uniname2ctype_pool_str2793[sizeof("nonspacingmark")];
     char uniname2ctype_pool_str2801[sizeof("titlecaseletter")];
     char uniname2ctype_pool_str2808[sizeof("inmeroiticcursive")];
@@ -41508,7 +42576,6 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2871[sizeof("noncharactercodepoint")];
     char uniname2ctype_pool_str2879[sizeof("oldhungarian")];
     char uniname2ctype_pool_str2886[sizeof("insymbolsforlegacycomputing")];
-    char uniname2ctype_pool_str2901[sizeof("hangul")];
     char uniname2ctype_pool_str2902[sizeof("insmallformvariants")];
     char uniname2ctype_pool_str2904[sizeof("inhangulsyllables")];
     char uniname2ctype_pool_str2905[sizeof("emojipresentation")];
@@ -41520,15 +42587,12 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str2964[sizeof("inpsalterpahlavi")];
     char uniname2ctype_pool_str2966[sizeof("whitespace")];
     char uniname2ctype_pool_str2967[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str2969[sizeof("hung")];
     char uniname2ctype_pool_str2970[sizeof("orya")];
-    char uniname2ctype_pool_str2972[sizeof("hexdigit")];
     char uniname2ctype_pool_str2980[sizeof("phlp")];
     char uniname2ctype_pool_str2984[sizeof("inbamumsupplement")];
     char uniname2ctype_pool_str2986[sizeof("buhid")];
     char uniname2ctype_pool_str2987[sizeof("paragraphseparator")];
     char uniname2ctype_pool_str2988[sizeof("inalphabeticpresentationforms")];
-    char uniname2ctype_pool_str2993[sizeof("hluw")];
     char uniname2ctype_pool_str2997[sizeof("inlatinextendedg")];
     char uniname2ctype_pool_str3001[sizeof("elba")];
     char uniname2ctype_pool_str3002[sizeof("changeswhentitlecased")];
@@ -41545,30 +42609,39 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str3048[sizeof("tagbanwa")];
     char uniname2ctype_pool_str3052[sizeof("tamil")];
     char uniname2ctype_pool_str3053[sizeof("khitansmallscript")];
+    char uniname2ctype_pool_str3058[sizeof("mahj")];
+    char uniname2ctype_pool_str3067[sizeof("mahajani")];
+    char uniname2ctype_pool_str3068[sizeof("hang")];
     char uniname2ctype_pool_str3071[sizeof("tirh")];
     char uniname2ctype_pool_str3072[sizeof("sylotinagri")];
     char uniname2ctype_pool_str3082[sizeof("talu")];
+    char uniname2ctype_pool_str3084[sizeof("nagmundari")];
     char uniname2ctype_pool_str3086[sizeof("deva")];
+    char uniname2ctype_pool_str3087[sizeof("ingujarati")];
     char uniname2ctype_pool_str3091[sizeof("deprecated")];
     char uniname2ctype_pool_str3099[sizeof("inarabicpresentationformsb")];
     char uniname2ctype_pool_str3104[sizeof("devanagari")];
+    char uniname2ctype_pool_str3106[sizeof("ingunjalagondi")];
     char uniname2ctype_pool_str3107[sizeof("graphemeclusterbreak=t")];
     char uniname2ctype_pool_str3109[sizeof("graphemeclusterbreak=lvt")];
     char uniname2ctype_pool_str3110[sizeof("taitham")];
     char uniname2ctype_pool_str3111[sizeof("nbat")];
     char uniname2ctype_pool_str3118[sizeof("telu")];
+    char uniname2ctype_pool_str3123[sizeof("hiragana")];
     char uniname2ctype_pool_str3125[sizeof("nabataean")];
-    char uniname2ctype_pool_str3140[sizeof("inmahjongtiles")];
+    char uniname2ctype_pool_str3135[sizeof("inrejang")];
     char uniname2ctype_pool_str3142[sizeof("intangutsupplement")];
+    char uniname2ctype_pool_str3145[sizeof("khoj")];
+    char uniname2ctype_pool_str3155[sizeof("hmng")];
     char uniname2ctype_pool_str3157[sizeof("cyprominoan")];
     char uniname2ctype_pool_str3158[sizeof("inhebrew")];
     char uniname2ctype_pool_str3176[sizeof("inmathematicaloperators")];
     char uniname2ctype_pool_str3180[sizeof("inarabicsupplement")];
+    char uniname2ctype_pool_str3193[sizeof("inenclosedcjklettersandmonths")];
     char uniname2ctype_pool_str3209[sizeof("changeswhenlowercased")];
     char uniname2ctype_pool_str3212[sizeof("tangut")];
     char uniname2ctype_pool_str3215[sizeof("elbasan")];
     char uniname2ctype_pool_str3218[sizeof("osmanya")];
-    char uniname2ctype_pool_str3227[sizeof("inyijinghexagramsymbols")];
     char uniname2ctype_pool_str3237[sizeof("insuperscriptsandsubscripts")];
     char uniname2ctype_pool_str3239[sizeof("graphemeclusterbreak=extend")];
     char uniname2ctype_pool_str3240[sizeof("graphemeclusterbreak=prepend")];
@@ -41579,7 +42652,6 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str3275[sizeof("kayahli")];
     char uniname2ctype_pool_str3284[sizeof("inplayingcards")];
     char uniname2ctype_pool_str3287[sizeof("elym")];
-    char uniname2ctype_pool_str3290[sizeof("injavanese")];
     char uniname2ctype_pool_str3297[sizeof("graphemeclusterbreak=l")];
     char uniname2ctype_pool_str3303[sizeof("graphemeclusterbreak=control")];
     char uniname2ctype_pool_str3313[sizeof("ogrext")];
@@ -41595,6 +42667,7 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str3371[sizeof("cypriot")];
     char uniname2ctype_pool_str3372[sizeof("any")];
     char uniname2ctype_pool_str3373[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str3377[sizeof("rjng")];
     char uniname2ctype_pool_str3391[sizeof("wspace")];
     char uniname2ctype_pool_str3396[sizeof("inindicsiyaqnumbers")];
     char uniname2ctype_pool_str3405[sizeof("inprivateusearea")];
@@ -41602,11 +42675,12 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str3428[sizeof("oupper")];
     char uniname2ctype_pool_str3433[sizeof("signwriting")];
     char uniname2ctype_pool_str3436[sizeof("nushu")];
-    char uniname2ctype_pool_str3452[sizeof("hanifirohingya")];
+    char uniname2ctype_pool_str3455[sizeof("hmnp")];
     char uniname2ctype_pool_str3458[sizeof("upper")];
     char uniname2ctype_pool_str3460[sizeof("insupplementalarrowsc")];
     char uniname2ctype_pool_str3483[sizeof("omath")];
     char uniname2ctype_pool_str3502[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str3504[sizeof("hebr")];
     char uniname2ctype_pool_str3505[sizeof("inhalfwidthandfullwidthforms")];
     char uniname2ctype_pool_str3511[sizeof("insupplementalmathematicaloperators")];
     char uniname2ctype_pool_str3532[sizeof("inpahawhhmong")];
@@ -41615,60 +42689,68 @@ struct uniname2ctype_pool_t
     char uniname2ctype_pool_str3580[sizeof("dupl")];
     char uniname2ctype_pool_str3590[sizeof("ogham")];
     char uniname2ctype_pool_str3613[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str3618[sizeof("hangul")];
     char uniname2ctype_pool_str3648[sizeof("inhanguljamoextendedb")];
     char uniname2ctype_pool_str3659[sizeof("bassavah")];
     char uniname2ctype_pool_str3664[sizeof("aghb")];
+    char uniname2ctype_pool_str3686[sizeof("hung")];
+    char uniname2ctype_pool_str3689[sizeof("hexdigit")];
     char uniname2ctype_pool_str3698[sizeof("incypriotsyllabary")];
     char uniname2ctype_pool_str3699[sizeof("indivesakuru")];
     char uniname2ctype_pool_str3701[sizeof("tibt")];
     char uniname2ctype_pool_str3705[sizeof("inlatinextendedb")];
+    char uniname2ctype_pool_str3710[sizeof("hluw")];
     char uniname2ctype_pool_str3713[sizeof("tibetan")];
     char uniname2ctype_pool_str3721[sizeof("inyisyllables")];
     char uniname2ctype_pool_str3744[sizeof("oldnortharabian")];
     char uniname2ctype_pool_str3754[sizeof("defaultignorablecodepoint")];
     char uniname2ctype_pool_str3766[sizeof("inhighprivateusesurrogates")];
-    char uniname2ctype_pool_str3770[sizeof("rejang")];
     char uniname2ctype_pool_str3799[sizeof("soyombo")];
     char uniname2ctype_pool_str3807[sizeof("otherdefaultignorablecodepoint")];
     char uniname2ctype_pool_str3842[sizeof("pahawhhmong")];
     char uniname2ctype_pool_str3845[sizeof("unifiedideograph")];
     char uniname2ctype_pool_str3850[sizeof("othermath")];
     char uniname2ctype_pool_str3854[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str3857[sizeof("inmahjongtiles")];
     char uniname2ctype_pool_str3868[sizeof("dep")];
     char uniname2ctype_pool_str3881[sizeof("divesakuru")];
     char uniname2ctype_pool_str3884[sizeof("graphemeclusterbreak=lf")];
     char uniname2ctype_pool_str3891[sizeof("uppercaseletter")];
     char uniname2ctype_pool_str3924[sizeof("insupplementalpunctuation")];
     char uniname2ctype_pool_str3942[sizeof("ethiopic")];
+    char uniname2ctype_pool_str3944[sizeof("inyijinghexagramsymbols")];
     char uniname2ctype_pool_str3949[sizeof("ecomp")];
     char uniname2ctype_pool_str3976[sizeof("inglagoliticsupplement")];
-    char uniname2ctype_pool_str3978[sizeof("hebrew")];
     char uniname2ctype_pool_str3998[sizeof("inbopomofoextended")];
-    char uniname2ctype_pool_str4066[sizeof("graphemeclusterbreak=zwj")];
+    char uniname2ctype_pool_str4007[sizeof("injavanese")];
     char uniname2ctype_pool_str4106[sizeof("otherpunctuation")];
     char uniname2ctype_pool_str4116[sizeof("tifinagh")];
     char uniname2ctype_pool_str4127[sizeof("tfng")];
+    char uniname2ctype_pool_str4169[sizeof("hanifirohingya")];
     char uniname2ctype_pool_str4231[sizeof("tavt")];
     char uniname2ctype_pool_str4308[sizeof("inboxdrawing")];
     char uniname2ctype_pool_str4309[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str4321[sizeof("hyphen")];
     char uniname2ctype_pool_str4348[sizeof("inegyptianhieroglyphs")];
     char uniname2ctype_pool_str4361[sizeof("inegyptianhieroglyphformatcontrols")];
     char uniname2ctype_pool_str4459[sizeof("tagb")];
+    char uniname2ctype_pool_str4487[sizeof("rejang")];
     char uniname2ctype_pool_str4604[sizeof("tglg")];
     char uniname2ctype_pool_str4626[sizeof("tagalog")];
     char uniname2ctype_pool_str4627[sizeof("othergraphemeextend")];
     char uniname2ctype_pool_str4674[sizeof("insupplementaryprivateuseareaa")];
     char uniname2ctype_pool_str4683[sizeof("inhighsurrogates")];
+    char uniname2ctype_pool_str4695[sizeof("hebrew")];
     char uniname2ctype_pool_str4734[sizeof("duployan")];
     char uniname2ctype_pool_str4755[sizeof("graphemeclusterbreak=v")];
     char uniname2ctype_pool_str4756[sizeof("graphemeclusterbreak=lv")];
     char uniname2ctype_pool_str4772[sizeof("insupplementalarrowsb")];
+    char uniname2ctype_pool_str4783[sizeof("graphemeclusterbreak=zwj")];
     char uniname2ctype_pool_str4810[sizeof("telugu")];
     char uniname2ctype_pool_str4898[sizeof("zyyy")];
     char uniname2ctype_pool_str4982[sizeof("olduyghur")];
     char uniname2ctype_pool_str4986[sizeof("inhangulcompatibilityjamo")];
     char uniname2ctype_pool_str5018[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str5038[sizeof("hyphen")];
     char uniname2ctype_pool_str5134[sizeof("insupplementalsymbolsandpictographs")];
     char uniname2ctype_pool_str5141[sizeof("egyp")];
     char uniname2ctype_pool_str5300[sizeof("nyiakengpuachuehmong")];
@@ -41845,6 +42927,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "innewa",
     "sk",
     "control",
+    "inkawi",
     "inancientsymbols",
     "palm",
     "inlycian",
@@ -41859,6 +42942,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inwarangciti",
     "sora",
     "inopticalcharacterrecognition",
+    "kawi",
     "inoldsogdian",
     "inmalayalam",
     "bamum",
@@ -41991,11 +43075,13 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inogham",
     "cher",
     "chakma",
+    "inkaktoviknumerals",
     "emoji",
     "insiddham",
     "cherokee",
     "khar",
     "inmongolian",
+    "innagmundari",
     "incherokeesupplement",
     "manichaean",
     "inolchiki",
@@ -42039,48 +43125,46 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
 #ifdef USE_UNICODE_AGE_PROPERTIES
     "age=6.0",
     "age=6.2",
+    "age=15.0",
     "age=7.0",
     "age=6.3",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "cwt",
 #ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=5.1",
+    "age=14.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "unassigned",
 #ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=5.1",
     "age=5.0",
     "age=5.2",
-    "age=14.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "diacritic",
-    "ahom",
 #ifdef USE_UNICODE_AGE_PROPERTIES
     "age=4.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "ahom",
+#ifdef USE_UNICODE_AGE_PROPERTIES
     "age=4.0",
 #endif /* USE_UNICODE_AGE_PROPERTIES */
     "incjkunifiedideographsextensione",
-    "hani",
     "khmr",
-    "han",
     "insinhala",
     "inmiscellaneoustechnical",
     "saur",
-    "hano",
     "guru",
     "sundanese",
     "punct",
     "paucinhau",
     "gurmukhi",
-    "inkhojki",
-    "hanunoo",
     "chorasmian",
-    "hira",
     "logicalorderexception",
     "khmer",
     "limbu",
     "chrs",
     "oriya",
     "inscriptionalpahlavi",
+    "incyrillicextendedd",
     "incjkunifiedideographsextensionc",
 #endif /* USE_UNICODE_PROPERTIES */
     "cntrl",
@@ -42152,7 +43236,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "indogra",
     "arab",
     "medefaidrin",
-    "hatran",
     "inshorthandformatcontrols",
     "phli",
     "inimperialaramaic",
@@ -42161,7 +43244,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inanatolianhieroglyphs",
     "punctuation",
     "graphemeextend",
-    "hatr",
     "cwl",
     "vith",
     "ingeometricshapes",
@@ -42219,7 +43301,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "oidc",
     "bopo",
     "cuneiform",
-    "hex",
     "caseignorable",
     "inoldpersian",
     "cwu",
@@ -42238,10 +43319,8 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "oids",
     "inarabicextendeda",
     "modifierletter",
-    "gujr",
     "incjksymbolsandpunctuation",
     "olower",
-    "gujarati",
     "bopomofo",
     "inlisu",
     "inoldpermic",
@@ -42255,12 +43334,15 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inbalinese",
     "sorasompeng",
     "closepunctuation",
+    "hani",
     "inmayannumerals",
+    "han",
     "inmiscellaneousmathematicalsymbolsb",
     "inlepcha",
     "patsyn",
     "inlisusupplement",
     "insyriacsupplement",
+    "hano",
     "newa",
     "spacingmark",
     "inpalmyrene",
@@ -42270,8 +43352,12 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
 #ifndef USE_UNICODE_PROPERTIES
     "lower",
 #else /* USE_UNICODE_PROPERTIES */
+    "inkhojki",
     "taile",
     "assigned",
+    "hanunoo",
+    "hira",
+    "inarabicextendedc",
     "newtailue",
     "space",
     "intelugu",
@@ -42324,41 +43410,35 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "shaw",
     "palmyrene",
     "soyo",
+    "incjkunifiedideographsextensionh",
     "sgnw",
     "toto",
     "caucasianalbanian",
     "inmathematicalalphanumericsymbols",
     "incjkunifiedideographsextensiong",
+    "hatran",
     "taiviet",
     "meroitichieroglyphs",
     "ingeorgianextended",
     "incjkunifiedideographsextensionf",
     "oldpersian",
-    "mahj",
     "induployan",
     "incyrillicextendedb",
     "dash",
-    "mahajani",
-    "hang",
+    "hatr",
     "innyiakengpuachuehmong",
     "incombiningdiacriticalmarks",
-    "ingujarati",
     "nl",
     "incombiningdiacriticalmarksforsymbols",
     "khudawadi",
-    "ingunjalagondi",
     "incjkradicalssupplement",
     "inglagolitic",
     "orkh",
-    "hiragana",
     "syrc",
-    "inrejang",
     "surrogate",
-    "khoj",
     "indevanagari",
     "avestan",
     "oldpermic",
-    "hmng",
     "ethi",
     "ogam",
     "rohg",
@@ -42366,7 +43446,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "java",
     "inphagspa",
     "lepcha",
-    "inenclosedcjklettersandmonths",
+    "indevanagariextendeda",
     "intifinagh",
     "intagalog",
     "incombiningdiacriticalmarkssupplement",
@@ -42376,6 +43456,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "insymbolsandpictographsextendeda",
     "syriac",
     "inbengali",
+    "nagm",
     "extendedpictographic",
     "buhd",
     "javanese",
@@ -42384,6 +43465,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inlatin1supplement",
     "ingothic",
     "invariationselectors",
+    "hex",
     "inverticalforms",
     "ebase",
     "incurrencysymbols",
@@ -42397,15 +43479,15 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "invedicextensions",
     "inlimbu",
     "olditalic",
-    "rjng",
+    "gujr",
     "mathsymbol",
     "incjkunifiedideographsextensionb",
+    "gujarati",
     "phagspa",
     "invariationselectorssupplement",
     "currencysymbol",
     "inlinearbsyllabary",
     "wancho",
-    "hmnp",
     "inpaucinhau",
     "other",
     "otheridcontinue",
@@ -42419,7 +43501,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
 #ifndef USE_UNICODE_PROPERTIES
     "blank"
 #else /* USE_UNICODE_PROPERTIES */
-    "hebr",
     "nonspacingmark",
     "titlecaseletter",
     "inmeroiticcursive",
@@ -42439,7 +43520,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "noncharactercodepoint",
     "oldhungarian",
     "insymbolsforlegacycomputing",
-    "hangul",
     "insmallformvariants",
     "inhangulsyllables",
     "emojipresentation",
@@ -42451,15 +43531,12 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inpsalterpahlavi",
     "whitespace",
     "finalpunctuation",
-    "hung",
     "orya",
-    "hexdigit",
     "phlp",
     "inbamumsupplement",
     "buhid",
     "paragraphseparator",
     "inalphabeticpresentationforms",
-    "hluw",
     "inlatinextendedg",
     "elba",
     "changeswhentitlecased",
@@ -42476,30 +43553,39 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "tagbanwa",
     "tamil",
     "khitansmallscript",
+    "mahj",
+    "mahajani",
+    "hang",
     "tirh",
     "sylotinagri",
     "talu",
+    "nagmundari",
     "deva",
+    "ingujarati",
     "deprecated",
     "inarabicpresentationformsb",
     "devanagari",
+    "ingunjalagondi",
     "graphemeclusterbreak=t",
     "graphemeclusterbreak=lvt",
     "taitham",
     "nbat",
     "telu",
+    "hiragana",
     "nabataean",
-    "inmahjongtiles",
+    "inrejang",
     "intangutsupplement",
+    "khoj",
+    "hmng",
     "cyprominoan",
     "inhebrew",
     "inmathematicaloperators",
     "inarabicsupplement",
+    "inenclosedcjklettersandmonths",
     "changeswhenlowercased",
     "tangut",
     "elbasan",
     "osmanya",
-    "inyijinghexagramsymbols",
     "insuperscriptsandsubscripts",
     "graphemeclusterbreak=extend",
     "graphemeclusterbreak=prepend",
@@ -42510,7 +43596,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "kayahli",
     "inplayingcards",
     "elym",
-    "injavanese",
     "graphemeclusterbreak=l",
     "graphemeclusterbreak=control",
     "ogrext",
@@ -42526,6 +43611,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "cypriot",
     "any",
     "otheruppercase",
+    "rjng",
     "wspace",
     "inindicsiyaqnumbers",
     "inprivateusearea",
@@ -42533,11 +43619,12 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "oupper",
     "signwriting",
     "nushu",
-    "hanifirohingya",
+    "hmnp",
     "upper",
     "insupplementalarrowsc",
     "omath",
     "modifiersymbol",
+    "hebr",
     "inhalfwidthandfullwidthforms",
     "insupplementalmathematicaloperators",
     "inpahawhhmong",
@@ -42546,60 +43633,68 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "dupl",
     "ogham",
     "dashpunctuation",
+    "hangul",
     "inhanguljamoextendedb",
     "bassavah",
     "aghb",
+    "hung",
+    "hexdigit",
     "incypriotsyllabary",
     "indivesakuru",
     "tibt",
     "inlatinextendedb",
+    "hluw",
     "tibetan",
     "inyisyllables",
     "oldnortharabian",
     "defaultignorablecodepoint",
     "inhighprivateusesurrogates",
-    "rejang",
     "soyombo",
     "otherdefaultignorablecodepoint",
     "pahawhhmong",
     "unifiedideograph",
     "othermath",
     "changeswhencasefolded",
+    "inmahjongtiles",
     "dep",
     "divesakuru",
     "graphemeclusterbreak=lf",
     "uppercaseletter",
     "insupplementalpunctuation",
     "ethiopic",
+    "inyijinghexagramsymbols",
     "ecomp",
     "inglagoliticsupplement",
-    "hebrew",
     "inbopomofoextended",
-    "graphemeclusterbreak=zwj",
+    "injavanese",
     "otherpunctuation",
     "tifinagh",
     "tfng",
+    "hanifirohingya",
     "tavt",
     "inboxdrawing",
     "oldsoutharabian",
-    "hyphen",
     "inegyptianhieroglyphs",
     "inegyptianhieroglyphformatcontrols",
     "tagb",
+    "rejang",
     "tglg",
     "tagalog",
     "othergraphemeextend",
     "insupplementaryprivateuseareaa",
     "inhighsurrogates",
+    "hebrew",
     "duployan",
     "graphemeclusterbreak=v",
     "graphemeclusterbreak=lv",
     "insupplementalarrowsb",
+    "graphemeclusterbreak=zwj",
     "telugu",
     "zyyy",
     "olduyghur",
     "inhangulcompatibilityjamo",
     "openpunctuation",
+    "hyphen",
     "insupplementalsymbolsandpictographs",
     "egyp",
     "nyiakengpuachuehmong",
@@ -42635,13 +43730,13 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str48), 95},
       {uniname2ctype_offset(str49), 95},
       {-1}, {-1},
-      {uniname2ctype_offset(str52), 343},
+      {uniname2ctype_offset(str52), 346},
       {-1}, {-1},
       {uniname2ctype_offset(str55), 21},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str64), 44},
       {-1},
-      {uniname2ctype_offset(str66), 330},
+      {uniname2ctype_offset(str66), 333},
       {uniname2ctype_offset(str67), 52},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str71), 181},
@@ -42659,9 +43754,9 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str94), 33},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str100), 149},
-      {uniname2ctype_offset(str101), 510},
+      {uniname2ctype_offset(str101), 513},
       {uniname2ctype_offset(str102), 108},
-      {uniname2ctype_offset(str103), 261},
+      {uniname2ctype_offset(str103), 263},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str107), 31},
       {uniname2ctype_offset(str108), 77},
@@ -42680,27 +43775,27 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str130), 42},
       {uniname2ctype_offset(str131), 172},
       {-1}, {-1},
-      {uniname2ctype_offset(str134), 494},
+      {uniname2ctype_offset(str134), 497},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str139), 170},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str145), 513},
-      {uniname2ctype_offset(str146), 569},
+      {uniname2ctype_offset(str145), 516},
+      {uniname2ctype_offset(str146), 575},
       {-1},
-      {uniname2ctype_offset(str148), 574},
-      {uniname2ctype_offset(str149), 531},
+      {uniname2ctype_offset(str148), 580},
+      {uniname2ctype_offset(str149), 535},
       {-1},
       {uniname2ctype_offset(str151), 18},
       {uniname2ctype_offset(str152), 169},
       {uniname2ctype_offset(str153), 160},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str158), 276},
+      {uniname2ctype_offset(str158), 278},
       {-1}, {-1},
-      {uniname2ctype_offset(str161), 324},
+      {uniname2ctype_offset(str161), 327},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str177), 349},
-      {uniname2ctype_offset(str178), 558},
+      {uniname2ctype_offset(str177), 352},
+      {uniname2ctype_offset(str178), 563},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str183), 75},
       {-1}, {-1},
@@ -42709,19 +43804,19 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str190), 208},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str203), 357},
-      {uniname2ctype_offset(str204), 485},
+      {uniname2ctype_offset(str203), 360},
+      {uniname2ctype_offset(str204), 488},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str210), 575},
+      {uniname2ctype_offset(str210), 581},
       {-1},
-      {uniname2ctype_offset(str212), 362},
+      {uniname2ctype_offset(str212), 365},
       {uniname2ctype_offset(str213), 115},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str218), 545},
+      {uniname2ctype_offset(str218), 549},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str226), 171},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str230), 526},
+      {uniname2ctype_offset(str230), 530},
       {uniname2ctype_offset(str231), 31},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str236), 25},
@@ -42733,64 +43828,64 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str253), 102},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str260), 562},
+      {uniname2ctype_offset(str260), 568},
       {-1}, {-1},
       {uniname2ctype_offset(str263), 161},
       {-1},
       {uniname2ctype_offset(str265), 19},
       {-1},
       {uniname2ctype_offset(str267), 79},
-      {uniname2ctype_offset(str268), 354},
+      {uniname2ctype_offset(str268), 357},
       {-1},
-      {uniname2ctype_offset(str270), 268},
+      {uniname2ctype_offset(str270), 270},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str274), 561},
-      {uniname2ctype_offset(str275), 514},
+      {uniname2ctype_offset(str274), 567},
+      {uniname2ctype_offset(str275), 517},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str281), 318},
+      {uniname2ctype_offset(str281), 321},
       {uniname2ctype_offset(str282), 40},
       {uniname2ctype_offset(str283), 79},
       {-1},
-      {uniname2ctype_offset(str285), 533},
+      {uniname2ctype_offset(str285), 537},
       {-1},
       {uniname2ctype_offset(str287), 144},
       {uniname2ctype_offset(str288), 144},
-      {uniname2ctype_offset(str289), 555},
+      {uniname2ctype_offset(str289), 560},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str293), 218},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str297), 212},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str301), 392},
+      {uniname2ctype_offset(str301), 395},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str311), 322},
+      {uniname2ctype_offset(str311), 325},
       {-1},
-      {uniname2ctype_offset(str313), 453},
+      {uniname2ctype_offset(str313), 456},
       {-1},
-      {uniname2ctype_offset(str315), 241},
+      {uniname2ctype_offset(str315), 243},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str320), 269},
+      {uniname2ctype_offset(str320), 271},
       {-1},
       {uniname2ctype_offset(str322), 129},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str328), 331},
+      {uniname2ctype_offset(str328), 334},
       {-1}, {-1},
       {uniname2ctype_offset(str331), 76},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str335), 556},
+      {uniname2ctype_offset(str335), 561},
       {-1}, {-1},
-      {uniname2ctype_offset(str338), 329},
+      {uniname2ctype_offset(str338), 332},
       {-1},
       {uniname2ctype_offset(str340), 76},
       {-1},
-      {uniname2ctype_offset(str342), 346},
+      {uniname2ctype_offset(str342), 349},
       {-1}, {-1},
       {uniname2ctype_offset(str345), 53},
-      {uniname2ctype_offset(str346), 268},
+      {uniname2ctype_offset(str346), 270},
       {-1},
-      {uniname2ctype_offset(str348), 423},
+      {uniname2ctype_offset(str348), 426},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str352), 529},
+      {uniname2ctype_offset(str352), 533},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str362), 163},
       {-1}, {-1}, {-1},
@@ -42798,14 +43893,14 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str373), 160},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str381), 550},
+      {uniname2ctype_offset(str381), 554},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str386), 368},
+      {uniname2ctype_offset(str386), 371},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str399), 327},
+      {uniname2ctype_offset(str399), 330},
       {-1},
-      {uniname2ctype_offset(str401), 544},
+      {uniname2ctype_offset(str401), 548},
       {-1}, {-1},
       {uniname2ctype_offset(str404), 81},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -42828,176 +43923,179 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str470), 22},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str475), 521},
+      {uniname2ctype_offset(str475), 524},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str480), 454},
+      {uniname2ctype_offset(str480), 457},
       {uniname2ctype_offset(str481), 188},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str486), 473},
+      {uniname2ctype_offset(str486), 476},
       {-1},
-      {uniname2ctype_offset(str488), 582},
+      {uniname2ctype_offset(str488), 588},
       {-1}, {-1},
-      {uniname2ctype_offset(str491), 467},
+      {uniname2ctype_offset(str491), 470},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str500), 127},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str504), 187},
-      {uniname2ctype_offset(str505), 247},
+      {uniname2ctype_offset(str505), 249},
       {uniname2ctype_offset(str506), 24},
       {-1}, {-1},
       {uniname2ctype_offset(str509), 24},
       {-1},
-      {uniname2ctype_offset(str511), 460},
+      {uniname2ctype_offset(str511), 463},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str520), 420},
+      {uniname2ctype_offset(str520), 423},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str533), 230},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str538), 91},
       {-1}, {-1},
-      {uniname2ctype_offset(str541), 549},
+      {uniname2ctype_offset(str541), 553},
       {-1},
       {uniname2ctype_offset(str543), 91},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str556), 542},
+      {uniname2ctype_offset(str556), 546},
       {-1},
-      {uniname2ctype_offset(str558), 347},
+      {uniname2ctype_offset(str558), 350},
       {uniname2ctype_offset(str559), 70},
-      {uniname2ctype_offset(str560), 512},
+      {uniname2ctype_offset(str560), 515},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str565), 615},
+      {uniname2ctype_offset(str565), 624},
       {uniname2ctype_offset(str566), 37},
       {-1},
       {uniname2ctype_offset(str568), 113},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str572), 499},
+      {uniname2ctype_offset(str572), 502},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str577), 602},
+      {uniname2ctype_offset(str577), 611},
       {-1},
       {uniname2ctype_offset(str579), 106},
       {-1}, {-1},
-      {uniname2ctype_offset(str582), 403},
-      {uniname2ctype_offset(str583), 477},
+      {uniname2ctype_offset(str582), 406},
+      {uniname2ctype_offset(str583), 480},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str590), 74},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str594), 168},
       {-1},
-      {uniname2ctype_offset(str596), 613},
+      {uniname2ctype_offset(str596), 622},
       {uniname2ctype_offset(str597), 146},
       {-1}, {-1},
-      {uniname2ctype_offset(str600), 487},
+      {uniname2ctype_offset(str600), 490},
       {-1},
       {uniname2ctype_offset(str602), 70},
       {-1},
-      {uniname2ctype_offset(str604), 573},
-      {uniname2ctype_offset(str605), 620},
+      {uniname2ctype_offset(str604), 579},
+      {uniname2ctype_offset(str605), 629},
       {-1}, {-1},
-      {uniname2ctype_offset(str608), 628},
+      {uniname2ctype_offset(str608), 637},
       {uniname2ctype_offset(str609), 229},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str614), 603},
+      {uniname2ctype_offset(str614), 612},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str624), 195},
-      {uniname2ctype_offset(str625), 444},
+      {uniname2ctype_offset(str625), 447},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str630), 29},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str636), 539},
+      {uniname2ctype_offset(str636), 543},
       {-1}, {-1},
       {uniname2ctype_offset(str639), 49},
       {-1}, {-1},
       {uniname2ctype_offset(str642), 19},
-      {-1}, {-1},
-      {uniname2ctype_offset(str645), 482},
+      {uniname2ctype_offset(str643), 564},
+      {-1},
+      {uniname2ctype_offset(str645), 485},
       {-1},
       {uniname2ctype_offset(str647), 192},
       {-1}, {-1},
-      {uniname2ctype_offset(str650), 484},
+      {uniname2ctype_offset(str650), 487},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str657), 51},
       {-1}, {-1},
-      {uniname2ctype_offset(str660), 266},
+      {uniname2ctype_offset(str660), 268},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str672), 332},
+      {uniname2ctype_offset(str672), 335},
       {-1}, {-1},
       {uniname2ctype_offset(str675), 68},
       {-1}, {-1},
       {uniname2ctype_offset(str678), 171},
-      {uniname2ctype_offset(str679), 599},
+      {uniname2ctype_offset(str679), 607},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str683), 265},
+      {uniname2ctype_offset(str683), 267},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str692), 69},
       {-1}, {-1},
-      {uniname2ctype_offset(str695), 547},
+      {uniname2ctype_offset(str695), 551},
       {uniname2ctype_offset(str696), 175},
-      {uniname2ctype_offset(str697), 396},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str703), 523},
+      {uniname2ctype_offset(str697), 399},
+      {-1}, {-1},
+      {uniname2ctype_offset(str700), 236},
+      {-1}, {-1},
+      {uniname2ctype_offset(str703), 527},
       {-1},
-      {uniname2ctype_offset(str705), 344},
+      {uniname2ctype_offset(str705), 347},
       {-1},
       {uniname2ctype_offset(str707), 158},
-      {uniname2ctype_offset(str708), 581},
+      {uniname2ctype_offset(str708), 587},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str713), 373},
+      {uniname2ctype_offset(str713), 376},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str720), 72},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str737), 7},
-      {uniname2ctype_offset(str738), 370},
+      {uniname2ctype_offset(str738), 373},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str742), 6},
       {-1}, {-1},
-      {uniname2ctype_offset(str745), 267},
+      {uniname2ctype_offset(str745), 269},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str753), 238},
+      {uniname2ctype_offset(str753), 240},
       {-1},
-      {uniname2ctype_offset(str755), 511},
+      {uniname2ctype_offset(str755), 514},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str760), 428},
+      {uniname2ctype_offset(str760), 431},
       {uniname2ctype_offset(str761), 167},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str766), 156},
-      {uniname2ctype_offset(str767), 600},
+      {uniname2ctype_offset(str767), 608},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str771), 167},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str776), 266},
+      {uniname2ctype_offset(str776), 268},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str783), 156},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str787), 254},
+      {uniname2ctype_offset(str787), 256},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str791), 193},
       {-1}, {-1},
-      {uniname2ctype_offset(str794), 583},
+      {uniname2ctype_offset(str794), 589},
       {-1}, {-1},
       {uniname2ctype_offset(str797), 50},
       {-1},
-      {uniname2ctype_offset(str799), 608},
+      {uniname2ctype_offset(str799), 617},
       {-1}, {-1},
       {uniname2ctype_offset(str802), 13},
-      {uniname2ctype_offset(str803), 587},
+      {uniname2ctype_offset(str803), 593},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str809), 443},
+      {uniname2ctype_offset(str809), 446},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str814), 490},
+      {uniname2ctype_offset(str814), 493},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str818), 395},
+      {uniname2ctype_offset(str818), 398},
       {-1}, {-1},
-      {uniname2ctype_offset(str821), 479},
-      {uniname2ctype_offset(str822), 589},
+      {uniname2ctype_offset(str821), 482},
+      {uniname2ctype_offset(str822), 595},
       {uniname2ctype_offset(str823), 47},
       {uniname2ctype_offset(str824), 112},
-      {uniname2ctype_offset(str825), 441},
+      {uniname2ctype_offset(str825), 444},
       {-1}, {-1},
-      {uniname2ctype_offset(str828), 590},
+      {uniname2ctype_offset(str828), 596},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str838), 157},
       {-1}, {-1}, {-1},
@@ -43010,32 +44108,32 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str855), 67},
       {-1},
-      {uniname2ctype_offset(str857), 316},
+      {uniname2ctype_offset(str857), 319},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str875), 366},
+      {uniname2ctype_offset(str875), 369},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str886), 401},
+      {uniname2ctype_offset(str886), 404},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str895), 409},
+      {uniname2ctype_offset(str895), 412},
       {-1}, {-1},
-      {uniname2ctype_offset(str898), 497},
+      {uniname2ctype_offset(str898), 500},
       {-1},
-      {uniname2ctype_offset(str900), 612},
+      {uniname2ctype_offset(str900), 621},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str906), 518},
-      {uniname2ctype_offset(str907), 446},
+      {uniname2ctype_offset(str906), 521},
+      {uniname2ctype_offset(str907), 449},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str920), 416},
+      {uniname2ctype_offset(str920), 419},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str924), 68},
-      {uniname2ctype_offset(str925), 592},
-      {uniname2ctype_offset(str926), 341},
+      {uniname2ctype_offset(str925), 599},
+      {uniname2ctype_offset(str926), 344},
       {-1},
-      {uniname2ctype_offset(str928), 536},
-      {uniname2ctype_offset(str929), 458},
+      {uniname2ctype_offset(str928), 540},
+      {uniname2ctype_offset(str929), 461},
       {uniname2ctype_offset(str930), 41},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -43044,13 +44142,13 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str961), 2},
       {-1},
-      {uniname2ctype_offset(str963), 255},
+      {uniname2ctype_offset(str963), 257},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str974), 507},
+      {uniname2ctype_offset(str974), 510},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str986), 367},
+      {uniname2ctype_offset(str986), 370},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str994), 85},
       {uniname2ctype_offset(str995), 104},
@@ -43058,21 +44156,21 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1010), 26},
       {-1}, {-1},
-      {uniname2ctype_offset(str1013), 492},
+      {uniname2ctype_offset(str1013), 495},
       {-1},
-      {uniname2ctype_offset(str1015), 481},
+      {uniname2ctype_offset(str1015), 484},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1021), 67},
       {-1}, {-1},
       {uniname2ctype_offset(str1024), 53},
-      {uniname2ctype_offset(str1025), 456},
+      {uniname2ctype_offset(str1025), 459},
       {-1}, {-1},
       {uniname2ctype_offset(str1028), 136},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1032), 377},
+      {uniname2ctype_offset(str1032), 380},
       {-1}, {-1},
-      {uniname2ctype_offset(str1035), 319},
-      {uniname2ctype_offset(str1036), 563},
+      {uniname2ctype_offset(str1035), 322},
+      {uniname2ctype_offset(str1036), 569},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1049), 173},
@@ -43082,26 +44180,26 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1072), 197},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1081), 411},
+      {uniname2ctype_offset(str1081), 414},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1085), 257},
+      {uniname2ctype_offset(str1085), 259},
       {-1},
-      {uniname2ctype_offset(str1087), 593},
+      {uniname2ctype_offset(str1087), 600},
       {-1},
       {uniname2ctype_offset(str1089), 115},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1095), 248},
+      {uniname2ctype_offset(str1095), 250},
       {uniname2ctype_offset(str1096), 71},
-      {uniname2ctype_offset(str1097), 537},
+      {uniname2ctype_offset(str1097), 541},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1102), 520},
+      {uniname2ctype_offset(str1102), 523},
       {-1},
       {uniname2ctype_offset(str1104), 228},
       {uniname2ctype_offset(str1105), 217},
       {-1},
-      {uniname2ctype_offset(str1107), 538},
+      {uniname2ctype_offset(str1107), 542},
       {-1},
-      {uniname2ctype_offset(str1109), 237},
+      {uniname2ctype_offset(str1109), 239},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1114), 69},
       {uniname2ctype_offset(str1115), 11},
@@ -43110,7 +44208,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1120), 60},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1134), 422},
+      {uniname2ctype_offset(str1134), 425},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1140), 93},
       {-1},
@@ -43118,153 +44216,155 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str1145), 137},
       {uniname2ctype_offset(str1146), 131},
-      {uniname2ctype_offset(str1147), 264},
+      {uniname2ctype_offset(str1147), 266},
       {-1},
       {uniname2ctype_offset(str1149), 158},
       {uniname2ctype_offset(str1150), 98},
-      {uniname2ctype_offset(str1151), 495},
+      {uniname2ctype_offset(str1151), 498},
       {uniname2ctype_offset(str1152), 217},
       {uniname2ctype_offset(str1153), 138},
       {-1}, {-1},
-      {uniname2ctype_offset(str1156), 525},
+      {uniname2ctype_offset(str1156), 529},
       {uniname2ctype_offset(str1157), 203},
       {uniname2ctype_offset(str1158), 166},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1164), 238},
+      {uniname2ctype_offset(str1164), 240},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1168), 104},
       {-1},
-      {uniname2ctype_offset(str1170), 386},
-      {uniname2ctype_offset(str1171), 532},
+      {uniname2ctype_offset(str1170), 389},
+      {uniname2ctype_offset(str1171), 536},
       {-1}, {-1},
-      {uniname2ctype_offset(str1174), 323},
+      {uniname2ctype_offset(str1174), 326},
       {uniname2ctype_offset(str1175), 26},
       {uniname2ctype_offset(str1176), 208},
       {uniname2ctype_offset(str1177), 74},
-      {uniname2ctype_offset(str1178), 350},
+      {uniname2ctype_offset(str1178), 353},
       {-1},
       {uniname2ctype_offset(str1180), 183},
       {uniname2ctype_offset(str1181), 151},
-      {uniname2ctype_offset(str1182), 356},
+      {uniname2ctype_offset(str1182), 359},
       {uniname2ctype_offset(str1183), 101},
       {-1},
       {uniname2ctype_offset(str1185), 170},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1190), 270},
-      {uniname2ctype_offset(str1191), 541},
+      {uniname2ctype_offset(str1186), 597},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1190), 272},
+      {uniname2ctype_offset(str1191), 545},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1197), 101},
       {uniname2ctype_offset(str1198), 135},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1203), 363},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1207), 459},
+      {uniname2ctype_offset(str1203), 366},
+      {uniname2ctype_offset(str1204), 609},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1207), 462},
       {-1},
       {uniname2ctype_offset(str1209), 186},
       {-1}, {-1},
-      {uniname2ctype_offset(str1212), 376},
+      {uniname2ctype_offset(str1212), 379},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str1223), 578},
+      {uniname2ctype_offset(str1223), 584},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1227), 241},
+      {uniname2ctype_offset(str1227), 243},
       {-1},
       {uniname2ctype_offset(str1229), 235},
-      {uniname2ctype_offset(str1230), 265},
+      {uniname2ctype_offset(str1230), 267},
       {uniname2ctype_offset(str1231), 206},
-      {uniname2ctype_offset(str1232), 352},
+      {uniname2ctype_offset(str1232), 355},
       {uniname2ctype_offset(str1233), 73},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1234), 296},
-      {uniname2ctype_offset(str1235), 298},
-      {uniname2ctype_offset(str1236), 295},
-      {uniname2ctype_offset(str1237), 297},
+      {uniname2ctype_offset(str1234), 298},
+      {uniname2ctype_offset(str1235), 300},
+      {uniname2ctype_offset(str1236), 297},
+      {uniname2ctype_offset(str1237), 299},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1241), 299},
-      {uniname2ctype_offset(str1242), 277},
+      {uniname2ctype_offset(str1241), 301},
+      {uniname2ctype_offset(str1242), 279},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1243), 25},
-      {uniname2ctype_offset(str1244), 338},
+      {uniname2ctype_offset(str1244), 341},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1245), 279},
+      {uniname2ctype_offset(str1245), 281},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1246), 432},
+      {uniname2ctype_offset(str1246), 435},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1247), 278},
+      {uniname2ctype_offset(str1247), 280},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1248), 30},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1249), 281},
-      {uniname2ctype_offset(str1250), 294},
-      {uniname2ctype_offset(str1251), 280},
-      {uniname2ctype_offset(str1252), 282},
-      {uniname2ctype_offset(str1253), 293},
+      {uniname2ctype_offset(str1249), 283},
+      {uniname2ctype_offset(str1250), 296},
+      {uniname2ctype_offset(str1251), 282},
+      {uniname2ctype_offset(str1252), 284},
+      {uniname2ctype_offset(str1253), 295},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1254), 560},
+      {uniname2ctype_offset(str1254), 566},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1255), 289},
+      {uniname2ctype_offset(str1255), 291},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1256), 276},
+      {uniname2ctype_offset(str1256), 278},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1263), 64},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1257), 288},
-      {uniname2ctype_offset(str1258), 290},
-      {uniname2ctype_offset(str1259), 292},
+      {uniname2ctype_offset(str1257), 290},
+      {uniname2ctype_offset(str1258), 292},
+      {uniname2ctype_offset(str1259), 303},
+      {uniname2ctype_offset(str1260), 294},
+      {-1},
+      {uniname2ctype_offset(str1262), 293},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      {-1}, {-1},
-#ifdef USE_UNICODE_AGE_PROPERTIES
-      {uniname2ctype_offset(str1262), 291},
       {uniname2ctype_offset(str1263), 64},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
       {-1},
-      {uniname2ctype_offset(str1265), 286},
+      {uniname2ctype_offset(str1265), 302},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1266), 21},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1267), 285},
-      {uniname2ctype_offset(str1268), 287},
-      {uniname2ctype_offset(str1269), 300},
+      {uniname2ctype_offset(str1267), 288},
       {-1},
+      {uniname2ctype_offset(str1269), 287},
+      {uniname2ctype_offset(str1270), 289},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1271), 248},
+      {uniname2ctype_offset(str1271), 250},
+#ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {-1},
+      {uniname2ctype_offset(str1273), 286},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
       {uniname2ctype_offset(str1274), 200},
 #ifndef USE_UNICODE_AGE_PROPERTIES
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #else /* USE_UNICODE_AGE_PROPERTIES */
-      {-1}, {-1},
-      {uniname2ctype_offset(str1277), 284},
-      {-1},
-      {uniname2ctype_offset(str1279), 283},
-      {-1}, {-1},
+      {uniname2ctype_offset(str1275), 285},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #endif /* USE_UNICODE_AGE_PROPERTIES */
-      {uniname2ctype_offset(str1282), 626},
-      {-1},
-      {uniname2ctype_offset(str1284), 110},
+      {uniname2ctype_offset(str1282), 635},
+      {-1}, {-1},
       {uniname2ctype_offset(str1285), 105},
-      {-1},
-      {uniname2ctype_offset(str1287), 110},
-      {-1},
-      {uniname2ctype_offset(str1289), 345},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1289), 348},
       {-1}, {-1},
-      {uniname2ctype_offset(str1292), 394},
+      {uniname2ctype_offset(str1292), 397},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1297), 145},
-      {uniname2ctype_offset(str1298), 117},
-      {-1},
+      {-1}, {-1},
       {uniname2ctype_offset(str1300), 86},
       {uniname2ctype_offset(str1301), 141},
       {-1}, {-1}, {-1}, {-1},
@@ -43273,14 +44373,11 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1314), 193},
       {-1}, {-1},
       {uniname2ctype_offset(str1317), 86},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1323), 535},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1327), 117},
-      {uniname2ctype_offset(str1328), 227},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str1330), 107},
-      {uniname2ctype_offset(str1331), 261},
+      {uniname2ctype_offset(str1328), 227},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1331), 263},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1340), 105},
       {-1}, {-1},
@@ -43291,18 +44388,20 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1352), 88},
       {-1},
       {uniname2ctype_offset(str1354), 164},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1358), 624},
+      {-1},
+      {uniname2ctype_offset(str1356), 605},
+      {-1},
+      {uniname2ctype_offset(str1358), 633},
       {-1},
       {uniname2ctype_offset(str1360), 3},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1365), 384},
+      {uniname2ctype_offset(str1365), 387},
       {-1},
-      {uniname2ctype_offset(str1367), 530},
+      {uniname2ctype_offset(str1367), 534},
       {-1},
-      {uniname2ctype_offset(str1369), 256},
+      {uniname2ctype_offset(str1369), 258},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1373), 272},
+      {uniname2ctype_offset(str1373), 274},
       {-1},
       {uniname2ctype_offset(str1375), 135},
       {-1}, {-1}, {-1}, {-1},
@@ -43315,29 +44414,29 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str1392), 138},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1400), 201},
-      {uniname2ctype_offset(str1401), 397},
+      {uniname2ctype_offset(str1401), 400},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1407), 224},
       {-1},
       {uniname2ctype_offset(str1409), 38},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1415), 570},
+      {uniname2ctype_offset(str1415), 576},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1419), 140},
       {uniname2ctype_offset(str1420), 140},
       {-1},
-      {uniname2ctype_offset(str1422), 321},
+      {uniname2ctype_offset(str1422), 324},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1426), 39},
       {-1},
       {uniname2ctype_offset(str1428), 181},
       {uniname2ctype_offset(str1429), 36},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1438), 434},
+      {uniname2ctype_offset(str1438), 437},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1442), 540},
+      {uniname2ctype_offset(str1442), 544},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1448), 505},
+      {uniname2ctype_offset(str1448), 508},
       {uniname2ctype_offset(str1449), 122},
       {-1},
       {uniname2ctype_offset(str1451), 203},
@@ -43348,109 +44447,106 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str1460), 215},
       {-1},
-      {uniname2ctype_offset(str1462), 554},
+      {uniname2ctype_offset(str1462), 559},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1470), 504},
-      {uniname2ctype_offset(str1471), 506},
+      {uniname2ctype_offset(str1470), 507},
+      {uniname2ctype_offset(str1471), 509},
       {-1}, {-1},
       {uniname2ctype_offset(str1474), 134},
-      {uniname2ctype_offset(str1475), 426},
-      {uniname2ctype_offset(str1476), 508},
+      {uniname2ctype_offset(str1475), 429},
+      {uniname2ctype_offset(str1476), 511},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1480), 245},
+      {uniname2ctype_offset(str1480), 247},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1489), 33},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1495), 260},
+      {uniname2ctype_offset(str1495), 262},
       {-1},
-      {uniname2ctype_offset(str1497), 496},
+      {uniname2ctype_offset(str1497), 499},
       {-1},
-      {uniname2ctype_offset(str1499), 611},
+      {uniname2ctype_offset(str1499), 620},
       {-1},
       {uniname2ctype_offset(str1501), 196},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1507), 122},
       {uniname2ctype_offset(str1508), 231},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1517), 610},
+      {uniname2ctype_offset(str1517), 619},
       {-1}, {-1},
-      {uniname2ctype_offset(str1520), 237},
+      {uniname2ctype_offset(str1520), 239},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1524), 483},
+      {uniname2ctype_offset(str1524), 486},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1529), 120},
       {-1},
-      {uniname2ctype_offset(str1531), 419},
+      {uniname2ctype_offset(str1531), 422},
       {-1},
       {uniname2ctype_offset(str1533), 142},
       {-1}, {-1},
       {uniname2ctype_offset(str1536), 127},
-      {uniname2ctype_offset(str1537), 269},
+      {uniname2ctype_offset(str1537), 271},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1542), 465},
+      {uniname2ctype_offset(str1542), 468},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1547), 168},
       {-1},
-      {uniname2ctype_offset(str1549), 519},
+      {uniname2ctype_offset(str1549), 522},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1557), 85},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1563), 273},
+      {uniname2ctype_offset(str1563), 275},
       {-1},
-      {uniname2ctype_offset(str1565), 326},
+      {uniname2ctype_offset(str1565), 329},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1570), 210},
       {-1},
       {uniname2ctype_offset(str1572), 115},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1577), 564},
+      {uniname2ctype_offset(str1577), 570},
       {-1}, {-1},
       {uniname2ctype_offset(str1580), 131},
       {-1},
       {uniname2ctype_offset(str1582), 219},
       {uniname2ctype_offset(str1583), 125},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1587), 546},
+      {uniname2ctype_offset(str1587), 550},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1597), 81},
       {uniname2ctype_offset(str1598), 219},
-      {-1}, {-1},
-      {uniname2ctype_offset(str1601), 202},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1607), 586},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1607), 592},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1613), 164},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1617), 502},
-      {uniname2ctype_offset(str1618), 272},
+      {uniname2ctype_offset(str1617), 505},
+      {uniname2ctype_offset(str1618), 274},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1622), 385},
-      {uniname2ctype_offset(str1623), 567},
+      {uniname2ctype_offset(str1622), 388},
+      {uniname2ctype_offset(str1623), 573},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1629), 39},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1635), 72},
-      {uniname2ctype_offset(str1636), 202},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1643), 62},
       {uniname2ctype_offset(str1644), 235},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1654), 400},
-      {uniname2ctype_offset(str1655), 274},
+      {uniname2ctype_offset(str1654), 403},
+      {uniname2ctype_offset(str1655), 276},
       {-1},
       {uniname2ctype_offset(str1657), 114},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1662), 129},
       {-1},
-      {uniname2ctype_offset(str1664), 448},
+      {uniname2ctype_offset(str1664), 451},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1671), 340},
+      {uniname2ctype_offset(str1671), 343},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1675), 469},
+      {uniname2ctype_offset(str1675), 472},
       {-1},
-      {uniname2ctype_offset(str1677), 314},
+      {uniname2ctype_offset(str1677), 317},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1682), 625},
+      {uniname2ctype_offset(str1682), 634},
       {-1},
       {uniname2ctype_offset(str1684), 199},
       {-1},
@@ -43459,186 +44555,192 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1691), 124},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1699), 379},
+      {uniname2ctype_offset(str1699), 382},
       {-1},
-      {uniname2ctype_offset(str1701), 522},
+      {uniname2ctype_offset(str1701), 525},
       {-1}, {-1},
       {uniname2ctype_offset(str1704), 207},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1714), 207},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1722), 359},
+      {uniname2ctype_offset(str1722), 362},
       {-1},
-      {uniname2ctype_offset(str1724), 576},
+      {uniname2ctype_offset(str1724), 582},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1728), 221},
-      {uniname2ctype_offset(str1729), 442},
+      {uniname2ctype_offset(str1729), 445},
       {uniname2ctype_offset(str1730), 222},
-      {uniname2ctype_offset(str1731), 534},
-      {uniname2ctype_offset(str1732), 247},
+      {uniname2ctype_offset(str1731), 538},
+      {uniname2ctype_offset(str1732), 249},
       {uniname2ctype_offset(str1733), 123},
       {uniname2ctype_offset(str1734), 114},
-      {uniname2ctype_offset(str1735), 258},
+      {uniname2ctype_offset(str1735), 260},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1740), 129},
       {-1},
       {uniname2ctype_offset(str1742), 161},
       {-1}, {-1},
-      {uniname2ctype_offset(str1745), 524},
-      {uniname2ctype_offset(str1746), 402},
+      {uniname2ctype_offset(str1745), 528},
+      {uniname2ctype_offset(str1746), 405},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1750), 20},
       {-1},
-      {uniname2ctype_offset(str1752), 516},
+      {uniname2ctype_offset(str1752), 519},
       {uniname2ctype_offset(str1753), 148},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1757), 515},
+      {uniname2ctype_offset(str1757), 518},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1766), 73},
       {-1},
       {uniname2ctype_offset(str1768), 148},
-      {uniname2ctype_offset(str1769), 374},
+      {uniname2ctype_offset(str1769), 377},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1776), 126},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1781), 552},
+      {uniname2ctype_offset(str1781), 556},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1788), 97},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1793), 97},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1806), 348},
+      {uniname2ctype_offset(str1806), 351},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1810), 630},
-      {uniname2ctype_offset(str1811), 245},
+      {uniname2ctype_offset(str1810), 640},
+      {uniname2ctype_offset(str1811), 247},
       {-1},
-      {uniname2ctype_offset(str1813), 264},
+      {uniname2ctype_offset(str1813), 266},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1821), 224},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1828), 399},
+      {uniname2ctype_offset(str1828), 402},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1838), 614},
+      {uniname2ctype_offset(str1838), 623},
       {-1}, {-1},
-      {uniname2ctype_offset(str1841), 457},
-      {uniname2ctype_offset(str1842), 391},
+      {uniname2ctype_offset(str1841), 460},
+      {uniname2ctype_offset(str1842), 394},
       {uniname2ctype_offset(str1843), 65},
       {-1},
-      {uniname2ctype_offset(str1845), 263},
+      {uniname2ctype_offset(str1845), 265},
       {-1}, {-1},
       {uniname2ctype_offset(str1848), 109},
       {-1}, {-1},
       {uniname2ctype_offset(str1851), 137},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1857), 244},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1866), 61},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1871), 491},
+      {uniname2ctype_offset(str1871), 494},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1881), 63},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1888), 527},
-      {uniname2ctype_offset(str1889), 551},
+      {uniname2ctype_offset(str1888), 531},
+      {uniname2ctype_offset(str1889), 555},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1896), 617},
+      {uniname2ctype_offset(str1896), 626},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1902), 431},
+      {uniname2ctype_offset(str1902), 434},
       {-1},
-      {uniname2ctype_offset(str1904), 452},
-      {uniname2ctype_offset(str1905), 584},
+      {uniname2ctype_offset(str1904), 455},
+      {uniname2ctype_offset(str1905), 590},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1912), 580},
+      {uniname2ctype_offset(str1912), 586},
       {uniname2ctype_offset(str1913), 143},
       {-1}, {-1},
-      {uniname2ctype_offset(str1916), 588},
+      {uniname2ctype_offset(str1916), 594},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1924), 143},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1929), 429},
+      {uniname2ctype_offset(str1929), 432},
       {-1}, {-1},
-      {uniname2ctype_offset(str1932), 412},
+      {uniname2ctype_offset(str1932), 415},
       {-1}, {-1},
-      {uniname2ctype_offset(str1935), 262},
-      {uniname2ctype_offset(str1936), 335},
+      {uniname2ctype_offset(str1935), 264},
+      {uniname2ctype_offset(str1936), 338},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1941), 27},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1948), 87},
-      {-1},
-      {uniname2ctype_offset(str1950), 421},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1950), 424},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1956), 250},
-      {uniname2ctype_offset(str1957), 87},
+      {uniname2ctype_offset(str1956), 252},
+      {-1},
       {uniname2ctype_offset(str1958), 109},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1964), 437},
+      {uniname2ctype_offset(str1964), 440},
       {-1}, {-1},
-      {uniname2ctype_offset(str1967), 489},
-      {uniname2ctype_offset(str1968), 634},
-      {uniname2ctype_offset(str1969), 249},
+      {uniname2ctype_offset(str1967), 492},
+      {uniname2ctype_offset(str1968), 644},
+      {uniname2ctype_offset(str1969), 251},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1974), 355},
+      {uniname2ctype_offset(str1974), 358},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str1981), 176},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str1985), 405},
+      {uniname2ctype_offset(str1985), 408},
       {-1}, {-1},
-      {uniname2ctype_offset(str1988), 438},
+      {uniname2ctype_offset(str1988), 441},
       {-1}, {-1},
       {uniname2ctype_offset(str1991), 1},
       {-1},
-      {uniname2ctype_offset(str1993), 372},
+      {uniname2ctype_offset(str1993), 375},
       {uniname2ctype_offset(str1994), 175},
       {-1},
       {uniname2ctype_offset(str1996), 42},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2002), 591},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2006), 407},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2010), 375},
-      {uniname2ctype_offset(str2011), 267},
-      {uniname2ctype_offset(str2012), 559},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2001), 110},
+      {uniname2ctype_offset(str2002), 598},
       {-1},
-      {uniname2ctype_offset(str2014), 333},
+      {uniname2ctype_offset(str2004), 110},
+      {-1},
+      {uniname2ctype_offset(str2006), 410},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2010), 378},
+      {uniname2ctype_offset(str2011), 269},
+      {uniname2ctype_offset(str2012), 565},
       {-1},
+      {uniname2ctype_offset(str2014), 336},
+      {uniname2ctype_offset(str2015), 117},
       {uniname2ctype_offset(str2016), 209},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2023), 32},
-      {uniname2ctype_offset(str2024), 503},
+      {uniname2ctype_offset(str2024), 506},
       {-1},
       {uniname2ctype_offset(str2026), 176},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2033), 8},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2040), 539},
+      {-1},
       {uniname2ctype_offset(str2042), 121},
       {uniname2ctype_offset(str2043), 17},
+      {uniname2ctype_offset(str2044), 117},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2047), 107},
+      {uniname2ctype_offset(str2048), 526},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2062), 130},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2070), 9},
       {-1}, {-1},
-      {uniname2ctype_offset(str2073), 342},
+      {uniname2ctype_offset(str2073), 345},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2077), 150},
-      {uniname2ctype_offset(str2078), 254},
+      {uniname2ctype_offset(str2078), 256},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str2090), 275},
+      {uniname2ctype_offset(str2090), 277},
       {-1},
       {uniname2ctype_offset(str2092), 150},
       {-1}, {-1},
-      {uniname2ctype_offset(str2095), 353},
+      {uniname2ctype_offset(str2095), 356},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2103), 162},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2110), 123},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2114), 436},
-      {uniname2ctype_offset(str2115), 381},
+      {uniname2ctype_offset(str2114), 439},
+      {uniname2ctype_offset(str2115), 384},
       {-1},
       {uniname2ctype_offset(str2117), 174},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -43649,15 +44751,15 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1},
       {uniname2ctype_offset(str2137), 12},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2141), 242},
+      {uniname2ctype_offset(str2141), 244},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2145), 52},
-      {uniname2ctype_offset(str2146), 413},
+      {uniname2ctype_offset(str2146), 416},
       {-1}, {-1},
       {uniname2ctype_offset(str2149), 221},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2163), 249},
+      {uniname2ctype_offset(str2163), 251},
       {-1},
       {uniname2ctype_offset(str2165), 174},
       {uniname2ctype_offset(str2166), 5},
@@ -43670,107 +44772,100 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str2182), 216},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2195), 351},
-      {uniname2ctype_offset(str2196), 493},
+      {uniname2ctype_offset(str2195), 354},
+      {uniname2ctype_offset(str2196), 496},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str2207), 196},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2211), 20},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2216), 364},
+      {uniname2ctype_offset(str2216), 367},
       {uniname2ctype_offset(str2217), 128},
-      {uniname2ctype_offset(str2218), 543},
+      {uniname2ctype_offset(str2218), 547},
       {uniname2ctype_offset(str2219), 78},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2224), 450},
+      {uniname2ctype_offset(str2224), 453},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2228), 43},
       {uniname2ctype_offset(str2229), 35},
       {-1}, {-1},
-      {uniname2ctype_offset(str2232), 382},
+      {uniname2ctype_offset(str2232), 385},
       {uniname2ctype_offset(str2233), 216},
       {uniname2ctype_offset(str2234), 92},
-      {uniname2ctype_offset(str2235), 486},
+      {uniname2ctype_offset(str2235), 489},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2241), 92},
       {-1}, {-1},
-      {uniname2ctype_offset(str2244), 440},
+      {uniname2ctype_offset(str2244), 443},
       {-1}, {-1},
       {uniname2ctype_offset(str2247), 36},
-      {uniname2ctype_offset(str2248), 595},
+      {uniname2ctype_offset(str2248), 602},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2276), 415},
+      {uniname2ctype_offset(str2276), 418},
       {-1},
       {uniname2ctype_offset(str2278), 124},
       {uniname2ctype_offset(str2279), 192},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2283), 214},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2296), 639},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2305), 205},
       {-1}, {-1},
       {uniname2ctype_offset(str2308), 234},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2312), 177},
       {-1}, {-1},
-      {uniname2ctype_offset(str2315), 594},
-      {uniname2ctype_offset(str2316), 629},
-      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2315), 601},
+      {uniname2ctype_offset(str2316), 638},
+      {-1},
+      {uniname2ctype_offset(str2318), 202},
+      {-1}, {-1},
       {uniname2ctype_offset(str2321), 153},
       {-1},
       {uniname2ctype_offset(str2323), 172},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2327), 378},
+      {uniname2ctype_offset(str2327), 381},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2331), 627},
+      {uniname2ctype_offset(str2331), 636},
       {-1},
       {uniname2ctype_offset(str2333), 134},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2341), 185},
-      {-1},
-      {uniname2ctype_offset(str2343), 585},
-      {uniname2ctype_offset(str2344), 439},
-      {uniname2ctype_offset(str2345), 239},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2350), 185},
-      {uniname2ctype_offset(str2351), 99},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2361), 598},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2364), 320},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2370), 339},
+      {uniname2ctype_offset(str2343), 591},
+      {uniname2ctype_offset(str2344), 442},
+      {uniname2ctype_offset(str2345), 241},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2353), 202},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2361), 606},
       {-1}, {-1},
+      {uniname2ctype_offset(str2364), 323},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2373), 37},
-      {uniname2ctype_offset(str2374), 389},
+      {uniname2ctype_offset(str2374), 392},
       {uniname2ctype_offset(str2375), 197},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2389), 557},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2397), 418},
-      {uniname2ctype_offset(str2398), 410},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2397), 421},
+      {uniname2ctype_offset(str2398), 413},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2405), 165},
-      {uniname2ctype_offset(str2406), 107},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2414), 82},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2418), 449},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2427), 23},
-      {uniname2ctype_offset(str2428), 183},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2433), 336},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2433), 339},
       {uniname2ctype_offset(str2434), 154},
       {-1}, {-1},
       {uniname2ctype_offset(str2437), 194},
-      {uniname2ctype_offset(str2438), 182},
-      {-1},
+      {-1}, {-1},
       {uniname2ctype_offset(str2440), 100},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
@@ -43778,36 +44873,36 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str2454), 220},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2460), 255},
+      {uniname2ctype_offset(str2460), 257},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2464), 159},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2470), 445},
+      {uniname2ctype_offset(str2470), 448},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2475), 142},
-      {uniname2ctype_offset(str2476), 430},
+      {uniname2ctype_offset(str2476), 558},
       {-1},
-      {uniname2ctype_offset(str2478), 414},
-      {uniname2ctype_offset(str2479), 358},
+      {uniname2ctype_offset(str2478), 417},
+      {uniname2ctype_offset(str2479), 361},
       {-1},
-      {uniname2ctype_offset(str2481), 383},
+      {uniname2ctype_offset(str2481), 386},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2500), 121},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2506), 528},
+      {uniname2ctype_offset(str2506), 532},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2511), 242},
+      {uniname2ctype_offset(str2511), 244},
       {-1},
-      {uniname2ctype_offset(str2513), 621},
+      {uniname2ctype_offset(str2513), 630},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2530), 82},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2534), 337},
+      {uniname2ctype_offset(str2534), 340},
+      {uniname2ctype_offset(str2535), 237},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str2545), 275},
+      {uniname2ctype_offset(str2545), 277},
       {-1}, {-1},
       {uniname2ctype_offset(str2548), 118},
       {uniname2ctype_offset(str2549), 159},
@@ -43815,74 +44910,74 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str2551), 89},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2564), 369},
+      {uniname2ctype_offset(str2564), 372},
       {-1}, {-1},
-      {uniname2ctype_offset(str2567), 315},
+      {uniname2ctype_offset(str2567), 318},
       {-1}, {-1},
-      {uniname2ctype_offset(str2570), 488},
+      {uniname2ctype_offset(str2570), 491},
       {-1},
-      {uniname2ctype_offset(str2572), 470},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2575), 471},
-      {uniname2ctype_offset(str2576), 273},
+      {uniname2ctype_offset(str2572), 473},
+      {-1},
+      {uniname2ctype_offset(str2574), 246},
+      {uniname2ctype_offset(str2575), 474},
+      {uniname2ctype_offset(str2576), 275},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2582), 388},
+      {uniname2ctype_offset(str2582), 391},
       {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2588), 154},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2602), 210},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2606), 371},
+      {uniname2ctype_offset(str2606), 374},
       {-1},
-      {uniname2ctype_offset(str2608), 455},
+      {uniname2ctype_offset(str2608), 458},
       {uniname2ctype_offset(str2609), 55},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2625), 260},
+      {uniname2ctype_offset(str2625), 262},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2648), 252},
+      {uniname2ctype_offset(str2648), 254},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2652), 380},
+      {uniname2ctype_offset(str2652), 383},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2656), 365},
+      {uniname2ctype_offset(str2656), 368},
       {uniname2ctype_offset(str2657), 112},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2660), 147},
-      {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2665), 87},
       {uniname2ctype_offset(str2666), 50},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2670), 623},
+      {uniname2ctype_offset(str2670), 632},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2674), 87},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2688), 139},
-      {uniname2ctype_offset(str2689), 631},
+      {uniname2ctype_offset(str2689), 641},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2694), 48},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str2705), 478},
+      {uniname2ctype_offset(str2705), 481},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
       {uniname2ctype_offset(str2726), 226},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2738), 225},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str2750), 553},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2750), 557},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str2761), 18},
-      {uniname2ctype_offset(str2762), 263},
+      {uniname2ctype_offset(str2762), 265},
       {-1}, {-1},
       {uniname2ctype_offset(str2765), 133},
       {uniname2ctype_offset(str2766), 54},
       {-1}, {-1},
-      {uniname2ctype_offset(str2769), 480},
+      {uniname2ctype_offset(str2769), 483},
       {-1}, {-1},
       {uniname2ctype_offset(str2772), 199},
       {-1}, {-1},
@@ -43890,94 +44985,87 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str2786), 4},
-      {uniname2ctype_offset(str2787), 80},
-      {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2793), 34},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2801), 29},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2808), 509},
+      {uniname2ctype_offset(str2808), 512},
       {-1},
       {uniname2ctype_offset(str2810), 226},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2816), 307},
+      {uniname2ctype_offset(str2816), 310},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2821), 390},
+      {uniname2ctype_offset(str2821), 393},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2830), 605},
+      {uniname2ctype_offset(str2830), 614},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2834), 361},
+      {uniname2ctype_offset(str2834), 364},
       {-1},
       {uniname2ctype_offset(str2836), 78},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str2847), 246},
+      {uniname2ctype_offset(str2847), 248},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2852), 302},
+      {uniname2ctype_offset(str2852), 305},
       {-1}, {-1},
       {uniname2ctype_offset(str2855), 190},
       {uniname2ctype_offset(str2856), 66},
       {-1}, {-1},
-      {uniname2ctype_offset(str2859), 424},
+      {uniname2ctype_offset(str2859), 427},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2867), 306},
-      {uniname2ctype_offset(str2868), 246},
+      {uniname2ctype_offset(str2867), 309},
+      {uniname2ctype_offset(str2868), 248},
       {-1}, {-1},
-      {uniname2ctype_offset(str2871), 252},
+      {uniname2ctype_offset(str2871), 254},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2879), 204},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2886), 622},
+      {uniname2ctype_offset(str2886), 631},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2901), 99},
-      {uniname2ctype_offset(str2902), 474},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2902), 477},
       {-1},
-      {uniname2ctype_offset(str2904), 461},
-      {uniname2ctype_offset(str2905), 271},
+      {uniname2ctype_offset(str2904), 464},
+      {uniname2ctype_offset(str2905), 273},
       {-1},
-      {uniname2ctype_offset(str2907), 271},
+      {uniname2ctype_offset(str2907), 273},
       {-1},
-      {uniname2ctype_offset(str2909), 571},
+      {uniname2ctype_offset(str2909), 577},
       {-1},
-      {uniname2ctype_offset(str2911), 447},
+      {uniname2ctype_offset(str2911), 450},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str2941), 360},
+      {uniname2ctype_offset(str2941), 363},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
       {uniname2ctype_offset(str2953), 198},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str2964), 517},
+      {uniname2ctype_offset(str2964), 520},
       {-1},
-      {uniname2ctype_offset(str2966), 236},
+      {uniname2ctype_offset(str2966), 238},
       {uniname2ctype_offset(str2967), 43},
-      {-1},
-      {uniname2ctype_offset(str2969), 204},
+      {-1}, {-1},
       {uniname2ctype_offset(str2970), 88},
-      {-1},
-      {uniname2ctype_offset(str2972), 244},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str2980), 195},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2984), 568},
+      {uniname2ctype_offset(str2984), 574},
       {-1},
       {uniname2ctype_offset(str2986), 118},
       {uniname2ctype_offset(str2987), 54},
-      {uniname2ctype_offset(str2988), 468},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2993), 201},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str2997), 596},
+      {uniname2ctype_offset(str2988), 471},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2997), 603},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3001), 180},
       {uniname2ctype_offset(str3002), 64},
       {-1}, {-1},
-      {uniname2ctype_offset(str3005), 472},
-      {uniname2ctype_offset(str3006), 577},
+      {uniname2ctype_offset(str3005), 475},
+      {uniname2ctype_offset(str3006), 583},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3015), 83},
       {-1}, {-1},
@@ -43985,60 +45073,73 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str3019), 165},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3026), 83},
-      {uniname2ctype_offset(str3027), 500},
+      {uniname2ctype_offset(str3027), 503},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3035), 232},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3042), 211},
       {-1}, {-1},
-      {uniname2ctype_offset(str3045), 606},
+      {uniname2ctype_offset(str3045), 615},
       {-1}, {-1},
       {uniname2ctype_offset(str3048), 119},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3052), 89},
       {uniname2ctype_offset(str3053), 229},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3058), 185},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3067), 185},
+      {uniname2ctype_offset(str3068), 99},
+      {-1}, {-1},
       {uniname2ctype_offset(str3071), 198},
       {uniname2ctype_offset(str3072), 133},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3082), 130},
-      {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3084), 237},
+      {-1},
       {uniname2ctype_offset(str3086), 84},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3091), 259},
+      {uniname2ctype_offset(str3087), 342},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3091), 261},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3099), 475},
+      {uniname2ctype_offset(str3099), 478},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3104), 84},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3107), 310},
       {-1},
-      {uniname2ctype_offset(str3109), 312},
+      {uniname2ctype_offset(str3106), 562},
+      {uniname2ctype_offset(str3107), 313},
+      {-1},
+      {uniname2ctype_offset(str3109), 315},
       {uniname2ctype_offset(str3110), 152},
       {uniname2ctype_offset(str3111), 191},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3118), 90},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3123), 107},
+      {-1},
       {uniname2ctype_offset(str3125), 191},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3140), 607},
-      {-1},
-      {uniname2ctype_offset(str3142), 579},
+      {uniname2ctype_offset(str3135), 452},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3142), 585},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3145), 183},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3155), 182},
+      {-1},
       {uniname2ctype_offset(str3157), 231},
-      {uniname2ctype_offset(str3158), 325},
+      {uniname2ctype_offset(str3158), 328},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3176), 393},
+      {uniname2ctype_offset(str3176), 396},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3180), 328},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3180), 331},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3193), 433},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3209), 62},
       {-1}, {-1},
       {uniname2ctype_offset(str3212), 211},
@@ -44046,97 +45147,97 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str3215), 180},
       {-1}, {-1},
       {uniname2ctype_offset(str3218), 125},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3227), 433},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3237), 387},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3237), 390},
       {-1},
-      {uniname2ctype_offset(str3239), 305},
-      {uniname2ctype_offset(str3240), 301},
+      {uniname2ctype_offset(str3239), 308},
+      {uniname2ctype_offset(str3240), 304},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3248), 213},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3254), 250},
+      {uniname2ctype_offset(str3254), 252},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str3265), 601},
+      {uniname2ctype_offset(str3265), 610},
       {-1},
       {uniname2ctype_offset(str3267), 28},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3275), 146},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3284), 609},
+      {uniname2ctype_offset(str3284), 618},
       {-1}, {-1},
       {uniname2ctype_offset(str3287), 223},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3290), 451},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3297), 308},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3297), 311},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3303), 304},
+      {uniname2ctype_offset(str3303), 307},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3313), 253},
+      {uniname2ctype_offset(str3313), 255},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3320), 223},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3328), 63},
-      {uniname2ctype_offset(str3329), 616},
+      {uniname2ctype_offset(str3329), 625},
       {-1},
       {uniname2ctype_offset(str3331), 222},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3338), 262},
+      {uniname2ctype_offset(str3338), 264},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3348), 404},
+      {uniname2ctype_offset(str3348), 407},
       {-1},
-      {uniname2ctype_offset(str3350), 498},
+      {uniname2ctype_offset(str3350), 501},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3355), 47},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3360), 334},
+      {uniname2ctype_offset(str3360), 337},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str3371), 126},
       {uniname2ctype_offset(str3372), 16},
-      {uniname2ctype_offset(str3373), 251},
+      {uniname2ctype_offset(str3373), 253},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3377), 147},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3391), 236},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3396), 604},
+      {uniname2ctype_offset(str3391), 238},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3396), 613},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3405), 466},
+      {uniname2ctype_offset(str3405), 469},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str3416), 51},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3428), 251},
+      {uniname2ctype_offset(str3428), 253},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3433), 205},
       {-1}, {-1},
       {uniname2ctype_offset(str3436), 213},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3452), 220},
-      {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3455), 225},
+      {-1}, {-1},
       {uniname2ctype_offset(str3458), 10},
       {-1},
-      {uniname2ctype_offset(str3460), 618},
+      {uniname2ctype_offset(str3460), 627},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3483), 243},
+      {uniname2ctype_offset(str3483), 245},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3502), 49},
-      {-1}, {-1},
-      {uniname2ctype_offset(str3505), 476},
+      {-1},
+      {uniname2ctype_offset(str3504), 80},
+      {uniname2ctype_offset(str3505), 479},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3511), 408},
+      {uniname2ctype_offset(str3511), 411},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3532), 572},
+      {uniname2ctype_offset(str3532), 578},
       {uniname2ctype_offset(str3533), 57},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44152,11 +45253,13 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3613), 41},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3618), 99},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3648), 462},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3648), 465},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
       {uniname2ctype_offset(str3659), 178},
@@ -44164,18 +45267,23 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str3664), 177},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3698), 501},
-      {uniname2ctype_offset(str3699), 548},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3686), 204},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3689), 246},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3698), 504},
+      {uniname2ctype_offset(str3699), 552},
       {-1},
       {uniname2ctype_offset(str3701), 96},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3705), 317},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3705), 320},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3710), 201},
+      {-1}, {-1},
       {uniname2ctype_offset(str3713), 96},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3721), 435},
+      {uniname2ctype_offset(str3721), 438},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
@@ -44184,57 +45292,59 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str3754), 71},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str3766), 464},
-      {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3770), 147},
+      {uniname2ctype_offset(str3766), 467},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3799), 214},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3807), 258},
+      {uniname2ctype_offset(str3807), 260},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3842), 182},
       {-1}, {-1},
-      {uniname2ctype_offset(str3845), 257},
+      {uniname2ctype_offset(str3845), 259},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3850), 243},
+      {uniname2ctype_offset(str3850), 245},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3854), 65},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3857), 616},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3868), 259},
+      {-1},
+      {uniname2ctype_offset(str3868), 261},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3881), 228},
       {-1}, {-1},
-      {uniname2ctype_offset(str3884), 303},
+      {uniname2ctype_offset(str3884), 306},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3891), 30},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3924), 417},
+      {uniname2ctype_offset(str3924), 420},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str3942), 100},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3949), 274},
+      {-1},
+      {uniname2ctype_offset(str3944), 436},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3949), 276},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str3976), 597},
-      {-1},
-      {uniname2ctype_offset(str3978), 80},
+      {uniname2ctype_offset(str3976), 604},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {uniname2ctype_offset(str3998), 427},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3998), 430},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4007), 454},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44242,13 +45352,10 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4066), 313},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str4106), 45},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str4116), 132},
@@ -44259,14 +45366,15 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4169), 220},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str4231), 153},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44277,18 +45385,17 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4308), 398},
+      {uniname2ctype_offset(str4308), 401},
       {uniname2ctype_offset(str4309), 162},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {uniname2ctype_offset(str4321), 240},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4348), 565},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str4348), 571},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4361), 566},
+      {uniname2ctype_offset(str4361), 572},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44304,6 +45411,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4487), 147},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44316,42 +45424,45 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str4604), 116},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
       {uniname2ctype_offset(str4626), 116},
-      {uniname2ctype_offset(str4627), 253},
+      {uniname2ctype_offset(str4627), 255},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1},
-      {uniname2ctype_offset(str4674), 632},
+      {uniname2ctype_offset(str4674), 642},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4683), 463},
+      {uniname2ctype_offset(str4683), 466},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str4695), 80},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
       {uniname2ctype_offset(str4734), 179},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1},
-      {uniname2ctype_offset(str4755), 309},
-      {uniname2ctype_offset(str4756), 311},
+      {uniname2ctype_offset(str4755), 312},
+      {uniname2ctype_offset(str4756), 314},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4772), 406},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4772), 409},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4783), 316},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {uniname2ctype_offset(str4810), 90},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44376,7 +45487,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1},
       {uniname2ctype_offset(str4982), 232},
       {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str4986), 425},
+      {uniname2ctype_offset(str4986), 428},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44384,6 +45495,8 @@ uniname2ctype_p (register const char *str, register size_t len)
       {uniname2ctype_offset(str5018), 46},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str5038), 242},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -44394,8 +45507,8 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str5134), 619},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5134), 628},
 #endif /* USE_UNICODE_PROPERTIES */
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #ifndef USE_UNICODE_PROPERTIES
@@ -44525,7 +45638,7 @@ uniname2ctype_p (register const char *str, register size_t len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {uniname2ctype_offset(str6098), 633}
+      {uniname2ctype_offset(str6098), 643}
 #endif /* USE_UNICODE_PROPERTIES */
     };
 
@@ -44556,22 +45669,22 @@ uniname2ctype(const UChar *name, unsigned int len)
   return -1;
 }
 #if defined ONIG_UNICODE_VERSION_STRING && !( \
-      ONIG_UNICODE_VERSION_MAJOR == 14 && \
+      ONIG_UNICODE_VERSION_MAJOR == 15 && \
       ONIG_UNICODE_VERSION_MINOR == 0 && \
       ONIG_UNICODE_VERSION_TEENY == 0 && \
       1)
 # error ONIG_UNICODE_VERSION_STRING mismatch
 #endif
-#define ONIG_UNICODE_VERSION_STRING "14.0.0"
-#define ONIG_UNICODE_VERSION_MAJOR 14
+#define ONIG_UNICODE_VERSION_STRING "15.0.0"
+#define ONIG_UNICODE_VERSION_MAJOR 15
 #define ONIG_UNICODE_VERSION_MINOR 0
 #define ONIG_UNICODE_VERSION_TEENY 0
 #if defined ONIG_UNICODE_EMOJI_VERSION_STRING && !( \
-      ONIG_UNICODE_EMOJI_VERSION_MAJOR == 14 && \
+      ONIG_UNICODE_EMOJI_VERSION_MAJOR == 15 && \
       ONIG_UNICODE_EMOJI_VERSION_MINOR == 0 && \
       1)
 # error ONIG_UNICODE_EMOJI_VERSION_STRING mismatch
 #endif
-#define ONIG_UNICODE_EMOJI_VERSION_STRING "14.0"
-#define ONIG_UNICODE_EMOJI_VERSION_MAJOR 14
+#define ONIG_UNICODE_EMOJI_VERSION_STRING "15.0"
+#define ONIG_UNICODE_EMOJI_VERSION_MAJOR 15
 #define ONIG_UNICODE_EMOJI_VERSION_MINOR 0
diff --git a/encoding.c b/encoding.c
index b8e7f790b8..2f4b47bdfa 100644
--- a/encoding.c
+++ b/encoding.c
@@ -56,9 +56,8 @@ int rb_encdb_alias(const char *alias, const char *orig);
 static ID id_encoding;
 VALUE rb_cEncoding;
 
-#define DEFAULT_ENCODING_LIST_CAPA 128
-static VALUE rb_default_encoding_list;
-static VALUE rb_additional_encoding_list;
+#define ENCODING_LIST_CAPA 256
+static VALUE rb_encoding_list;
 
 struct rb_encoding_entry {
     const char *name;
@@ -67,9 +66,8 @@ struct rb_encoding_entry {
 };
 
 static struct enc_table {
-    struct rb_encoding_entry *list;
+    struct rb_encoding_entry list[ENCODING_LIST_CAPA];
     int count;
-    int size;
     st_table *names;
 } global_enc_table;
 
@@ -128,47 +126,25 @@ enc_new(rb_encoding *encoding)
 static void
 enc_list_update(int index, rb_raw_encoding *encoding)
 {
-    if (index < DEFAULT_ENCODING_LIST_CAPA) {
-        VALUE list = rb_default_encoding_list;
-        if (list && NIL_P(rb_ary_entry(list, index))) {
-            /* initialize encoding data */
-            rb_ary_store(list, index, enc_new(encoding));
-        }
-    }
-    else {
-        RB_VM_LOCK_ENTER();
-        {
-            VALUE list = rb_additional_encoding_list;
-            if (list && NIL_P(rb_ary_entry(list, index))) {
-                /* initialize encoding data */
-                rb_ary_store(list, index - DEFAULT_ENCODING_LIST_CAPA, enc_new(encoding));
-            }
-        }
-        RB_VM_LOCK_LEAVE();
+    RUBY_ASSERT(index < ENCODING_LIST_CAPA);
+
+    VALUE list = rb_encoding_list;
+    if (list && NIL_P(rb_ary_entry(list, index))) {
+        /* initialize encoding data */
+        rb_ary_store(list, index, enc_new(encoding));
     }
 }
 
 static VALUE
 enc_list_lookup(int idx)
 {
-    VALUE list, enc;
+    VALUE list, enc = Qnil;
 
-    if (idx < DEFAULT_ENCODING_LIST_CAPA) {
-        if (!(list = rb_default_encoding_list)) {
-            rb_bug("rb_enc_from_encoding_index(%d): no rb_default_encoding_list", idx);
-        }
+    if (idx < ENCODING_LIST_CAPA) {
+        list = rb_encoding_list;
+        RUBY_ASSERT(list);
         enc = rb_ary_entry(list, idx);
     }
-    else {
-        RB_VM_LOCK_ENTER();
-        {
-            if (!(list = rb_additional_encoding_list)) {
-                rb_bug("rb_enc_from_encoding_index(%d): no rb_additional_encoding_list", idx);
-            }
-            enc = rb_ary_entry(list, idx - DEFAULT_ENCODING_LIST_CAPA);
-        }
-        RB_VM_LOCK_LEAVE();
-    }
 
     if (NIL_P(enc)) {
         rb_bug("rb_enc_from_encoding_index(%d): not created yet", idx);
@@ -345,16 +321,10 @@ rb_find_encoding(VALUE enc)
 static int
 enc_table_expand(struct enc_table *enc_table, int newsize)
 {
-    struct rb_encoding_entry *ent;
-    int count = newsize;
-
-    if (enc_table->size >= newsize) return newsize;
-    newsize = (newsize + 7) / 8 * 8;
-    ent = REALLOC_N(enc_table->list, struct rb_encoding_entry, newsize);
-    memset(ent + enc_table->size, 0, sizeof(*ent)*(newsize - enc_table->size));
-    enc_table->list = ent;
-    enc_table->size = newsize;
-    return count;
+    if (newsize > ENCODING_LIST_CAPA) {
+        rb_raise(rb_eEncodingError, "too many encoding (> %d)", ENCODING_LIST_CAPA);
+    }
+    return newsize;
 }
 
 static int
@@ -413,17 +383,7 @@ enc_from_index(struct enc_table *enc_table, int index)
 rb_encoding *
 rb_enc_from_index(int index)
 {
-    rb_encoding *enc;
-
-    switch (index) {
-      case ENCINDEX_ASCII_8BIT:    return global_enc_ascii;
-      case ENCINDEX_UTF_8:    return global_enc_utf_8;
-      case ENCINDEX_US_ASCII: return global_enc_us_ascii;
-      default:
-        GLOBAL_ENC_TABLE_EVAL(enc_table,
-                              enc = enc_from_index(enc_table, index));
-        return enc;
-    }
+    return enc_from_index(&global_enc_table, index);
 }
 
 int
@@ -462,7 +422,7 @@ enc_registered(struct enc_table *enc_table, const char *name)
     st_data_t idx = 0;
 
     if (!name) return -1;
-    if (!enc_table->list) return -1;
+    if (!enc_table->names) return -1;
     if (st_lookup(enc_table->names, (st_data_t)name, &idx)) {
         return (int)idx;
     }
@@ -484,11 +444,14 @@ rb_encdb_declare(const char *name)
 }
 
 static void
-enc_check_duplication(struct enc_table *enc_table, const char *name)
+enc_check_addable(struct enc_table *enc_table, const char *name)
 {
     if (enc_registered(enc_table, name) >= 0) {
         rb_raise(rb_eArgError, "encoding %s is already registered", name);
     }
+    else if (!valid_encoding_name_p(name)) {
+        rb_raise(rb_eArgError, "invalid encoding name: %s", name);
+    }
 }
 
 static rb_encoding*
@@ -524,11 +487,7 @@ rb_enc_set_base(const char *name, const char *orig)
 int
 rb_enc_set_dummy(int index)
 {
-    rb_encoding *enc;
-
-    GLOBAL_ENC_TABLE_EVAL(enc_table,
-                          enc = enc_table->list[index].enc);
-
+    rb_encoding *enc = global_enc_table.list[index].enc;
     ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return index;
 }
@@ -538,7 +497,7 @@ enc_replicate(struct enc_table *enc_table, const char *name, rb_encoding *encodi
 {
     int idx;
 
-    enc_check_duplication(enc_table, name);
+    enc_check_addable(enc_table, name);
     idx = enc_register(enc_table, name, encoding);
     if (idx < 0) rb_raise(rb_eArgError, "invalid encoding name: %s", name);
     set_base_encoding(enc_table, idx, encoding);
@@ -727,7 +686,7 @@ rb_enc_alias(const char *alias, const char *orig)
 
     GLOBAL_ENC_TABLE_ENTER(enc_table);
     {
-        enc_check_duplication(enc_table, alias);
+        enc_check_addable(enc_table, alias);
         if ((idx = rb_enc_find_index(orig)) < 0) {
             r =  -1;
         }
@@ -764,7 +723,7 @@ rb_enc_init(struct enc_table *enc_table)
 {
     enc_table_expand(enc_table, ENCODING_COUNT + 1);
     if (!enc_table->names) {
-        enc_table->names = st_init_strcasetable();
+        enc_table->names = st_init_strcasetable_with_size(ENCODING_LIST_CAPA);
     }
 #define OnigEncodingASCII_8BIT OnigEncodingASCII
 #define ENC_REGISTER(enc) enc_register_at(enc_table, ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc)
@@ -877,11 +836,9 @@ rb_enc_autoload(rb_encoding *enc)
 int
 rb_enc_find_index(const char *name)
 {
-    int i;
+    int i = enc_registered(&global_enc_table, name);
     rb_encoding *enc;
 
-    GLOBAL_ENC_TABLE_EVAL(enc_table, i = enc_registered(enc_table, name));
-
     if (i < 0) {
         i = load_encoding(name);
     }
@@ -1368,10 +1325,7 @@ enc_names(VALUE self)
 
     args[0] = (VALUE)rb_to_encoding_index(self);
     args[1] = rb_ary_new2(0);
-
-    GLOBAL_ENC_TABLE_EVAL(enc_table,
-                          st_foreach(enc_table->names, enc_names_i, (st_data_t)args));
-
+    st_foreach(global_enc_table.names, enc_names_i, (st_data_t)args);
     return args[1];
 }
 
@@ -1397,14 +1351,7 @@ static VALUE
 enc_list(VALUE klass)
 {
     VALUE ary = rb_ary_new2(0);
-
-    RB_VM_LOCK_ENTER();
-    {
-        rb_ary_replace(ary, rb_default_encoding_list);
-        rb_ary_concat(ary, rb_additional_encoding_list);
-    }
-    RB_VM_LOCK_LEAVE();
-
+    rb_ary_replace(ary, rb_encoding_list);
     return ary;
 }
 
@@ -1553,15 +1500,17 @@ rb_locale_encindex(void)
 
     if (idx < 0) idx = ENCINDEX_UTF_8;
 
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    if (enc_registered(enc_table, "locale") < 0) {
+    if (enc_registered(&global_enc_table, "locale") < 0) {
 # if defined _WIN32
         void Init_w32_codepage(void);
         Init_w32_codepage();
 # endif
-        enc_alias_internal(enc_table, "locale", idx);
+        GLOBAL_ENC_TABLE_ENTER(enc_table);
+        {
+            enc_alias_internal(enc_table, "locale", idx);
+        }
+        GLOBAL_ENC_TABLE_LEAVE();
     }
-    GLOBAL_ENC_TABLE_LEAVE();
 
     return idx;
 }
@@ -1575,13 +1524,8 @@ rb_locale_encoding(void)
 int
 rb_filesystem_encindex(void)
 {
-    int idx;
-
-    GLOBAL_ENC_TABLE_EVAL(enc_table,
-                          idx = enc_registered(enc_table, "filesystem"));
-
-    if (idx < 0)
-        idx = ENCINDEX_ASCII_8BIT;
+    int idx = enc_registered(&global_enc_table, "filesystem");
+    if (idx < 0) idx = ENCINDEX_ASCII_8BIT;
     return idx;
 }
 
@@ -1612,7 +1556,14 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha
         if (NIL_P(encoding)) {
             def->index = -1;
             def->enc = 0;
-            st_insert(enc_table->names, (st_data_t)strdup(name),
+            char *name_dup = strdup(name);
+
+            st_data_t existing_name = (st_data_t)name_dup;
+            if (st_delete(enc_table->names, &existing_name, NULL)) {
+                xfree((void *)existing_name);
+            }
+
+            st_insert(enc_table->names, (st_data_t)name_dup,
                       (st_data_t)UNSPECIFIED_ENCODING);
         }
         else {
@@ -1872,15 +1823,8 @@ rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg)
 static VALUE
 rb_enc_name_list(VALUE klass)
 {
-    VALUE ary;
-
-    GLOBAL_ENC_TABLE_ENTER(enc_table);
-    {
-        ary = rb_ary_new2(enc_table->names->num_entries);
-        st_foreach(enc_table->names, rb_enc_name_list_i, (st_data_t)ary);
-    }
-    GLOBAL_ENC_TABLE_LEAVE();
-
+    VALUE ary = rb_ary_new2(global_enc_table.names->num_entries);
+    st_foreach(global_enc_table.names, rb_enc_name_list_i, (st_data_t)ary);
     return ary;
 }
 
@@ -1926,8 +1870,7 @@ rb_enc_aliases(VALUE klass)
     aliases[0] = rb_hash_new();
     aliases[1] = rb_ary_new();
 
-    GLOBAL_ENC_TABLE_EVAL(enc_table,
-                          st_foreach(enc_table->names, rb_enc_aliases_enc_i, (st_data_t)aliases));
+    st_foreach(global_enc_table.names, rb_enc_aliases_enc_i, (st_data_t)aliases);
 
     return aliases[0];
 }
@@ -1996,13 +1939,7 @@ Init_Encoding(void)
 
     struct enc_table *enc_table = &global_enc_table;
 
-    if (DEFAULT_ENCODING_LIST_CAPA < enc_table->count) rb_bug("DEFAULT_ENCODING_LIST_CAPA is too small");
-
-    list = rb_additional_encoding_list = rb_ary_new();
-    RBASIC_CLEAR_CLASS(list);
-    rb_gc_register_mark_object(list);
-
-    list = rb_default_encoding_list = rb_ary_new2(DEFAULT_ENCODING_LIST_CAPA);
+    list = rb_encoding_list = rb_ary_new2(ENCODING_LIST_CAPA);
     RBASIC_CLEAR_CLASS(list);
     rb_gc_register_mark_object(list);
 
@@ -2024,5 +1961,5 @@ Init_encodings(void)
 void
 rb_enc_foreach_name(int (*func)(st_data_t name, st_data_t idx, st_data_t arg), st_data_t arg)
 {
-    GLOBAL_ENC_TABLE_EVAL(enc_table, st_foreach(enc_table->names, func, arg));
+    st_foreach(global_enc_table.names, func, arg);
 }
diff --git a/enum.c b/enum.c
index 97215b627e..b3c715e0a1 100644
--- a/enum.c
+++ b/enum.c
@@ -779,7 +779,7 @@ inject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->v1 == Qundef) {
+    if (UNDEF_P(memo->v1)) {
         MEMO_V1_SET(memo, i);
     }
     else {
@@ -796,7 +796,7 @@ inject_op_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->v1 == Qundef) {
+    if (UNDEF_P(memo->v1)) {
         MEMO_V1_SET(memo, i);
     }
     else if (SYMBOL_P(name = memo->u3.value)) {
@@ -820,9 +820,9 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
     long i, n;
 
     if (RARRAY_LEN(ary) == 0)
-        return init == Qundef ? Qnil : init;
+        return UNDEF_P(init) ? Qnil : init;
 
-    if (init == Qundef) {
+    if (UNDEF_P(init)) {
         v = RARRAY_AREF(ary, 0);
         i = 1;
         if (RARRAY_LEN(ary) == 1)
@@ -1051,7 +1051,7 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
 
     memo = MEMO_NEW(init, Qnil, op);
     rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo);
-    if (memo->v1 == Qundef) return Qnil;
+    if (UNDEF_P(memo->v1)) return Qnil;
     return memo->v1;
 }
 
@@ -1373,7 +1373,6 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
 static int
 sort_by_cmp(const void *ap, const void *bp, void *data)
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     VALUE a;
     VALUE b;
     VALUE ary = (VALUE)data;
@@ -1385,7 +1384,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
     a = *(VALUE *)ap;
     b = *(VALUE *)bp;
 
-    return OPTIMIZED_CMP(a, b, cmp_opt);
+    return OPTIMIZED_CMP(a, b);
 }
 
 /*
@@ -1677,7 +1676,7 @@ enum_any(int argc, VALUE *argv, VALUE obj)
 DEFINE_ENUMFUNCS(one)
 {
     if (RTEST(result)) {
-        if (memo->v1 == Qundef) {
+        if (UNDEF_P(memo->v1)) {
             MEMO_V1_SET(memo, Qtrue);
         }
         else if (memo->v1 == Qtrue) {
@@ -1713,11 +1712,10 @@ cmpint_reenter_check(struct nmin_data *data, VALUE val)
 static int
 nmin_cmp(const void *ap, const void *bp, void *_data)
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct nmin_data *data = (struct nmin_data *)_data;
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
 #define rb_cmpint(cmp, a, b) rb_cmpint(cmpint_reenter_check(data, (cmp)), a, b)
-    return OPTIMIZED_CMP(a, b, cmp_opt);
+    return OPTIMIZED_CMP(a, b);
 #undef rb_cmpint
 }
 
@@ -1827,7 +1825,7 @@ nmin_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
     else
         cmpv = i;
 
-    if (data->limit != Qundef) {
+    if (!UNDEF_P(data->limit)) {
         int c = data->cmpfunc(&cmpv, &data->limit, data);
         if (data->rev)
             c = -c;
@@ -1962,7 +1960,7 @@ enum_one(int argc, VALUE *argv, VALUE obj)
     WARN_UNUSED_BLOCK(argc);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)memo);
     result = memo->v1;
-    if (result == Qundef) return Qfalse;
+    if (UNDEF_P(result)) return Qfalse;
     return result;
 }
 
@@ -2027,7 +2025,6 @@ enum_none(int argc, VALUE *argv, VALUE obj)
 
 struct min_t {
     VALUE min;
-    struct cmp_opt_data cmp_opt;
 };
 
 static VALUE
@@ -2037,11 +2034,11 @@ min_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->min == Qundef) {
+    if (UNDEF_P(memo->min)) {
         memo->min = i;
     }
     else {
-        if (OPTIMIZED_CMP(i, memo->min, memo->cmp_opt) < 0) {
+        if (OPTIMIZED_CMP(i, memo->min) < 0) {
             memo->min = i;
         }
     }
@@ -2056,7 +2053,7 @@ min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->min == Qundef) {
+    if (UNDEF_P(memo->min)) {
         memo->min = i;
     }
     else {
@@ -2130,7 +2127,7 @@ static VALUE
 enum_min(int argc, VALUE *argv, VALUE obj)
 {
     VALUE memo;
-    struct min_t *m = NEW_CMP_OPT_MEMO(struct min_t, memo);
+    struct min_t *m = NEW_MEMO_FOR(struct min_t, memo);
     VALUE result;
     VALUE num;
 
@@ -2138,8 +2135,6 @@ enum_min(int argc, VALUE *argv, VALUE obj)
        return rb_nmin_run(obj, num, 0, 0, 0);
 
     m->min = Qundef;
-    m->cmp_opt.opt_methods = 0;
-    m->cmp_opt.opt_inited = 0;
     if (rb_block_given_p()) {
         rb_block_call(obj, id_each, 0, 0, min_ii, memo);
     }
@@ -2147,13 +2142,12 @@ enum_min(int argc, VALUE *argv, VALUE obj)
         rb_block_call(obj, id_each, 0, 0, min_i, memo);
     }
     result = m->min;
-    if (result == Qundef) return Qnil;
+    if (UNDEF_P(result)) return Qnil;
     return result;
 }
 
 struct max_t {
     VALUE max;
-    struct cmp_opt_data cmp_opt;
 };
 
 static VALUE
@@ -2163,11 +2157,11 @@ max_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->max == Qundef) {
+    if (UNDEF_P(memo->max)) {
         memo->max = i;
     }
     else {
-        if (OPTIMIZED_CMP(i, memo->max, memo->cmp_opt) > 0) {
+        if (OPTIMIZED_CMP(i, memo->max) > 0) {
             memo->max = i;
         }
     }
@@ -2182,7 +2176,7 @@ max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->max == Qundef) {
+    if (UNDEF_P(memo->max)) {
         memo->max = i;
     }
     else {
@@ -2255,7 +2249,7 @@ static VALUE
 enum_max(int argc, VALUE *argv, VALUE obj)
 {
     VALUE memo;
-    struct max_t *m = NEW_CMP_OPT_MEMO(struct max_t, memo);
+    struct max_t *m = NEW_MEMO_FOR(struct max_t, memo);
     VALUE result;
     VALUE num;
 
@@ -2263,8 +2257,6 @@ enum_max(int argc, VALUE *argv, VALUE obj)
        return rb_nmin_run(obj, num, 0, 1, 0);
 
     m->max = Qundef;
-    m->cmp_opt.opt_methods = 0;
-    m->cmp_opt.opt_inited = 0;
     if (rb_block_given_p()) {
         rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)memo);
     }
@@ -2272,7 +2264,7 @@ enum_max(int argc, VALUE *argv, VALUE obj)
         rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)memo);
     }
     result = m->max;
-    if (result == Qundef) return Qnil;
+    if (UNDEF_P(result)) return Qnil;
     return result;
 }
 
@@ -2280,7 +2272,6 @@ struct minmax_t {
     VALUE min;
     VALUE max;
     VALUE last;
-    struct cmp_opt_data cmp_opt;
 };
 
 static void
@@ -2288,16 +2279,16 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
 {
     int n;
 
-    if (memo->min == Qundef) {
+    if (UNDEF_P(memo->min)) {
         memo->min = i;
         memo->max = j;
     }
     else {
-        n = OPTIMIZED_CMP(i, memo->min, memo->cmp_opt);
+        n = OPTIMIZED_CMP(i, memo->min);
         if (n < 0) {
             memo->min = i;
         }
-        n = OPTIMIZED_CMP(j, memo->max, memo->cmp_opt);
+        n = OPTIMIZED_CMP(j, memo->max);
         if (n > 0) {
             memo->max = j;
         }
@@ -2313,14 +2304,14 @@ minmax_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->last == Qundef) {
+    if (UNDEF_P(memo->last)) {
         memo->last = i;
         return Qnil;
     }
     j = memo->last;
     memo->last = Qundef;
 
-    n = OPTIMIZED_CMP(j, i, memo->cmp_opt);
+    n = OPTIMIZED_CMP(j, i);
     if (n == 0)
         i = j;
     else if (n < 0) {
@@ -2340,7 +2331,7 @@ minmax_ii_update(VALUE i, VALUE j, struct minmax_t *memo)
 {
     int n;
 
-    if (memo->min == Qundef) {
+    if (UNDEF_P(memo->min)) {
         memo->min = i;
         memo->max = j;
     }
@@ -2365,7 +2356,7 @@ minmax_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->last == Qundef) {
+    if (UNDEF_P(memo->last)) {
         memo->last = i;
         return Qnil;
     }
@@ -2422,23 +2413,21 @@ static VALUE
 enum_minmax(VALUE obj)
 {
     VALUE memo;
-    struct minmax_t *m = NEW_CMP_OPT_MEMO(struct minmax_t, memo);
+    struct minmax_t *m = NEW_MEMO_FOR(struct minmax_t, memo);
 
     m->min = Qundef;
     m->last = Qundef;
-    m->cmp_opt.opt_methods = 0;
-    m->cmp_opt.opt_inited = 0;
     if (rb_block_given_p()) {
         rb_block_call(obj, id_each, 0, 0, minmax_ii, memo);
-        if (m->last != Qundef)
+        if (!UNDEF_P(m->last))
             minmax_ii_update(m->last, m->last, m);
     }
     else {
         rb_block_call(obj, id_each, 0, 0, minmax_i, memo);
-        if (m->last != Qundef)
+        if (!UNDEF_P(m->last))
             minmax_i_update(m->last, m->last, m);
     }
-    if (m->min != Qundef) {
+    if (!UNDEF_P(m->min)) {
         return rb_assoc_new(m->min, m->max);
     }
     return rb_assoc_new(Qnil, Qnil);
@@ -2447,18 +2436,17 @@ enum_minmax(VALUE obj)
 static VALUE
 min_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct MEMO *memo = MEMO_CAST(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
     v = enum_yield(argc, i);
-    if (memo->v1 == Qundef) {
+    if (UNDEF_P(memo->v1)) {
         MEMO_V1_SET(memo, v);
         MEMO_V2_SET(memo, i);
     }
-    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) < 0) {
+    else if (OPTIMIZED_CMP(v, memo->v1) < 0) {
         MEMO_V1_SET(memo, v);
         MEMO_V2_SET(memo, i);
     }
@@ -2522,18 +2510,17 @@ enum_min_by(int argc, VALUE *argv, VALUE obj)
 static VALUE
 max_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct MEMO *memo = MEMO_CAST(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
     v = enum_yield(argc, i);
-    if (memo->v1 == Qundef) {
+    if (UNDEF_P(memo->v1)) {
         MEMO_V1_SET(memo, v);
         MEMO_V2_SET(memo, i);
     }
-    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) > 0) {
+    else if (OPTIMIZED_CMP(v, memo->v1) > 0) {
         MEMO_V1_SET(memo, v);
         MEMO_V2_SET(memo, i);
     }
@@ -2606,20 +2593,18 @@ struct minmax_by_t {
 static void
 minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *memo)
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
-
-    if (memo->min_bv == Qundef) {
+    if (UNDEF_P(memo->min_bv)) {
         memo->min_bv = v1;
         memo->max_bv = v2;
         memo->min = i1;
         memo->max = i2;
     }
     else {
-        if (OPTIMIZED_CMP(v1, memo->min_bv, cmp_opt) < 0) {
+        if (OPTIMIZED_CMP(v1, memo->min_bv) < 0) {
             memo->min_bv = v1;
             memo->min = i1;
         }
-        if (OPTIMIZED_CMP(v2, memo->max_bv, cmp_opt) > 0) {
+        if (OPTIMIZED_CMP(v2, memo->max_bv) > 0) {
             memo->max_bv = v2;
             memo->max = i2;
         }
@@ -2629,7 +2614,6 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
 static VALUE
 minmax_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct minmax_by_t *memo = MEMO_FOR(struct minmax_by_t, _memo);
     VALUE vi, vj, j;
     int n;
@@ -2638,7 +2622,7 @@ minmax_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 
     vi = enum_yield(argc, i);
 
-    if (memo->last_bv == Qundef) {
+    if (UNDEF_P(memo->last_bv)) {
         memo->last_bv = vi;
         memo->last = i;
         return Qnil;
@@ -2647,7 +2631,7 @@ minmax_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
     j = memo->last;
     memo->last_bv = Qundef;
 
-    n = OPTIMIZED_CMP(vj, vi, cmp_opt);
+    n = OPTIMIZED_CMP(vj, vi);
     if (n == 0) {
         i = j;
         vi = vj;
@@ -2705,7 +2689,7 @@ enum_minmax_by(VALUE obj)
     m->last_bv = Qundef;
     m->last = Qundef;
     rb_block_call(obj, id_each, 0, 0, minmax_by_i, memo);
-    if (m->last_bv != Qundef)
+    if (!UNDEF_P(m->last_bv))
         minmax_by_i_update(m->last_bv, m->last_bv, m->last, m->last, m);
     m = MEMO_FOR(struct minmax_by_t, memo);
     return rb_assoc_new(m->min, m->max);
@@ -3033,7 +3017,6 @@ each_cons_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 enum_each_cons_size(VALUE obj, VALUE args, VALUE eobj)
 {
-    struct cmp_opt_data cmp_opt = { 0, 0 };
     const VALUE zero = LONG2FIX(0);
     VALUE n, size;
     long cons_size = NUM2LONG(RARRAY_AREF(args, 0));
@@ -3043,7 +3026,7 @@ enum_each_cons_size(VALUE obj, VALUE args, VALUE eobj)
     if (NIL_P(size)) return Qnil;
 
     n = add_int(size, 1 - cons_size);
-    return (OPTIMIZED_CMP(n, zero, cmp_opt) == -1) ? zero : n;
+    return (OPTIMIZED_CMP(n, zero) == -1) ? zero : n;
 }
 
 /*
@@ -3185,7 +3168,7 @@ zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 
             v[1] = RARRAY_AREF(args, i);
             rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, (VALUE)0);
-            if (v[0] == Qundef) {
+            if (UNDEF_P(v[0])) {
                 RARRAY_ASET(args, i, Qnil);
                 v[0] = Qnil;
             }
@@ -3834,7 +3817,7 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
 /*
  *  call-seq:
  *    slice_before(pattern)       -> enumerator
- *    slice_before {|array| ... } -> enumerator
+ *    slice_before {|elt| ... } -> enumerator
  *
  *  With argument +pattern+, returns an enumerator that uses the pattern
  *  to partition elements into arrays ("slices").
@@ -4155,7 +4138,7 @@ slicewhen_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->prev_elt == Qundef) {
+    if (UNDEF_P(memo->prev_elt)) {
         /* The first element */
         memo->prev_elt = i;
         memo->prev_elts = rb_ary_new3(1, i);
@@ -4395,7 +4378,7 @@ sum_iter_bignum(VALUE i, struct enum_sum_memo *memo)
 static void
 sum_iter_rational(VALUE i, struct enum_sum_memo *memo)
 {
-    if (memo->r == Qundef) {
+    if (UNDEF_P(memo->r)) {
         memo->r = i;
     }
     else {
@@ -4476,7 +4459,7 @@ sum_iter(VALUE i, struct enum_sum_memo *memo)
     }
     else switch (TYPE(memo->v)) {
       default:      sum_iter_some_value(i, memo);    return;
-      case T_FLOAT: sum_iter_Kahan_Babuska(i, memo); return;
+      case T_FLOAT:
       case T_FIXNUM:
       case T_BIGNUM:
       case T_RATIONAL:
@@ -4616,7 +4599,7 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
     else {
         if (memo.n != 0)
             memo.v = rb_fix_plus(LONG2FIX(memo.n), memo.v);
-        if (memo.r != Qundef) {
+        if (!UNDEF_P(memo.r)) {
             memo.v = rb_rational_plus(memo.r, memo.v);
         }
         return memo.v;
diff --git a/enumerator.c b/enumerator.c
index 2c9858cda6..d587b63d32 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -20,6 +20,7 @@
 
 #include "id.h"
 #include "internal.h"
+#include "internal/class.h"
 #include "internal/enumerator.h"
 #include "internal/error.h"
 #include "internal/hash.h"
@@ -72,6 +73,8 @@
  *   puts %w[foo bar baz].map.with_index { |w, i| "#{i}:#{w}" }
  *   # => ["0:foo", "1:bar", "2:baz"]
  *
+ *  == External Iteration
+ *
  * An Enumerator can also be used as an external iterator.
  * For example, Enumerator#next returns the next value of the iterator
  * or raises StopIteration if the Enumerator is at the end.
@@ -82,15 +85,44 @@
  *   puts e.next   # => 3
  *   puts e.next   # raises StopIteration
  *
- * Note that enumeration sequence by +next+, +next_values+, +peek+ and
- * +peek_values+ do not affect other non-external
- * enumeration methods, unless the underlying iteration method itself has
- * side-effect, e.g. IO#each_line.
+ * +next+, +next_values+, +peek+ and +peek_values+ are the only methods
+ * which use external iteration (and Array#zip(Enumerable-not-Array) which uses +next+).
+ *
+ * These methods do not affect other internal enumeration methods,
+ * unless the underlying iteration method itself has side-effect, e.g. IO#each_line.
+ *
+ * External iteration differs *significantly* from internal iteration
+ * due to using a Fiber:
+ *  - The Fiber adds some overhead compared to internal enumeration.
+ *  - The stacktrace will only include the stack from the Enumerator, not above.
+ *  - Fiber-local variables are *not* inherited inside the Enumerator Fiber,
+ *    which instead starts with no Fiber-local variables.
+ *  - Fiber storage variables *are* inherited and are designed
+ *    to handle Enumerator Fibers. Assigning to a Fiber storage variable
+ *    only affects the current Fiber, so if you want to change state
+ *    in the caller Fiber of the Enumerator Fiber, you need to use an
+ *    extra indirection (e.g., use some object in the Fiber storage
+ *    variable and mutate some ivar of it).
+ *
+ * Concretely:
+ *   Thread.current[:fiber_local] = 1
+ *   Fiber[:storage_var] = 1
+ *   e = Enumerator.new do |y|
+ *     p Thread.current[:fiber_local] # for external iteration: nil, for internal iteration: 1
+ *     p Fiber[:storage_var] # => 1, inherited
+ *     Fiber[:storage_var] += 1
+ *     y << 42
+ *   end
+ *
+ *   p e.next # => 42
+ *   p Fiber[:storage_var] # => 1 (it ran in a different Fiber)
  *
- * Moreover, implementation typically uses fibers so performance could be
- * slower and exception stacktraces different than expected.
+ *   e.each { p _1 }
+ *   p Fiber[:storage_var] # => 2 (it ran in the same Fiber/"stack" as the current Fiber)
  *
- * You can use this to implement an internal iterator as follows:
+ *  == Convert External Iteration to Internal Iteration
+ *
+ * You can use an external iterator to implement an internal iterator as follows:
  *
  *   def ext_each(e)
  *     while true
@@ -132,7 +164,10 @@ static VALUE sym_each, sym_cycle, sym_yield;
 
 static VALUE lazy_use_super_method;
 
+extern ID ruby_static_id_cause;
+
 #define id_call idCall
+#define id_cause ruby_static_id_cause
 #define id_each idEach
 #define id_eqq idEqq
 #define id_initialize idInitialize
@@ -173,9 +208,11 @@ struct producer {
 
 typedef struct MEMO *lazyenum_proc_func(VALUE, struct MEMO *, VALUE, long);
 typedef VALUE lazyenum_size_func(VALUE, VALUE);
+typedef int lazyenum_precheck_func(VALUE proc_entry);
 typedef struct {
     lazyenum_proc_func *proc;
     lazyenum_size_func *size;
+    lazyenum_precheck_func *precheck;
 } lazyenum_funcs;
 
 struct proc_entry {
@@ -260,7 +297,7 @@ enumerator_ptr(VALUE obj)
     struct enumerator *ptr;
 
     TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, ptr);
-    if (!ptr || ptr->obj == Qundef) {
+    if (!ptr || UNDEF_P(ptr->obj)) {
         rb_raise(rb_eArgError, "uninitialized enumerator");
     }
     return ptr;
@@ -519,8 +556,8 @@ rb_enumeratorize(VALUE obj, VALUE meth, int argc, const VALUE *argv)
     return rb_enumeratorize_with_size(obj, meth, argc, argv, 0);
 }
 
-static VALUE
-lazy_to_enum_i(VALUE self, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat);
+static VALUE lazy_to_enum_i(VALUE self, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat);
+static int lazy_precheck(VALUE procs);
 
 VALUE
 rb_enumeratorize_with_size_kw(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat)
@@ -598,9 +635,10 @@ enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg)
 static VALUE
 enumerator_each(int argc, VALUE *argv, VALUE obj)
 {
+    struct enumerator *e = enumerator_ptr(obj);
+
     if (argc > 0) {
-        struct enumerator *e = enumerator_ptr(obj = rb_obj_dup(obj));
-        VALUE args = e->args;
+        VALUE args = (e = enumerator_ptr(obj = rb_obj_dup(obj)))->args;
         if (args) {
 #if SIZEOF_INT < SIZEOF_LONG
             /* check int range overflow */
@@ -617,6 +655,9 @@ enumerator_each(int argc, VALUE *argv, VALUE obj)
         e->size_fn = 0;
     }
     if (!rb_block_given_p()) return obj;
+
+    if (!lazy_precheck(e->procs)) return Qnil;
+
     return enumerator_block_call(obj, 0, obj);
 }
 
@@ -735,7 +776,7 @@ next_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, obj))
     VALUE feedvalue = Qnil;
     VALUE args = rb_ary_new4(argc, argv);
     rb_fiber_yield(1, &args);
-    if (e->feedvalue != Qundef) {
+    if (!UNDEF_P(e->feedvalue)) {
         feedvalue = e->feedvalue;
         e->feedvalue = Qundef;
     }
@@ -769,8 +810,16 @@ get_next_values(VALUE obj, struct enumerator *e)
 {
     VALUE curr, vs;
 
-    if (e->stop_exc)
-        rb_exc_raise(e->stop_exc);
+    if (e->stop_exc) {
+        VALUE exc = e->stop_exc;
+        VALUE result = rb_attr_get(exc, id_result);
+        VALUE mesg = rb_attr_get(exc, idMesg);
+        if (!NIL_P(mesg)) mesg = rb_str_dup(mesg);
+        VALUE stop_exc = rb_exc_new_str(rb_eStopIteration, mesg);
+        rb_ivar_set(stop_exc, id_cause, exc);
+        rb_ivar_set(stop_exc, id_result, result);
+        rb_exc_raise(stop_exc);
+    }
 
     curr = rb_fiber_current();
 
@@ -840,7 +889,7 @@ enumerator_next_values(VALUE obj)
     struct enumerator *e = enumerator_ptr(obj);
     VALUE vs;
 
-    if (e->lookahead != Qundef) {
+    if (!UNDEF_P(e->lookahead)) {
         vs = e->lookahead;
         e->lookahead = Qundef;
         return vs;
@@ -901,7 +950,7 @@ enumerator_peek_values(VALUE obj)
 {
     struct enumerator *e = enumerator_ptr(obj);
 
-    if (e->lookahead == Qundef) {
+    if (UNDEF_P(e->lookahead)) {
         e->lookahead = get_next_values(obj, e);
     }
     return e->lookahead;
@@ -1025,7 +1074,7 @@ enumerator_feed(VALUE obj, VALUE v)
 {
     struct enumerator *e = enumerator_ptr(obj);
 
-    if (e->feedvalue != Qundef) {
+    if (!UNDEF_P(e->feedvalue)) {
         rb_raise(rb_eTypeError, "feed value already set");
     }
     e->feedvalue = v;
@@ -1070,7 +1119,7 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
 
     cname = rb_obj_class(obj);
 
-    if (!e || e->obj == Qundef) {
+    if (!e || UNDEF_P(e->obj)) {
         return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(cname));
     }
 
@@ -1239,7 +1288,7 @@ enumerator_size(VALUE obj)
         argv = RARRAY_CONST_PTR(e->args);
     }
     size = rb_check_funcall_kw(e->size, id_call, argc, argv, e->kw_splat);
-    if (size != Qundef) return size;
+    if (!UNDEF_P(size)) return size;
     return e->size;
 }
 
@@ -1285,7 +1334,7 @@ yielder_ptr(VALUE obj)
     struct yielder *ptr;
 
     TypedData_Get_Struct(obj, struct yielder, &yielder_data_type, ptr);
-    if (!ptr || ptr->proc == Qundef) {
+    if (!ptr || UNDEF_P(ptr->proc)) {
         rb_raise(rb_eArgError, "uninitialized yielder");
     }
     return ptr;
@@ -1425,7 +1474,7 @@ generator_ptr(VALUE obj)
     struct generator *ptr;
 
     TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr);
-    if (!ptr || ptr->proc == Qundef) {
+    if (!ptr || UNDEF_P(ptr->proc)) {
         rb_raise(rb_eArgError, "uninitialized generator");
     }
     return ptr;
@@ -1529,7 +1578,7 @@ static VALUE
 enum_size(VALUE self)
 {
     VALUE r = rb_check_funcall(self, id_size, 0, 0);
-    return (r == Qundef) ? Qnil : r;
+    return UNDEF_P(r) ? Qnil : r;
 }
 
 static VALUE
@@ -1562,7 +1611,7 @@ lazy_init_iterator(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
         result = rb_yield_values2(len, nargv);
         ALLOCV_END(args);
     }
-    if (result == Qundef) rb_iter_break();
+    if (UNDEF_P(result)) rb_iter_break();
     return Qnil;
 }
 
@@ -1676,6 +1725,22 @@ lazy_generator_init(VALUE enumerator, VALUE procs)
     return generator;
 }
 
+static int
+lazy_precheck(VALUE procs)
+{
+    if (RTEST(procs)) {
+        long num_procs = RARRAY_LEN(procs), i = num_procs;
+        while (i-- > 0) {
+            VALUE proc = RARRAY_AREF(procs, i);
+            struct proc_entry *entry = proc_entry_ptr(proc);
+            lazyenum_precheck_func *precheck = entry->fn->precheck;
+            if (precheck && !precheck(proc)) return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
 /*
  * Document-class: Enumerator::Lazy
  *
@@ -2425,13 +2490,8 @@ lazy_take_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_ind
     }
 
     remain = NUM2LONG(memo);
-    if (remain == 0) {
-        LAZY_MEMO_SET_BREAK(result);
-    }
-    else {
-        if (--remain == 0) LAZY_MEMO_SET_BREAK(result);
-        rb_ary_store(memos, memo_index, LONG2NUM(remain));
-    }
+    if (--remain == 0) LAZY_MEMO_SET_BREAK(result);
+    rb_ary_store(memos, memo_index, LONG2NUM(remain));
     return result;
 }
 
@@ -2444,8 +2504,15 @@ lazy_take_size(VALUE entry, VALUE receiver)
     return LONG2NUM(len);
 }
 
+static int
+lazy_take_precheck(VALUE proc_entry)
+{
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    return entry->memo != INT2FIX(0);
+}
+
 static const lazyenum_funcs lazy_take_funcs = {
-    lazy_take_proc, lazy_take_size,
+    lazy_take_proc, lazy_take_size, lazy_take_precheck,
 };
 
 /*
@@ -2459,20 +2526,14 @@ static VALUE
 lazy_take(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
-    int argc = 0;
-    VALUE argv[2];
 
     if (len < 0) {
         rb_raise(rb_eArgError, "attempt to take negative size");
     }
 
-    if (len == 0) {
-       argv[0] = sym_cycle;
-       argv[1] = INT2NUM(0);
-       argc = 2;
-    }
+    n = LONG2NUM(len);          /* no more conversion */
 
-    return lazy_add_method(obj, argc, argv, n, rb_ary_new3(1, n), &lazy_take_funcs);
+    return lazy_add_method(obj, 0, 0, n, rb_ary_new3(1, n), &lazy_take_funcs);
 }
 
 static struct MEMO *
@@ -2923,7 +2984,7 @@ producer_ptr(VALUE obj)
     struct producer *ptr;
 
     TypedData_Get_Struct(obj, struct producer, &producer_data_type, ptr);
-    if (!ptr || ptr->proc == Qundef) {
+    if (!ptr || UNDEF_P(ptr->proc)) {
         rb_raise(rb_eArgError, "uninitialized producer");
     }
     return ptr;
@@ -2978,7 +3039,7 @@ producer_each_i(VALUE obj)
     init = ptr->init;
     proc = ptr->proc;
 
-    if (init == Qundef) {
+    if (UNDEF_P(init)) {
         curr = Qnil;
     }
     else {
@@ -3109,7 +3170,7 @@ enum_chain_ptr(VALUE obj)
     struct enum_chain *ptr;
 
     TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
-    if (!ptr || ptr->enums == Qundef) {
+    if (!ptr || UNDEF_P(ptr->enums)) {
         rb_raise(rb_eArgError, "uninitialized chain");
     }
     return ptr;
@@ -3302,7 +3363,7 @@ inspect_enum_chain(VALUE obj, VALUE dummy, int recur)
 
     TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
 
-    if (!ptr || ptr->enums == Qundef) {
+    if (!ptr || UNDEF_P(ptr->enums)) {
         return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(klass));
     }
 
@@ -3384,7 +3445,7 @@ enumerator_plus(VALUE obj, VALUE eobj)
  *
  * The method used against each enumerable object is `each_entry`
  * instead of `each` so that the product of N enumerable objects
- * yields exactly N arguments in each iteration.
+ * yields an array of exactly N elements in each iteration.
  *
  * When no enumerator is given, it calls a given block once yielding
  * an empty argument list.
@@ -3431,7 +3492,7 @@ enum_product_ptr(VALUE obj)
     struct enum_product *ptr;
 
     TypedData_Get_Struct(obj, struct enum_product, &enum_product_data_type, ptr);
-    if (!ptr || ptr->enums == Qundef) {
+    if (!ptr || UNDEF_P(ptr->enums)) {
         rb_raise(rb_eArgError, "uninitialized product");
     }
     return ptr;
@@ -3462,9 +3523,16 @@ enum_product_allocate(VALUE klass)
  *   e.size #=> 6
  */
 static VALUE
-enum_product_initialize(VALUE obj, VALUE enums)
+enum_product_initialize(int argc, VALUE *argv, VALUE obj)
 {
     struct enum_product *ptr;
+    VALUE enums = Qnil, options = Qnil;
+
+    rb_scan_args(argc, argv, "*:", &enums, &options);
+
+    if (!NIL_P(options) && !RHASH_EMPTY_P(options)) {
+        rb_exc_raise(rb_keyword_error_new("unknown", rb_hash_keys(options)));
+    }
 
     rb_check_frozen(obj);
     TypedData_Get_Struct(obj, struct enum_product, &enum_product_data_type, ptr);
@@ -3570,7 +3638,7 @@ product_each(VALUE obj, struct product_state *pstate)
         rb_block_call(eobj, id_each_entry, 0, NULL, product_each_i, (VALUE)pstate);
     }
     else {
-        rb_funcallv(pstate->block, id_call, pstate->argc, pstate->argv);
+        rb_funcall(pstate->block, id_call, 1, rb_ary_new_from_values(pstate->argc, pstate->argv));
     }
 
     return obj;
@@ -3642,7 +3710,7 @@ inspect_enum_product(VALUE obj, VALUE dummy, int recur)
 
     TypedData_Get_Struct(obj, struct enum_product, &enum_product_data_type, ptr);
 
-    if (!ptr || ptr->enums == Qundef) {
+    if (!ptr || UNDEF_P(ptr->enums)) {
         return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(klass));
     }
 
@@ -3668,6 +3736,7 @@ enum_product_inspect(VALUE obj)
 /*
  * call-seq:
  *   Enumerator.product(*enums) -> enumerator
+ *   Enumerator.product(*enums) { |elts| ... } -> enumerator
  *
  * Generates a new enumerator object that generates a Cartesian
  * product of given enumerable objects.  This is equivalent to
@@ -3676,18 +3745,29 @@ enum_product_inspect(VALUE obj)
  *   e = Enumerator.product(1..3, [4, 5])
  *   e.to_a #=> [[1, 4], [1, 5], [2, 4], [2, 5], [3, 4], [3, 5]]
  *   e.size #=> 6
+ *
+ * When a block is given, calls the block with each N-element array
+ * generated and returns +nil+.
  */
 static VALUE
-enumerator_s_product(VALUE klass, VALUE enums)
+enumerator_s_product(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = enum_product_initialize(enum_product_allocate(rb_cEnumProduct), enums);
+    VALUE enums = Qnil, options = Qnil, block = Qnil;
 
-    if (rb_block_given_p()) {
-        return enum_product_run(obj, rb_block_proc());
+    rb_scan_args(argc, argv, "*:&", &enums, &options, &block);
+
+    if (!NIL_P(options) && !RHASH_EMPTY_P(options)) {
+        rb_exc_raise(rb_keyword_error_new("unknown", rb_hash_keys(options)));
     }
-    else {
-        return obj;
+
+    VALUE obj = enum_product_initialize(argc, argv, enum_product_allocate(rb_cEnumProduct));
+
+    if (!NIL_P(block)) {
+        enum_product_run(obj, block);
+        return Qnil;
     }
+
+    return obj;
 }
 
 /*
@@ -4567,7 +4647,7 @@ InitVM_Enumerator(void)
     /* Product */
     rb_cEnumProduct = rb_define_class_under(rb_cEnumerator, "Product", rb_cEnumerator);
     rb_define_alloc_func(rb_cEnumProduct, enum_product_allocate);
-    rb_define_method(rb_cEnumProduct, "initialize", enum_product_initialize, -2);
+    rb_define_method(rb_cEnumProduct, "initialize", enum_product_initialize, -1);
     rb_define_method(rb_cEnumProduct, "initialize_copy", enum_product_init_copy, 1);
     rb_define_method(rb_cEnumProduct, "each", enum_product_each, 0);
     rb_define_method(rb_cEnumProduct, "size", enum_product_size, 0);
@@ -4578,7 +4658,7 @@ InitVM_Enumerator(void)
     rb_undef_method(rb_cEnumProduct, "next_values");
     rb_undef_method(rb_cEnumProduct, "peek");
     rb_undef_method(rb_cEnumProduct, "peek_values");
-    rb_define_singleton_method(rb_cEnumerator, "product", enumerator_s_product, -2);
+    rb_define_singleton_method(rb_cEnumerator, "product", enumerator_s_product, -1);
 
     /* ArithmeticSequence */
     rb_cArithSeq = rb_define_class_under(rb_cEnumerator, "ArithmeticSequence", rb_cEnumerator);
diff --git a/error.c b/error.c
index f448902309..726f57a4c0 100644
--- a/error.c
+++ b/error.c
@@ -125,6 +125,8 @@ err_vcatf(VALUE str, const char *pre, const char *file, int line,
     return str;
 }
 
+static VALUE syntax_error_with_path(VALUE, VALUE, VALUE*, rb_encoding*);
+
 VALUE
 rb_syntax_error_append(VALUE exc, VALUE file, int line, int column,
                        rb_encoding *enc, const char *fmt, va_list args)
@@ -138,15 +140,7 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column,
     }
     else {
         VALUE mesg;
-        if (NIL_P(exc)) {
-            mesg = rb_enc_str_new(0, 0, enc);
-            exc = rb_class_new_instance(1, &mesg, rb_eSyntaxError);
-        }
-        else {
-            mesg = rb_attr_get(exc, idMesg);
-            if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n')
-                rb_str_cat_cstr(mesg, "\n");
-        }
+        exc = syntax_error_with_path(exc, file, &mesg, enc);
         err_vcatf(mesg, NULL, fn, line, fmt, args);
     }
 
@@ -426,7 +420,7 @@ rb_warn(const char *fmt, ...)
 void
 rb_category_warn(rb_warning_category_t category, const char *fmt, ...)
 {
-    if (!NIL_P(ruby_verbose)) {
+    if (!NIL_P(ruby_verbose) && rb_warning_category_enabled_p(category)) {
         with_warning_string(mesg, 0, fmt) {
             rb_warn_category(mesg, rb_warning_category_to_name(category));
         }
@@ -458,7 +452,7 @@ rb_warning(const char *fmt, ...)
 void
 rb_category_warning(rb_warning_category_t category, const char *fmt, ...)
 {
-    if (RTEST(ruby_verbose)) {
+    if (RTEST(ruby_verbose) && rb_warning_category_enabled_p(category)) {
         with_warning_string(mesg, 0, fmt) {
             rb_warn_category(mesg, rb_warning_category_to_name(category));
         }
@@ -511,12 +505,9 @@ rb_warn_deprecated(const char *fmt, const char *suggest, ...)
 {
     if (!deprecation_warning_enabled()) return;
 
-    va_list args;
-    va_start(args, suggest);
-    VALUE mesg = warning_string(0, fmt, args);
-    va_end(args);
-
-    warn_deprecated(mesg, NULL, suggest);
+    with_warning_string_from(mesg, 0, fmt, suggest) {
+        warn_deprecated(mesg, NULL, suggest);
+    }
 }
 
 void
@@ -524,12 +515,9 @@ rb_warn_deprecated_to_remove(const char *removal, const char *fmt, const char *s
 {
     if (!deprecation_warning_enabled()) return;
 
-    va_list args;
-    va_start(args, suggest);
-    VALUE mesg = warning_string(0, fmt, args);
-    va_end(args);
-
-    warn_deprecated(mesg, removal, suggest);
+    with_warning_string_from(mesg, 0, fmt, suggest) {
+        warn_deprecated(mesg, removal, suggest);
+    }
 }
 
 static inline int
@@ -672,6 +660,11 @@ bug_important_message(FILE *out, const char *const msg, size_t len)
     fwrite(p, 1, endmsg - p, out);
 }
 
+#undef CRASH_REPORTER_MAY_BE_CREATED
+#if defined(__APPLE__) && \
+    (!defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 || defined(__POWERPC__)) /* 10.6 PPC case */
+# define CRASH_REPORTER_MAY_BE_CREATED
+#endif
 static void
 preface_dump(FILE *out)
 {
@@ -680,7 +673,7 @@ preface_dump(FILE *out)
         "-- Crash Report log information "
         "--------------------------------------------\n"
         "   See Crash Report log file in one of the following locations:\n"
-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+# ifdef CRASH_REPORTER_MAY_BE_CREATED
         "     * ~/Library/Logs/CrashReporter\n"
         "     * /Library/Logs/CrashReporter\n"
 # endif
@@ -705,7 +698,7 @@ postscript_dump(FILE *out)
         "[IMPORTANT]"
         /*" ------------------------------------------------"*/
         "\n""Don't forget to include the Crash Report log file under\n"
-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+# ifdef CRASH_REPORTER_MAY_BE_CREATED
         "CrashReporter or "
 # endif
         "DiagnosticReports directory in bug reports.\n"
@@ -1006,7 +999,7 @@ rb_check_type(VALUE x, int t)
 {
     int xt;
 
-    if (RB_UNLIKELY(x == Qundef)) {
+    if (RB_UNLIKELY(UNDEF_P(x))) {
         rb_bug(UNDEF_LEAKED);
     }
 
@@ -1027,7 +1020,7 @@ rb_check_type(VALUE x, int t)
 void
 rb_unexpected_type(VALUE x, int t)
 {
-    if (RB_UNLIKELY(x == Qundef)) {
+    if (RB_UNLIKELY(UNDEF_P(x))) {
         rb_bug(UNDEF_LEAKED);
     }
 
@@ -1229,7 +1222,7 @@ VALUE
 rb_get_message(VALUE exc)
 {
     VALUE e = rb_check_funcall(exc, id_message, 0, 0);
-    if (e == Qundef) return Qnil;
+    if (UNDEF_P(e)) return Qnil;
     if (!RB_TYPE_P(e, T_STRING)) e = rb_check_string_type(e);
     return e;
 }
@@ -1244,7 +1237,7 @@ rb_get_detailed_message(VALUE exc, VALUE opt)
     else {
         e = rb_check_funcall_kw(exc, id_detailed_message, 1, &opt, 1);
     }
-    if (e == Qundef) return Qnil;
+    if (UNDEF_P(e)) return Qnil;
     if (!RB_TYPE_P(e, T_STRING)) e = rb_check_string_type(e);
     return e;
 }
@@ -1636,15 +1629,15 @@ exc_equal(VALUE exc, VALUE obj)
         int state;
 
         obj = rb_protect(try_convert_to_exception, obj, &state);
-        if (state || obj == Qundef) {
+        if (state || UNDEF_P(obj)) {
             rb_set_errinfo(Qnil);
             return Qfalse;
         }
         if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse;
         mesg = rb_check_funcall(obj, id_message, 0, 0);
-        if (mesg == Qundef) return Qfalse;
+        if (UNDEF_P(mesg)) return Qfalse;
         backtrace = rb_check_funcall(obj, id_backtrace, 0, 0);
-        if (backtrace == Qundef) return Qfalse;
+        if (UNDEF_P(backtrace)) return Qfalse;
     }
     else {
         mesg = rb_attr_get(obj, id_mesg);
@@ -1747,7 +1740,7 @@ exit_success_p(VALUE exc)
 static VALUE
 err_init_recv(VALUE exc, VALUE recv)
 {
-    if (recv != Qundef) rb_ivar_set(exc, id_recv, recv);
+    if (!UNDEF_P(recv)) rb_ivar_set(exc, id_recv, recv);
     return exc;
 }
 
@@ -1825,7 +1818,9 @@ name_err_init_attr(VALUE exc, VALUE recv, VALUE method)
     cfp = rb_vm_get_ruby_level_next_cfp(ec, cfp);
     rb_ivar_set(exc, id_name, method);
     err_init_recv(exc, recv);
-    if (cfp) rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq));
+    if (cfp && VM_FRAME_TYPE(cfp) != VM_FRAME_MAGIC_DUMMY) {
+        rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq));
+    }
     return exc;
 }
 
@@ -2091,7 +2086,7 @@ name_err_mesg_to_str(VALUE obj)
             break;
           default:
             d = rb_protect(name_err_mesg_receiver_name, obj, &state);
-            if (state || d == Qundef || NIL_P(d))
+            if (state || NIL_OR_UNDEF_P(d))
                 d = rb_protect(rb_inspect, obj, &state);
             if (state) {
                 rb_set_errinfo(Qnil);
@@ -2146,7 +2141,7 @@ name_err_receiver(VALUE self)
     VALUE *ptr, recv, mesg;
 
     recv = rb_ivar_lookup(self, id_recv, Qundef);
-    if (recv != Qundef) return recv;
+    if (!UNDEF_P(recv)) return recv;
 
     mesg = rb_attr_get(self, id_mesg);
     if (!rb_typeddata_is_kind_of(mesg, &name_err_mesg_data_type)) {
@@ -2204,7 +2199,7 @@ key_err_receiver(VALUE self)
     VALUE recv;
 
     recv = rb_ivar_lookup(self, id_receiver, Qundef);
-    if (recv != Qundef) return recv;
+    if (!UNDEF_P(recv)) return recv;
     rb_raise(rb_eArgError, "no receiver is available");
 }
 
@@ -2221,7 +2216,7 @@ key_err_key(VALUE self)
     VALUE key;
 
     key = rb_ivar_lookup(self, id_key, Qundef);
-    if (key != Qundef) return key;
+    if (!UNDEF_P(key)) return key;
     rb_raise(rb_eArgError, "no key is available");
 }
 
@@ -2259,7 +2254,7 @@ key_err_initialize(int argc, VALUE *argv, VALUE self)
         keywords[1] = id_key;
         rb_get_kwargs(options, keywords, 0, numberof(values), values);
         for (i = 0; i < numberof(values); ++i) {
-            if (values[i] != Qundef) {
+            if (!UNDEF_P(values[i])) {
                 rb_ivar_set(self, keywords[i], values[i]);
             }
         }
@@ -2281,7 +2276,7 @@ no_matching_pattern_key_err_matchee(VALUE self)
     VALUE matchee;
 
     matchee = rb_ivar_lookup(self, id_matchee, Qundef);
-    if (matchee != Qundef) return matchee;
+    if (!UNDEF_P(matchee)) return matchee;
     rb_raise(rb_eArgError, "no matchee is available");
 }
 
@@ -2298,7 +2293,7 @@ no_matching_pattern_key_err_key(VALUE self)
     VALUE key;
 
     key = rb_ivar_lookup(self, id_key, Qundef);
-    if (key != Qundef) return key;
+    if (!UNDEF_P(key)) return key;
     rb_raise(rb_eArgError, "no key is available");
 }
 
@@ -2325,7 +2320,7 @@ no_matching_pattern_key_err_initialize(int argc, VALUE *argv, VALUE self)
         keywords[1] = id_key;
         rb_get_kwargs(options, keywords, 0, numberof(values), values);
         for (i = 0; i < numberof(values); ++i) {
-            if (values[i] != Qundef) {
+            if (!UNDEF_P(values[i])) {
                 rb_ivar_set(self, keywords[i], values[i]);
             }
         }
@@ -2354,6 +2349,25 @@ syntax_error_initialize(int argc, VALUE *argv, VALUE self)
     return rb_call_super(argc, argv);
 }
 
+static VALUE
+syntax_error_with_path(VALUE exc, VALUE path, VALUE *mesg, rb_encoding *enc)
+{
+    if (NIL_P(exc)) {
+        *mesg = rb_enc_str_new(0, 0, enc);
+        exc = rb_class_new_instance(1, mesg, rb_eSyntaxError);
+        rb_ivar_set(exc, id_i_path, path);
+    }
+    else {
+        if (rb_attr_get(exc, id_i_path) != path) {
+            rb_raise(rb_eArgError, "SyntaxError#path changed");
+        }
+        VALUE s = *mesg = rb_attr_get(exc, idMesg);
+        if (RSTRING_LEN(s) > 0 && *(RSTRING_END(s)-1) != '\n')
+            rb_str_cat_cstr(s, "\n");
+    }
+    return exc;
+}
+
 /*
  *  Document-module: Errno
  *
@@ -2947,6 +2961,8 @@ ivar_copy_i(st_data_t key, st_data_t val, st_data_t exc)
     return ST_CONTINUE;
 }
 
+void rb_exc_check_circular_cause(VALUE exc);
+
 static VALUE
 exception_loader(VALUE exc, VALUE obj)
 {
@@ -2961,6 +2977,8 @@ exception_loader(VALUE exc, VALUE obj)
 
     rb_ivar_foreach(obj, ivar_copy_i, exc);
 
+    rb_exc_check_circular_cause(exc);
+
     if (rb_attr_get(exc, id_bt) == rb_attr_get(exc, id_bt_locations)) {
         rb_ivar_set(exc, id_bt_locations, Qnil);
     }
@@ -3012,9 +3030,16 @@ Init_Exception(void)
     rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
     rb_define_method(rb_eSyntaxError, "initialize", syntax_error_initialize, -1);
 
+    /* RDoc will use literal name value while parsing rb_attr,
+    *  and will render `idPath` as an attribute name without this trick */
+    ID path = idPath;
+
+    /* the path failed to parse */
+    rb_attr(rb_eSyntaxError, path, TRUE, FALSE, FALSE);
+
     rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
     /* the path failed to load */
-    rb_attr(rb_eLoadError, rb_intern_const("path"), TRUE, FALSE, FALSE);
+    rb_attr(rb_eLoadError, path, TRUE, FALSE, FALSE);
 
     rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
 
diff --git a/eval.c b/eval.c
index 9567f80150..a61dfb1289 100644
--- a/eval.c
+++ b/eval.c
@@ -21,6 +21,7 @@
 #include "gc.h"
 #include "internal.h"
 #include "internal/class.h"
+#include "internal/cont.h"
 #include "internal/error.h"
 #include "internal/eval.h"
 #include "internal/hash.h"
@@ -42,7 +43,7 @@ NORETURN(static void rb_raise_jump(VALUE, VALUE));
 void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
 void rb_ec_clear_all_trace_func(const rb_execution_context_t *ec);
 
-static int rb_ec_cleanup(rb_execution_context_t *ec, int ex);
+static int rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex);
 static int rb_ec_exec_node(rb_execution_context_t *ec, void *n);
 
 VALUE rb_eLocalJumpError;
@@ -99,8 +100,10 @@ ruby_init(void)
 {
     int state = ruby_setup();
     if (state) {
-        if (RTEST(ruby_debug))
-            error_print(GET_EC());
+        if (RTEST(ruby_debug)) {
+            rb_execution_context_t *ec = GET_EC();
+            rb_ec_error_print(ec, ec->errinfo);
+        }
         exit(EXIT_FAILURE);
     }
 }
@@ -119,8 +122,9 @@ ruby_options(int argc, char **argv)
     }
     else {
         rb_ec_clear_current_thread_trace_func(ec);
-        state = error_handle(ec, state);
-        iseq = (void *)INT2FIX(state);
+        int exitcode = error_handle(ec, ec->errinfo, state);
+        ec->errinfo = Qnil; /* just been handled */
+        iseq = (void *)INT2FIX(exitcode);
     }
     EC_POP_TAG();
     return iseq;
@@ -136,7 +140,7 @@ rb_ec_fiber_scheduler_finalize(rb_execution_context_t *ec)
         rb_fiber_scheduler_set(Qnil);
     }
     else {
-        state = error_handle(ec, state);
+        state = error_handle(ec, ec->errinfo, state);
     }
     EC_POP_TAG();
 }
@@ -175,20 +179,21 @@ ruby_finalize(void)
 int
 ruby_cleanup(int ex)
 {
-    return rb_ec_cleanup(GET_EC(), ex);
+    return rb_ec_cleanup(GET_EC(), (enum ruby_tag_type)ex);
 }
 
 static int
-rb_ec_cleanup(rb_execution_context_t *ec, int ex0)
+rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
 {
     int state;
-    volatile VALUE errs[2] = { Qundef, Qundef };
-    int nerr;
+    volatile VALUE save_error = Qundef;
+    volatile int sysex = EXIT_SUCCESS;
+    volatile int signaled = 0;
     rb_thread_t *th = rb_ec_thread_ptr(ec);
     rb_thread_t *const volatile th0 = th;
-    volatile int sysex = EXIT_SUCCESS;
     volatile int step = 0;
-    volatile int ex = ex0;
+    volatile VALUE message = Qnil;
+    VALUE buf;
 
     rb_threadptr_interrupt(th);
     rb_threadptr_check_signal(th);
@@ -198,60 +203,61 @@ rb_ec_cleanup(rb_execution_context_t *ec, int ex0)
         SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(ec); });
 
       step_0: step++;
-        errs[1] = ec->errinfo;
+        save_error = ec->errinfo;
         if (THROW_DATA_P(ec->errinfo)) ec->errinfo = Qnil;
-        ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]);
+        ruby_init_stack(&message);
 
+        /* exits with failure but silently when an exception raised
+         * here */
         SAVE_ROOT_JMPBUF(th, rb_ec_teardown(ec));
 
       step_1: step++;
+        VALUE err = ec->errinfo;
+        volatile int mode0 = 0, mode1 = 0;
+        if (err != save_error && !NIL_P(err)) {
+            mode0 = exiting_split(err, &sysex, &signaled);
+        }
+
+        /* exceptions after here will be ignored */
+
+        /* build error message including causes */
+        err = ATOMIC_VALUE_EXCHANGE(save_error, Qnil);
+
+        if (!NIL_P(err) && !THROW_DATA_P(err)) {
+            mode1 = exiting_split(err, (mode0 & EXITING_WITH_STATUS) ? NULL : &sysex, &signaled);
+            if (mode1 & EXITING_WITH_MESSAGE) {
+                buf = rb_str_new(NULL, 0);
+                SAVE_ROOT_JMPBUF(th, rb_ec_error_print_detailed(ec, err, buf, Qundef));
+                message = buf;
+            }
+        }
+
+      step_2: step++;
         /* protect from Thread#raise */
         th->status = THREAD_KILLED;
 
-        errs[0] = ec->errinfo;
         SAVE_ROOT_JMPBUF(th, rb_ractor_terminate_all());
+
+      step_3: step++;
+        if (!NIL_P(buf = message)) {
+            warn_print_str(buf);
+        }
+        else if (!NIL_OR_UNDEF_P(err = save_error) ||
+                 (ex != TAG_NONE && !((mode0|mode1) & EXITING_WITH_STATUS))) {
+            sysex = error_handle(ec, err, ex);
+        }
     }
     else {
         th = th0;
         switch (step) {
           case 0: goto step_0;
           case 1: goto step_1;
-        }
-        if (ex == 0) ex = state;
-    }
-    ec->errinfo = errs[1];
-    sysex = error_handle(ec, ex);
-
-    state = 0;
-    for (nerr = 0; nerr < numberof(errs); ++nerr) {
-        VALUE err = ATOMIC_VALUE_EXCHANGE(errs[nerr], Qnil);
-        VALUE sig;
-
-        if (!RTEST(err)) continue;
-
-        /* ec->errinfo contains a NODE while break'ing */
-        if (THROW_DATA_P(err)) continue;
-
-        if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
-            sysex = sysexit_status(err);
-            break;
-        }
-        else if (rb_obj_is_kind_of(err, rb_eSignal)) {
-            VALUE sig = rb_ivar_get(err, id_signo);
-            state = NUM2INT(sig);
-            break;
-        }
-        else if (rb_obj_is_kind_of(err, rb_eSystemCallError) &&
-                 FIXNUM_P(sig = rb_attr_get(err, id_signo))) {
-            state = NUM2INT(sig);
-            break;
-        }
-        else if (sysex == EXIT_SUCCESS) {
-            sysex = EXIT_FAILURE;
+          case 2: goto step_2;
+          case 3: goto step_3;
         }
     }
 
-    mjit_finish(true); // We still need ISeqs here.
+    mjit_finish(true); // We still need ISeqs here, so it's before rb_ec_finalize().
 
     rb_ec_finalize(ec);
 
@@ -262,7 +268,10 @@ rb_ec_cleanup(rb_execution_context_t *ec, int ex0)
     th = th0;
     rb_thread_stop_timer_thread();
     ruby_vm_destruct(th->vm);
-    if (state) ruby_default_signal(state);
+    // For YJIT, call this after ruby_vm_destruct() frees jit_cont for the root fiber.
+    rb_jit_cont_finish();
+
+    if (signaled) ruby_default_signal(signaled);
 
     return sysex;
 }
@@ -314,7 +323,7 @@ ruby_run_node(void *n)
     rb_execution_context_t *ec = GET_EC();
     int status;
     if (!ruby_executable_node(n, &status)) {
-        rb_ec_cleanup(ec, 0);
+        rb_ec_cleanup(ec, (NIL_P(ec->errinfo) ? TAG_NONE : TAG_RAISE));
         return status;
     }
     ruby_init_stack((void *)&status);
@@ -511,7 +520,7 @@ exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
         nocause = 0;
         nocircular = 1;
     }
-    if (*cause == Qundef) {
+    if (UNDEF_P(*cause)) {
         if (nocause) {
             *cause = Qnil;
             nocircular = 1;
@@ -527,13 +536,17 @@ exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
         rb_raise(rb_eTypeError, "exception object expected");
     }
 
-    if (!nocircular && !NIL_P(*cause) && *cause != Qundef && *cause != mesg) {
+    if (!nocircular && !NIL_P(*cause) && !UNDEF_P(*cause) && *cause != mesg) {
+#if 0 /* maybe critical for some cases */
+        rb_exc_check_circular_cause(*cause);
+#else
         VALUE c = *cause;
         while (!NIL_P(c = rb_attr_get(c, id_cause))) {
             if (c == mesg) {
                 rb_raise(rb_eArgError, "circular causes");
             }
         }
+#endif
     }
     return mesg;
 }
@@ -546,18 +559,18 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
     const char *file = rb_source_location_cstr(&line);
     const char *const volatile file0 = file;
 
-    if ((file && !NIL_P(mesg)) || (cause != Qundef))  {
+    if ((file && !NIL_P(mesg)) || !UNDEF_P(cause))  {
         volatile int state = 0;
 
         EC_PUSH_TAG(ec);
         if (EC_EXEC_TAG() == TAG_NONE && !(state = rb_ec_set_raised(ec))) {
             VALUE bt = rb_get_backtrace(mesg);
-            if (!NIL_P(bt) || cause == Qundef) {
+            if (!NIL_P(bt) || UNDEF_P(cause)) {
                 if (OBJ_FROZEN(mesg)) {
                     mesg = rb_obj_dup(mesg);
                 }
             }
-            if (cause != Qundef && !THROW_DATA_P(cause)) {
+            if (!UNDEF_P(cause) && !THROW_DATA_P(cause)) {
                 exc_setup_cause(mesg, cause);
             }
             if (NIL_P(bt)) {
@@ -630,10 +643,14 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
 void
 rb_ec_setup_exception(const rb_execution_context_t *ec, VALUE mesg, VALUE cause)
 {
-    if (cause == Qundef) {
+    if (UNDEF_P(cause)) {
         cause = get_ec_errinfo(ec);
     }
     if (cause != mesg) {
+        if (THROW_DATA_P(cause)) {
+            cause = Qnil;
+        }
+
         rb_ivar_set(mesg, id_cause, cause);
     }
 }
@@ -725,7 +742,7 @@ rb_f_raise(int argc, VALUE *argv)
 
     argc = extract_raise_opts(argc, argv, opts);
     if (argc == 0) {
-        if (*cause != Qundef) {
+        if (!UNDEF_P(*cause)) {
             rb_raise(rb_eArgError, "only cause is given with no arguments");
         }
         err = get_errinfo();
@@ -801,7 +818,7 @@ make_exception(int argc, const VALUE *argv, int isstr)
     if (NIL_P(mesg)) {
         mesg = rb_check_funcall(argv[0], idException, argc != 1, &argv[1]);
     }
-    if (mesg == Qundef) {
+    if (UNDEF_P(mesg)) {
         rb_raise(rb_eTypeError, "exception class/object expected");
     }
     if (!rb_obj_is_kind_of(mesg, rb_eException)) {
@@ -1760,6 +1777,16 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
     return obj;
 }
 
+VALUE
+rb_top_main_class(const char *method)
+{
+    VALUE klass = GET_THREAD()->top_wrapper;
+
+    if (!klass) return rb_cObject;
+    rb_warning("main.%s in the wrapped load is effective only in wrapper module", method);
+    return klass;
+}
+
 /*
  *  call-seq:
  *     include(module, ...)   -> self
@@ -1772,13 +1799,7 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
 static VALUE
 top_include(int argc, VALUE *argv, VALUE self)
 {
-    rb_thread_t *th = GET_THREAD();
-
-    if (th->top_wrapper) {
-        rb_warning("main.include in the wrapped load is effective only in wrapper module");
-        return rb_mod_include(argc, argv, th->top_wrapper);
-    }
-    return rb_mod_include(argc, argv, rb_cObject);
+    return rb_mod_include(argc, argv, rb_top_main_class("include"));
 }
 
 /*
diff --git a/eval_error.c b/eval_error.c
index 6582b805aa..9806683000 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -73,12 +73,6 @@ set_backtrace(VALUE info, VALUE bt)
author	nagachika <nagachika@ruby-lang.org>	2024-07-26 20:54:27 +0900
committer	nagachika <nagachika@ruby-lang.org>	2024-07-26 20:54:27 +0900
commit	31d0f1a2e7dbfb60731d1f05b868e1d578cda493 (patch)
tree	f4de78873a25f08254a5e0ab9c67d74e6c9941b6 /spec/ruby/library/socket/basicsocket/getpeername_spec.rb
parent	367ad5055c3d5210c884d4611e08ffa32ec608ee (diff)