0 files changed, 0 insertions, 0 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index c8bf89e0d6..05ff204541 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,23 +11,24 @@ clone_depth: 10
 platform:
   - x64
 skip_commits:
-  message: /^\[DOC\]/
+  message: /\[DOC\]/
   files:
     - doc/*
     - '**/*.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"
@@ -47,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%'
@@ -68,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
@@ -78,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%
     - >-
@@ -94,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
@@ -105,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
@@ -123,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 0cab0023c2..0000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,64 +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}')"
-  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
diff --git a/.document b/.document
index 5494bcc7fe..3a6b0c238c 100644
--- a/.document
+++ b/.document
@@ -18,14 +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/.gdbinit b/.gdbinit
index 8979e8b47c..34d044caf6 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -544,13 +544,13 @@ end
 
 define rp_class
   printf "(struct RClass *) %p", (void*)$arg0
-  if ((struct RClass *)($arg0))->ptr.origin_ != $arg0
-    printf " -> %p", ((struct RClass *)($arg0))->ptr.origin_
+  if RCLASS_ORIGIN((struct RClass *)($arg0)) != $arg0
+    printf " -> %p", RCLASS_ORIGIN((struct RClass *)($arg0))
   end
   printf "\n"
   rb_classname $arg0
   print/x *(struct RClass *)($arg0)
-  print *((struct RClass *)($arg0))->ptr
+  print *RCLASS_EXT((struct RClass *)($arg0))
 end
 document rp_class
   Print the content of a Class/Module.
@@ -979,8 +979,8 @@ end
 
 define rb_ps_vm
   print $ps_vm = (rb_vm_t*)$arg0
-  set $ps_thread_ln = $ps_vm->living_threads.n.next
-  set $ps_thread_ln_last = $ps_vm->living_threads.n.prev
+  set $ps_thread_ln      = $ps_vm->ractor.main_ractor.threads.set.n.next
+  set $ps_thread_ln_last = $ps_vm->ractor.main_ractor.threads.set.n.prev
   while 1
     set $ps_thread_th = (rb_thread_t *)$ps_thread_ln
     set $ps_thread = (VALUE)($ps_thread_th->self)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000..6c5eac5a0f
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,23 @@
+# This is a file used by GitHub to ignore the following commits on `git blame`.
+#
+# You can also do the same thing in your local repository with:
+# $ git config --local blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Expand tabs
+5b21e94bebed90180d8ff63dad03b8b948361089
+
+# Enable Style/StringLiterals cop for RubyGems/Bundler
+d7ffd3fea402239b16833cc434404a7af82d44f3
+
+# [ruby/digest] Revert tab-expansion in external files
+48b09aae7ec5632209229dcc294dd0d75a93a17f
+8a65cf3b61c60e4cb886f59a73ff6db44364bfa9
+39dc9f9093901d40d2998653948d5da38b18ee2c
+
+# [ruby/io-nonblock] Revert tab expansion
+f28287d34c03f472ffe90ea262bdde9affd4b965
+0d842fecb4f75ab3b1d4097ebdb8e88f51558041
+4ba2c66761d6a293abdfba409241d31063cefd62
+
+# Make benchmark indentation consistent
+fc4acf8cae82e5196186d3278d831f2438479d91
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index c8d7ec5e0d..0000000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,11 +0,0 @@
-# Lines starting with '#' are comments.
-# Each line is a file pattern followed by one or more owners.
-# Code owners will be automatically tagged as reviewers when a pull request is opened
-
-# YJIT sources and tests
-yjit* @maximecb @xrxr @tenderlove
-yjit/* @maximecb @xrxr @tenderlove
-doc/yjit/* @maximecb @xrxr @tenderlove
-bootstraptest/test_yjit* @maximecb @xrxr @tenderlove
-test/ruby/test_yjit* @maximecb @xrxr @tenderlove
-.github/workflows/yjit* @maximecb @xrxr @tenderlove
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/baseruby.yml b/.github/workflows/baseruby.yml
index 7385fc4d9e..ebaafe3bf0 100644
--- a/.github/workflows/baseruby.yml
+++ b/.github/workflows/baseruby.yml
@@ -4,23 +4,37 @@ 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
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    runs-on: ubuntu-22.04
+    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     strategy:
       matrix:
         ruby:
@@ -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 83f01d5868..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 }}
@@ -50,6 +63,7 @@ jobs:
 
       - name: Maintain updated gems list in NEWS
         run: |
+          #!ruby
           require 'json'
           news = File.read("NEWS.md")
           prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1]
@@ -67,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}
@@ -100,6 +114,11 @@ jobs:
           make
         if: ${{ steps.diff.outcome == 'failure' }}
 
+      - name: Prepare bundled gems
+        run: |
+          make -s prepare-gems
+        if: ${{ steps.diff.outcome == 'failure' }}
+
       - name: Test bundled gems
         run: |
           make -s test-bundled-gems
@@ -131,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 f606a86b66..79b2916feb 100644
--- a/.github/workflows/check_dependencies.yml
+++ b/.github/workflows/check_dependencies.yml
@@ -3,26 +3,40 @@ 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:
   update-deps:
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
       fail-fast: true
     runs-on: ${{ matrix.os }}
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
       - name: Install libraries
         run: |
@@ -32,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
@@ -50,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: |
             {
@@ -58,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 9e35d7f432..0000000000
--- a/.github/workflows/check_misc.yml
+++ /dev/null
@@ -1,97 +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: |
-          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: |
-          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 09d9135fa0..8dba76fbe2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,29 +1,42 @@
 name: "Code scanning - action"
 
 on:
-  push:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
-  pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
+  # 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: ${{ !startsWith(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
@@ -36,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
@@ -47,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 261431dfb5..caf12cc0f4 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -4,13 +4,22 @@ 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'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -20,9 +29,8 @@ concurrency:
 # environment variables (plus the "echo $GITHUB_ENV" hack) is to reroute that
 # restriction.
 env:
-  default_cc: clang-14
+  default_cc: clang-15
   append_cc: ''
-  crosshost: ''
 
   # -O1 is faster than -O3 in our tests... Majority of time are consumed trying
   # to optimize binaries.  Also GitHub Actions run on relatively modern CPUs
@@ -55,6 +63,9 @@ env:
     --color=always
     --tty=no
 
+permissions:
+  contents: read
+
 jobs:
   compile:
     strategy:
@@ -63,60 +74,47 @@ jobs:
         env:
           - {}
         entry:
-          - { key: default_cc, name: gcc-11,    value: gcc-11,    container: gcc-11 }
-          - { key: default_cc, name: gcc-10,    value: gcc-10,    container: gcc-10 }
-          - { key: default_cc, name: gcc-9,     value: gcc-9,     container: gcc-9 }
-          - { key: default_cc, name: gcc-8,     value: gcc-8,     container: gcc-8 }
-          - { key: default_cc, name: gcc-7,     value: gcc-7,     container: gcc-7 }
-          - { key: default_cc, name: gcc-6,     value: gcc-6,     container: gcc-6 }
-          - { key: default_cc, name: gcc-5,     value: gcc-5,     container: gcc-5 }
-          - { key: default_cc, name: gcc-4.8,   value: gcc-4.8,   container: gcc-4.8 }
-          - key: default_cc
-            name: 'gcc-11 LTO'
-            value: 'gcc-11 -flto=auto -ffat-lto-objects'
-            container: gcc-11
-            configure_append: '--disable-shared optflags=-O2'
+          - { name: gcc-12,    env: { default_cc: gcc-12 } }
+          - { name: gcc-11,    env: { default_cc: gcc-11 } }
+          - { name: gcc-10,    env: { default_cc: gcc-10 } }
+          - { 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-13 LTO'
+            container: gcc-13
+            env:
+              default_cc: 'gcc-13 -flto=auto -ffat-lto-objects -Werror=lto-type-mismatch'
+              optflags: '-O2'
+            shared: disable
             # check: true
-          - key: default_cc
-            name: 'gcc-11 annocheck'
-            # Minimal flags to pass the check.
-            value: 'gcc-11 -O2 -fcf-protection -Wl,-z,now'
-            container: gcc-11
+          - { name: clang-16,  env: { default_cc: clang-16 } }
+          - { name: clang-15,  env: { default_cc: clang-15 } }
+          - { name: clang-14,  env: { default_cc: clang-14 } }
+          - { name: clang-13,  env: { default_cc: clang-13 } }
+          - { name: clang-12,  env: { default_cc: clang-12 } }
+          - { name: clang-11,  env: { default_cc: clang-11 } }
+          - { name: clang-10,  env: { default_cc: clang-10 } }
+          # 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:
-              # FIXME: Drop skipping options
-              # https://bugs.ruby-lang.org/issues/18061
-              # https://sourceware.org/annobin/annobin.html/Test-pie.html
-              # https://sourceware.org/annobin/annobin.html/Test-notes.html
-              TEST_ANNOCHECK_OPTS: "--skip-pie --skip-notes"
-            check: true
-          - { key: default_cc, name: clang-15,  value: clang-15,  container: clang-15 }
-          - { key: default_cc, name: clang-14,  value: clang-14,  container: clang-14 }
-          - { key: default_cc, name: clang-13,  value: clang-13,  container: clang-13 }
-          - { key: default_cc, name: clang-12,  value: clang-12,  container: clang-12 }
-          - { key: default_cc, name: clang-11,  value: clang-11,  container: clang-11 }
-          - { key: default_cc, name: clang-10,  value: clang-10,  container: clang-10 }
-          - { key: default_cc, name: clang-9,   value: clang-9,   container: clang-9 }
-          - { key: default_cc, name: clang-8,   value: clang-8,   container: clang-8 }
-          - { key: default_cc, name: clang-7,   value: clang-7,   container: clang-7 }
-          - { key: default_cc, name: clang-6.0, value: clang-6.0, container: clang-6.0 }
-          - { key: default_cc, name: clang-5.0, value: clang-5.0, container: clang-5.0 }
-          - { key: default_cc, name: clang-4.0, value: clang-4.0, container: clang-4.0 }
-          - { key: default_cc, name: clang-3.9, value: clang-3.9, container: clang-3.9 }
-          - key: default_cc
-            name: 'clang-14 LTO'
-            value: 'clang-14 -flto=auto'
-            container: clang-14
-            configure_append: '--disable-shared optflags=-O2'
+              default_cc: 'clang-16 -flto=auto'
+              optflags: '-O2'
+            shared: disable
             # check: true
 
-#         - { key: crosshost, name: aarch64-linux-gnu,     value: aarch64-linux-gnu, container: crossbuild-essential-arm64 }
-#         - { key: crosshost, name: arm-linux-gnueabi,     value: arm-linux-gnueabi }
-#         - { key: crosshost, name: arm-linux-gnueabihf,   value: arm-linux-gnueabihf }
-#         - { key: crosshost, name: i686-w64-mingw32,      value: i686-w64-mingw32 }
-#         - { key: crosshost, name: powerpc-linux-gnu,     value: powerpc-linux-gnu }
-#         - { key: crosshost, name: powerpc64le-linux-gnu, value: powerpc64le-linux-gnu, container: crossbuild-essential-ppc64el }
-#         - { key: crosshost, name: s390x-linux-gnu,       value: s390x-linux-gnu, container: crossbuild-essential-s390x }
-#         - { key: crosshost, name: x86_64-w64-mingw32,    value: x86_64-w64-mingw32, container: mingw-w64 }
+#         - { name: aarch64-linux-gnu,     crosshost: aarch64-linux-gnu, container: crossbuild-essential-arm64 }
+#         - { name: arm-linux-gnueabi,     crosshost: arm-linux-gnueabi }
+#         - { name: arm-linux-gnueabihf,   crosshost: arm-linux-gnueabihf }
+#         - { name: i686-w64-mingw32,      crosshost: i686-w64-mingw32 }
+#         - { name: powerpc-linux-gnu,     crosshost: powerpc-linux-gnu }
+#         - { name: powerpc64le-linux-gnu, crosshost: powerpc64le-linux-gnu, container: crossbuild-essential-ppc64el }
+#         - { name: s390x-linux-gnu,       crosshost: s390x-linux-gnu, container: crossbuild-essential-s390x }
+#         - { name: x86_64-w64-mingw32,    crosshost: x86_64-w64-mingw32, container: mingw-w64 }
 
           # -Wno-strict-prototypes is necessary with current clang-15 since
           # older autoconf generate functions without prototype and -pedantic
@@ -124,94 +122,100 @@ jobs:
           # warning generates a lot of noise from use of ANYARGS in
           # rb_define_method() and friends.
           # See: https://github.com/llvm/llvm-project/commit/11da1b53d8cd3507959022cd790d5a7ad4573d94
-          - { key: append_cc, name: c99,   value: '-std=c99   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' }
-#         - { key: append_cc, name: c11,   value: '-std=c11   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' }
-#         - { key: append_cc, name: c17,   value: '-std=c17   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' }
-          - { key: append_cc, name: c2x,   value: '-std=c2x   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' }
-          - { key: CXXFLAGS,  name: c++98, value: '-std=c++98 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
-#         - { key: CXXFLAGS,  name: c++11, value: '-std=c++11 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
-#         - { key: CXXFLAGS,  name: c++14, value: '-std=c++14 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
-#         - { key: CXXFLAGS,  name: c++17, value: '-std=c++17 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
-          - { key: CXXFLAGS,  name: c++2a, value: '-std=c++2a -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
+          - { name: c99,   env: { append_cc: '-std=c99   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+#         - { name: c11,   env: { append_cc: '-std=c11   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+#         - { name: c17,   env: { append_cc: '-std=c17   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+          - { name: c2x,   env: { append_cc: '-std=c2x   -Werror=pedantic -pedantic-errors -Wno-strict-prototypes' } }
+          - { name: c++98, env: { CXXFLAGS: '-std=c++98 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+#         - { name: c++11, env: { CXXFLAGS: '-std=c++11 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+#         - { name: c++14, env: { CXXFLAGS: '-std=c++14 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+#         - { name: c++17, env: { CXXFLAGS: '-std=c++17 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
+          - { name: c++2a, env: { CXXFLAGS: '-std=c++2a -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
 
-          - { key: optflags, name: '-O0', value: '-O0 -march=x86-64 -mtune=generic' }
-#         - { key: optflags, name: '-O3', value: '-O3 -march=x86-64 -mtune=generic', check: true }
+          - { name: '-O0', env: { optflags: '-O0 -march=x86-64 -mtune=generic' } }
+#         - { name: '-O3', env: { optflags: '-O3 -march=x86-64 -mtune=generic' }, check: true }
 
-          - { key: append_configure, name: gmp,                  value: '--with-gmp' }
-          - { key: append_configure, name: jemalloc,             value: '--with-jemalloc' }
-          - { key: append_configure, name: valgrind,             value: '--with-valgrind' }
-          - { key: append_configure, name: 'coroutine=ucontext', value: '--with-coroutine=ucontext' }
-          - { key: append_configure, name: 'coroutine=pthread',  value: '--with-coroutine=pthread' }
-          - { key: append_configure, name: disable-jit-support,  value: '--disable-jit-support' }
-          - { key: append_configure, name: disable-dln,          value: '--disable-dln' }
-          - { key: append_configure, name: enable-mkmf-verbose,  value: '--enable-mkmf-verbose' }
-          - { key: append_configure, name: disable-rubygems,     value: '--disable-rubygems' }
+          - { name: gmp,                  env: { append_configure: '--with-gmp' } }
+          - { name: jemalloc,             env: { append_configure: '--with-jemalloc' } }
+          - { name: valgrind,             env: { append_configure: '--with-valgrind' } }
+          - { name: 'coroutine=ucontext', env: { append_configure: '--with-coroutine=ucontext' } }
+          - { name: 'coroutine=pthread',  env: { append_configure: '--with-coroutine=pthread' } }
+          - { name: disable-jit-support,  env: { append_configure: '--disable-jit-support' } }
+          - { name: disable-dln,          env: { append_configure: '--disable-dln' } }
+          - { name: enable-mkmf-verbose,  env: { append_configure: '--enable-mkmf-verbose' } }
+          - { name: disable-rubygems,     env: { append_configure: '--disable-rubygems' } }
+          - { name: RUBY_DEVEL,           env: { append_configure: '--enable-devel' } }
 
-          - { key: cppflags, name: OPT_THREADED_CODE=1,            value: '-DOPT_THREADED_CODE=1' }
-          - { key: cppflags, name: OPT_THREADED_CODE=2,            value: '-DOPT_THREADED_CODE=2' }
-          - { key: cppflags, name: OPT_THREADED_CODE=3,            value: '-DOPT_THREADED_CODE=3' }
+          - { name: OPT_THREADED_CODE=1,            env: { cppflags: '-DOPT_THREADED_CODE=1' } }
+          - { name: OPT_THREADED_CODE=2,            env: { cppflags: '-DOPT_THREADED_CODE=2' } }
+          - { name: OPT_THREADED_CODE=3,            env: { cppflags: '-DOPT_THREADED_CODE=3' } }
 
-          - { key: cppflags, name: NDEBUG,                         value: '-DNDEBUG' }
-          - { key: cppflags, name: RUBY_DEBUG,                     value: '-DRUBY_DEBUG' }
-#         - { key: cppflags, name: ARRAY_DEBUG,                    value: '-DARRAY_DEBUG' }
-#         - { key: cppflags, name: BIGNUM_DEBUG,                   value: '-DBIGNUM_DEBUG' }
-#         - { key: cppflags, name: CCAN_LIST_DEBUG,                value: '-DCCAN_LIST_DEBUG' }
-#         - { key: cppflags, name: CPDEBUG=-1,                     value: '-DCPDEBUG=-1' }
-#         - { key: cppflags, name: ENC_DEBUG,                      value: '-DENC_DEBUG' }
-#         - { key: cppflags, name: GC_DEBUG,                       value: '-DGC_DEBUG' }
-#         - { key: cppflags, name: HASH_DEBUG,                     value: '-DHASH_DEBUG' }
-#         - { key: cppflags, name: ID_TABLE_DEBUG,                 value: '-DID_TABLE_DEBUG' }
-#         - { key: cppflags, name: RGENGC_DEBUG=-1,                value: '-DRGENGC_DEBUG=-1' }
-#         - { key: cppflags, name: SYMBOL_DEBUG,                   value: '-DSYMBOL_DEBUG' }
+          - { name: NDEBUG,                         env: { cppflags: '-DNDEBUG' } }
+          - { name: RUBY_DEBUG,                     env: { cppflags: '-DRUBY_DEBUG' } }
+#         - { name: ARRAY_DEBUG,                    env: { cppflags: '-DARRAY_DEBUG' } }
+#         - { name: BIGNUM_DEBUG,                   env: { cppflags: '-DBIGNUM_DEBUG' } }
+#         - { name: CCAN_LIST_DEBUG,                env: { cppflags: '-DCCAN_LIST_DEBUG' } }
+#         - { name: CPDEBUG=-1,                     env: { cppflags: '-DCPDEBUG=-1' } }
+#         - { name: ENC_DEBUG,                      env: { cppflags: '-DENC_DEBUG' } }
+#         - { name: GC_DEBUG,                       env: { cppflags: '-DGC_DEBUG' } }
+#         - { name: HASH_DEBUG,                     env: { cppflags: '-DHASH_DEBUG' } }
+#         - { name: ID_TABLE_DEBUG,                 env: { cppflags: '-DID_TABLE_DEBUG' } }
+#         - { name: RGENGC_DEBUG=-1,                env: { cppflags: '-DRGENGC_DEBUG=-1' } }
+#         - { name: SYMBOL_DEBUG,                   env: { cppflags: '-DSYMBOL_DEBUG' } }
 
-#         - { key: cppflags, name: RGENGC_CHECK_MODE,              value: '-DRGENGC_CHECK_MODE' }
-#         - { key: cppflags, name: TRANSIENT_HEAP_CHECK_MODE,      value: '-DTRANSIENT_HEAP_CHECK_MODE' }
-#         - { key: cppflags, name: VM_CHECK_MODE,                  value: '-DVM_CHECK_MODE' }
+#         - { name: RGENGC_CHECK_MODE,              env: { cppflags: '-DRGENGC_CHECK_MODE' } }
+#         - { name: TRANSIENT_HEAP_CHECK_MODE,      env: { cppflags: '-DTRANSIENT_HEAP_CHECK_MODE' } }
+#         - { name: VM_CHECK_MODE,                  env: { cppflags: '-DVM_CHECK_MODE' } }
 
-          - { key: cppflags, name: USE_EMBED_CI=0,                 value: '-DUSE_EMBED_CI=0' }
-          - { key: cppflags, name: USE_FLONUM=0,                   value: '-DUSE_FLONUM=0' }
-#         - { key: cppflags, name: USE_GC_MALLOC_OBJ_INFO_DETAILS, value: '-DUSE_GC_MALLOC_OBJ_INFO_DETAILS' }
-          - { key: cppflags, name: USE_LAZY_LOAD,                  value: '-DUSE_LAZY_LOAD' }
-#         - { key: cppflags, name: USE_RINCGC=0,                   value: '-DUSE_RINCGC=0' }
-#         - { key: cppflags, name: USE_SYMBOL_GC=0,                value: '-DUSE_SYMBOL_GC=0' }
-#         - { key: cppflags, name: USE_THREAD_CACHE=0,             value: '-DUSE_THREAD_CACHE=0' }
-#         - { key: cppflags, name: USE_TRANSIENT_HEAP=0,           value: '-DUSE_TRANSIENT_HEAP=0' }
-#         - { key: cppflags, name: USE_RUBY_DEBUG_LOG=1,           value: '-DUSE_RUBY_DEBUG_LOG=1' }
-          - { key: cppflags, name: USE_RVARGC=0,                   value: '-DUSE_RVARGC=0' }
-#         - { key: cppflags, name: USE_RVARGC=1,                   value: '-DUSE_RVARGC=1' }
+          - { name: USE_EMBED_CI=0,                 env: { cppflags: '-DUSE_EMBED_CI=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' } }
+#         - { name: USE_SYMBOL_GC=0,                env: { cppflags: '-DUSE_SYMBOL_GC=0' } }
+#         - { name: USE_THREAD_CACHE=0,             env: { cppflags: '-DUSE_THREAD_CACHE=0' } }
+#         - { name: USE_TRANSIENT_HEAP=0,           env: { cppflags: '-DUSE_TRANSIENT_HEAP=0' } }
+#         - { name: USE_RUBY_DEBUG_LOG=1,           env: { cppflags: '-DUSE_RUBY_DEBUG_LOG=1' } }
+          - { name: USE_RVARGC=0,                   env: { cppflags: '-DUSE_RVARGC=0' } }
+#         - { name: USE_RVARGC=1,                   env: { cppflags: '-DUSE_RVARGC=1' } }
+#         - { name: USE_DEBUG_COUNTER,              env: { cppflags: '-DUSE_DEBUG_COUNTER=1', RUBY_DEBUG_COUNTER_DISABLE: '1' } }
 
-          - { key: cppflags, name: DEBUG_FIND_TIME_NUMGUESS,       value: '-DDEBUG_FIND_TIME_NUMGUESS' }
-          - { key: cppflags, name: DEBUG_INTEGER_PACK,             value: '-DDEBUG_INTEGER_PACK' }
-#         - { key: cppflags, name: ENABLE_PATH_CHECK,              value: '-DENABLE_PATH_CHECK' }
+          - { name: DEBUG_FIND_TIME_NUMGUESS,       env: { cppflags: '-DDEBUG_FIND_TIME_NUMGUESS' } }
+          - { name: DEBUG_INTEGER_PACK,             env: { cppflags: '-DDEBUG_INTEGER_PACK' } }
+#         - { name: ENABLE_PATH_CHECK,              env: { cppflags: '-DENABLE_PATH_CHECK' } }
 
-          - { key: cppflags, name: GC_DEBUG_STRESS_TO_CLASS,       value: '-DGC_DEBUG_STRESS_TO_CLASS' }
-#         - { key: cppflags, name: GC_ENABLE_LAZY_SWEEP=0,         value: '-DGC_ENABLE_LAZY_SWEEP=0' }
-#         - { key: cppflags, name: GC_PROFILE_DETAIL_MEMOTY,       value: '-DGC_PROFILE_DETAIL_MEMOTY' }
-#         - { key: cppflags, name: GC_PROFILE_MORE_DETAIL,         value: '-DGC_PROFILE_MORE_DETAIL' }
+          - { name: GC_DEBUG_STRESS_TO_CLASS,       env: { cppflags: '-DGC_DEBUG_STRESS_TO_CLASS' } }
+#         - { name: GC_ENABLE_LAZY_SWEEP=0,         env: { cppflags: '-DGC_ENABLE_LAZY_SWEEP=0' } }
+#         - { name: GC_PROFILE_DETAIL_MEMOTY,       env: { cppflags: '-DGC_PROFILE_DETAIL_MEMOTY' } }
+#         - { name: GC_PROFILE_MORE_DETAIL,         env: { cppflags: '-DGC_PROFILE_MORE_DETAIL' } }
 
-#         - { key: cppflags, name: CALC_EXACT_MALLOC_SIZE,         value: '-DCALC_EXACT_MALLOC_SIZE' }
-#         - { key: cppflags, name: MALLOC_ALLOCATED_SIZE_CHECK,    value: '-DMALLOC_ALLOCATED_SIZE_CHECK' }
+#         - { name: CALC_EXACT_MALLOC_SIZE,         env: { cppflags: '-DCALC_EXACT_MALLOC_SIZE' } }
+#         - { name: MALLOC_ALLOCATED_SIZE_CHECK,    env: { cppflags: '-DMALLOC_ALLOCATED_SIZE_CHECK' } }
 
-#         - { key: cppflags, name: IBF_ISEQ_ENABLE_LOCAL_BUFFER,   value: '-DIBF_ISEQ_ENABLE_LOCAL_BUFFER' }
+#         - { name: IBF_ISEQ_ENABLE_LOCAL_BUFFER,   env: { cppflags: '-DIBF_ISEQ_ENABLE_LOCAL_BUFFER' } }
 
-#         - { key: cppflags, name: RGENGC_ESTIMATE_OLDMALLOC,      value: '-DRGENGC_ESTIMATE_OLDMALLOC' }
-#         - { key: cppflags, name: RGENGC_FORCE_MAJOR_GC,          value: '-DRGENGC_FORCE_MAJOR_GC' }
-#         - { key: cppflags, name: RGENGC_OBJ_INFO,                value: '-DRGENGC_OBJ_INFO' }
-#         - { key: cppflags, name: RGENGC_OLD_NEWOBJ_CHECK,        value: '-DRGENGC_OLD_NEWOBJ_CHECK' }
-#         - { key: cppflags, name: RGENGC_PROFILE,                 value: '-DRGENGC_PROFILE' }
+#         - { name: RGENGC_ESTIMATE_OLDMALLOC,      env: { cppflags: '-DRGENGC_ESTIMATE_OLDMALLOC' } }
+#         - { name: RGENGC_FORCE_MAJOR_GC,          env: { cppflags: '-DRGENGC_FORCE_MAJOR_GC' } }
+#         - { name: RGENGC_OBJ_INFO,                env: { cppflags: '-DRGENGC_OBJ_INFO' } }
+#         - { name: RGENGC_OLD_NEWOBJ_CHECK,        env: { cppflags: '-DRGENGC_OLD_NEWOBJ_CHECK' } }
+#         - { name: RGENGC_PROFILE,                 env: { cppflags: '-DRGENGC_PROFILE' } }
 
-#         - { key: cppflags, name: VM_DEBUG_BP_CHECK,              value: '-DVM_DEBUG_BP_CHECK' }
-#         - { key: cppflags, name: VM_DEBUG_VERIFY_METHOD_CACHE,   value: '-DVM_DEBUG_VERIFY_METHOD_CACHE' }
+#         - { name: VM_DEBUG_BP_CHECK,              env: { cppflags: '-DVM_DEBUG_BP_CHECK' } }
+#         - { name: VM_DEBUG_VERIFY_METHOD_CACHE,   env: { cppflags: '-DVM_DEBUG_VERIFY_METHOD_CACHE' } }
 
-          - { key: cppflags, name: MJIT_FORCE_ENABLE,              value: '-DMJIT_FORCE_ENABLE' }
-          - { key: cppflags, name: YJIT_FORCE_ENABLE,              value: '-DYJIT_FORCE_ENABLE' }
+          - { name: MJIT_FORCE_ENABLE,              env: { cppflags: '-DMJIT_FORCE_ENABLE' } }
+          - { name: YJIT_FORCE_ENABLE,              env: { cppflags: '-DYJIT_FORCE_ENABLE' } }
 
     name: ${{ matrix.entry.name }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || 'clang-14' }}
+      image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-15' }}
       options: --user root
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     env: ${{ matrix.entry.env || matrix.env }}
     steps:
       - run: id
@@ -220,12 +224,11 @@ jobs:
         working-directory:
       - name: setenv
         run: |
-          echo "${{ matrix.entry.key }}=${{ matrix.entry.value }}" >> $GITHUB_ENV
           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
@@ -234,34 +237,32 @@ jobs:
       - name: Run configure
         run: >
           ../src/configure -C ${default_configure} ${append_configure}
-          ${{ matrix.entry.key == 'crosshost' && '--host="${crosshost}"' || '--with-gcc="${default_cc} ${append_cc}"' }}
-          ${{ matrix.entry.configure_append || '--enable-shared' }}
+          --${{
+            matrix.entry.crosshost && 'host' || 'with-gcc'
+          }}=${{
+            matrix.entry.crosshost || '"${default_cc}${append_cc:+ $append_cc}"'
+          }}
+          --${{ matrix.entry.shared || 'enable' }}-shared
       - run: make extract-extlibs
       - run: make incs
+      - run: make showflags
       - run: make
       - run: make leaked-globals
       - run: make test
       - run: make install
         if: ${{ matrix.entry.check }}
-      - run: make prepare-gems
-        if: ${{ matrix.entry.check }}
       - run: make test-tool
         if: ${{ matrix.entry.check }}
-      # FIXME: Skip MJIT tests failing in the annocheck case.
-      # https://bugs.ruby-lang.org/issues/18781
-      - run: |
-          rm test/ruby/test_mjit.rb
-          rm test/ruby/test_rubyvm_mjit.rb
-        if: ${{ endsWith(matrix.entry.name, 'annocheck') }}
-        working-directory: src
       - run: make test-all TESTS='-- ruby -ext-'
         if: ${{ matrix.entry.check }}
       - run: make test-spec
+        env:
+          CHECK_LEAKS: true
         if: ${{ matrix.entry.check }}
       - 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: |
             {
@@ -269,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
new file mode 100644
index 0000000000..d8dc58b119
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,113 @@
+name: macOS
+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:
+  make:
+    strategy:
+      matrix:
+        test_task: ["check"] # "test-bundler-parallel", "test-bundled-gems"
+        os:
+          - macos-13
+          - macos-14
+          - macos-15
+      fail-fast: false
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+    runs-on: ${{ matrix.os }}
+    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    steps:
+      - run: mkdir build
+        working-directory:
+      - name: git config
+        run: |
+          git config --global advice.detachedHead 0
+          git config --global init.defaultBranch garbage
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          path: src
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        with:
+          path: src/.downloaded-cache
+          key: downloaded-cache
+      - name: Install libraries
+        run: |
+          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
+        run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline)
+      - run: make incs
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
+      - run: make
+      - run: make leaked-globals
+        if: ${{ matrix.test_task == 'check' }}
+      - name: make ${{ matrix.test_task }}
+        run: |
+          make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`}
+        timeout-minutes: 40
+        env:
+          RUBY_TESTOPTS: "-q --tty=no"
+          TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
+          PRECHECK_BUNDLED_GEMS: "no"
+      - name: make skipped tests
+        run: |
+          make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'`
+        env:
+          GNUMAKEFLAGS: ""
+          RUBY_TESTOPTS: "-v --tty=no"
+          TESTS: ${{ matrix.skipped_tests }}
+          PRECHECK_BUNDLED_GEMS: "no"
+        if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }}
+        continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "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_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/mingw.yml b/.github/workflows/mingw.yml
index 8e3aec6e6f..0df917d3d8 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -3,18 +3,32 @@ 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
+
 # Notes:
 # Actions console encoding causes issues, see test-all & test-spec steps
 #
@@ -26,23 +40,22 @@ 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" # to make job names consistent
+          # To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
           - msystem: "UCRT64"
             base_ruby: head
-            test_task: "check" # to make job names consistent
+            test_task: "check"
+            test-all-opts: "--name=!/TestObjSpace#test_reachable_objects_during_iteration/"
       fail-fast: false
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
     steps:
       - run: mkdir build
         working-directory:
@@ -52,21 +65,20 @@ 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
         run: |
           echo "GNUMAKEFLAGS=-j$((2 * NUMBER_OF_PROCESSORS))" >> $GITHUB_ENV
-          echo "TEST_JOBS=$((15 * NUMBER_OF_PROCESSORS / 10))" >> $GITHUB_ENV
 
       - name: where check
         run: |
@@ -112,7 +124,7 @@ jobs:
           make update-gems
 
       - name: make all
-        timeout-minutes: 20
+        timeout-minutes: 30
         run: |
           make
 
@@ -126,23 +138,28 @@ jobs:
         timeout-minutes: 5
         run: |
           make test
+        if: ${{matrix.test_task == 'check' || matrix.test_task == 'test'}}
 
       - name: test-all
         timeout-minutes: 45
         run: |
           # Actions uses UTF8, causes test failures, similar to normal OS setup
           chcp.com 437
-          make test-all
+          make ${{ StartsWith(matrix.test_task, 'test/') && matrix.test_task || 'test-all' }}
         env:
-          RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --retry --job-status=normal --show-skip --timeout-scale=1.5
+          RUBY_TESTOPTS: >-
+            --retry --job-status=normal --show-skip --timeout-scale=1.5
+            ${{ matrix.test-all-opts }}
           BUNDLER_VERSION:
+        if: ${{matrix.test_task == 'check' || matrix.test_task == 'test-all' || StartsWith(matrix.test_task, 'test/')}}
 
       - name: test-spec
         timeout-minutes: 10
         run: |
-          make test-spec
+          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: |
             {
@@ -150,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
new file mode 100644
index 0000000000..26f8a1b2aa
--- /dev/null
+++ b/.github/workflows/mjit-bindgen.yml
@@ -0,0 +1,104 @@
+name: MJIT bindgen
+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:
+  make:
+    strategy:
+      matrix:
+        include:
+          - task: mjit-bindgen
+      fail-fast: false
+    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
+        working-directory:
+      - name: Set ENV
+        run: |
+          echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
+      - name: Install libraries
+        run: |
+          set -x
+          sudo apt-get update -q || :
+          sudo apt-get install --no-install-recommends -q -y \
+          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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          path: src
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        with:
+          path: src/.downloaded-cache
+          key: downloaded-cache
+      - name: Fixed world writable dirs
+        run: |
+          chmod -v go-w $HOME $HOME/.config
+          sudo chmod -R go-w /usr/share
+          sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
+      - run: ./autogen.sh
+        working-directory: src
+      - name: Run configure
+        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: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "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_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/mjit.yml b/.github/workflows/mjit.yml
index d5d9cecc56..6f7181489a 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -3,30 +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: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    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
@@ -40,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
@@ -62,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 18e2d3c1a8..4521195a2b 100644
--- a/.github/workflows/spec_guards.yml
+++ b/.github/workflows/spec_guards.yml
@@ -2,43 +2,61 @@ name: Rubyspec Version Guards Check
 
 on:
   push:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
+    paths:
+      - 'spec/**'
+      - '!spec/*.md'
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**.md'
-      - '**.rdoc'
+    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: ${{ !startsWith(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
-      - uses: k0kubun/action-slack@v2.0.0
+        env:
+          CHECK_LEAKS: true
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -46,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 b7097cca53..4fbca1170e 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -3,55 +3,69 @@ 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:
   make:
     strategy:
       matrix:
-        test_task: ["check", "test-bundler-parallel", "test-bundled-gems"]
-        os:
-          - ubuntu-20.04
-#         - ubuntu-18.04
-        configure: ["", "cppflags=-DRUBY_DEBUG"]
+        # main variables included in the job name
+        test_task: [check]
+        configure: [cppflags=-DRUBY_DEBUG] # default to use more assertions
+        arch: ['']
+        # specify all jobs with `include` to avoid testing duplicated things
         include:
-          - test_task: "check"
-            configure: "--host=i686-$OSTYPE"
-          - test_task: "check"
+          - test_task: check
+          - test_task: check
+            arch: i686
+            configure: '' # test without -DRUBY_DEBUG as well
+          - test_task: check
             configure: "--enable-shared --enable-load-relative"
-            skipped_tests: "TestGem#test_.*_from_binstubs.*"
-            continue-on-skipped_tests: true
-          - test_task: "test-all TESTS=--repeat-count=2"
+          - test_task: test-all TESTS=--repeat-count=2
+          - test_task: test-bundler-parallel
+          - test_task: test-bundled-gems
       fail-fast: false
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       RUBY_DEBUG: ci
-    runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+      SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }}
+    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
         working-directory:
       - name: Set ENV
-        env:
-          configure: ${{matrix.configure}}
         run: |
           echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
-          arch=`echo " $configure" | sed '/.* --host=/!d;s///;s/[- ].*//'`
-          echo "SETARCH=${arch:+setarch $arch}" >> $GITHUB_ENV
       - name: Install libraries
+        env:
+          arch: ${{matrix.arch}}
         run: |
           set -x
-          arch="${SETARCH##* }"
           arch=${arch:+:${arch/i[3-6]86/i386}}
           ${arch:+sudo dpkg --add-architecture ${arch#:}}
           sudo apt-get update -q || :
@@ -65,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
@@ -84,13 +98,13 @@ jobs:
           arch: ${{matrix.arch}}
         run: >-
           $SETARCH ../src/configure -C --disable-install-doc ${{ matrix.configure }}
-          ${arch:+--target=$arch-$OSTYPE}
+          ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
       - run: $SETARCH make incs
+      - run: $SETARCH make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: $SETARCH make
       - run: $SETARCH make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: $SETARCH make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           $SETARCH ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
@@ -113,15 +127,15 @@ 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: |
             {
               "ci": "GitHub Actions",
-              "env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}",
+              "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}${{ matrix.arch }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "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 db00db9009..27920b5821 100644
--- a/.github/workflows/wasm.yml
+++ b/.github/workflows/wasm.yml
@@ -3,18 +3,32 @@ 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:  # added using https://github.com/step-security/secure-workflows
+  contents: read
+
 jobs:
   make:
     strategy:
@@ -34,11 +48,10 @@ jobs:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       WASI_SDK_VERSION_MAJOR: 14
       WASI_SDK_VERSION_MINOR: 0
-      # Use older version, which uses glibc instead of musl, to avoid https://github.com/WebAssembly/binaryen/issues/4401
-      BINARYEN_VERSION: 91
+      BINARYEN_VERSION: 109
       WASMTIME_VERSION: v0.33.0
-    runs-on: ubuntu-20.04
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    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
         working-directory:
@@ -46,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
@@ -67,10 +80,10 @@ jobs:
           wget -O - "$wasmtime_url" | tar xJf -
           sudo ln -fs "$PWD/wasmtime-${WASMTIME_VERSION}-x86_64-linux/wasmtime" /usr/local/bin/wasmtime
 
-          binaryen_tarball="binaryen-version_${BINARYEN_VERSION}-x86-linux.tar.gz"
+          binaryen_tarball="binaryen-version_${BINARYEN_VERSION}-x86_64-linux.tar.gz"
           binaryen_url="https://github.com/WebAssembly/binaryen/releases/download/version_${BINARYEN_VERSION}/${binaryen_tarball}"
           wget -O - "$binaryen_url" | tar xfz -
-          sudo ln -fs "$PWD/binaryen-version_${BINARYEN_VERSION}/wasm-opt" /usr/local/bin/wasm-opt
+          sudo ln -fs "$PWD/binaryen-version_${BINARYEN_VERSION}/bin/wasm-opt" /usr/local/bin/wasm-opt
         working-directory: src
       - name: Set ENV
         run: |
@@ -78,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 \
@@ -91,7 +116,8 @@ jobs:
             debugflags="${{ matrix.entry.debugflags }}" \
             wasmoptflags="${{ matrix.entry.wasmoptflags }} ${{ matrix.entry.debugflags }}"
 
-      - run: make ruby
+      # miniruby may not be built when cross-compling
+      - run: make mini ruby
       - name: Run basictest
         run: wasmtime run ./../build/miniruby --mapdir /::./ -- basictest/test.rb
         working-directory: src
@@ -101,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 9c9d7b9da0..c2bd4881c2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,108 +3,107 @@ 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:
   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 }}
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    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
           set | C:\msys64\usr\bin\sort > new.env
           C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV%
           del *.env
+      - name: compiler version
+        run: cl
       - name: link libraries
         run: |
           for %%I in (C:\vcpkg\installed\x64-windows\bin\*.dll) do (
@@ -121,18 +120,16 @@ jobs:
       - run: nmake extract-extlibs
       - run: nmake
         env:
-          YACC: win_bison
+          YACC: bison.exe
       - run: nmake test
         timeout-minutes: 5
+      - run: nmake test-spec
+        timeout-minutes: 10
       - run: nmake test-all
         env:
           RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --job-status=normal
         timeout-minutes: 60
-        continue-on-error: ${{ matrix.continue-on-error || false }}
-      - run: nmake test-spec
-        timeout-minutes: 10
-        continue-on-error: ${{ matrix.continue-on-error || false }}
-      - uses: k0kubun/action-slack@v2.0.0
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
@@ -140,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 cf96590b60..0b7b9046e9 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -3,25 +3,39 @@ 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:
   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
@@ -38,31 +52,41 @@ 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"
 
           - test_task: "test-bundled-gems"
             configure: "--enable-yjit=dev"
+
+          - test_task: "yjit-bench"
+            configure: "--enable-yjit=dev"
+            yjit_bench_opts: "--yjit-stats"
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       RUN_OPTS: ${{ matrix.yjit_opts }}
+      YJIT_BENCH_OPTS: ${{ matrix.yjit_bench_opts }}
       RUBY_DEBUG: ci
-    runs-on: ubuntu-20.04
-    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+      BUNDLE_JOBS: 8 # for yjit-bench
+    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
         working-directory:
@@ -78,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
@@ -96,34 +120,46 @@ jobs:
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
-        run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
+        run: ../src/configure -C --disable-install-doc --prefix=$(pwd)/install ${{ matrix.configure }}
       - run: make incs
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: make -j
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
         if: ${{ matrix.test_task == 'check' }}
       - name: Enable YJIT through ENV
         run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV
-      - run: make -s ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS"
+      # 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
         env:
           RUBY_TESTOPTS: "-q --tty=no"
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
           PRECHECK_BUNDLED_GEMS: "no"
-      - uses: k0kubun/action-slack@v2.0.0
+          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}"
+        env:
+          BASE_REPO: ${{ github.event.pull_request.base.repo.full_name }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+        if: ${{ matrix.test_task == 'yjit-bench' && startsWith(github.event_name, 'pull') }}
+      - uses: ruby/action-slack@0bd85c72233cdbb6a0fe01d37aaeff1d21b5fce1 # v3.2.1
         with:
           payload: |
             {
               "ci": "GitHub Actions",
-              "env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}",
+              "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
-              "branch": "${{ github.ref }}".split('/').reverse()[0]
+              "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 521f4ec807..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
@@ -219,6 +223,9 @@ lcov*.info
 /lib/ruby/[1-9]*.*
 /lib/ruby/vendor_ruby
 
+# /misc/
+/misc/**/__pycache__
+
 # /spec/bundler
 /.rspec_status
 
@@ -230,9 +237,14 @@ lcov*.info
 /win32/*.ico
 
 # MJIT
-/rb_mjit_header.h
-/mjit_config.h
 /include/ruby-*/*/rb_mjit_min_header-*.h
+/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/.indent.pro b/.indent.pro
new file mode 100644
index 0000000000..1d61cbcad1
--- /dev/null
+++ b/.indent.pro
@@ -0,0 +1,32 @@
+-bap
+-nbbb
+-nbc
+-br
+-brs
+-nbs
+-ncdb
+-nce
+-cdw
+-cli2
+-cbi2
+-ndj
+-ncs
+-nfc1
+-i4
+-l120
+-lp
+-npcs
+-psl
+-sc
+-sob
+-sbi4
+-nut
+-par
+
+-TID
+-TVALUE
+-Tst_data_t
+-Tst_index_t
+-Tst_table
+-Trb_data_type_t
+-TFILE
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a34d3692af..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,234 +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
-        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
-  - chmod -R a-w .
-  - chmod -R u+w build config_1st config_2nd
-  - 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 556338bbda..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,89 +90,487 @@ Note that each entry is kept to a minimum, see links for details.
     foo(k: 1)
     ```
 
-## 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
+      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.
+      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]]
 
+* Process
+    * 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`.
+      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]]
+
+* 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.2
-    * etc 1.4.0
-    * io-console 0.5.11
-    * io-nonblock 0.1.1
-    * io-wait 0.2.3
-    * ipaddr 1.2.4
-    * 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
-    * stringio 3.0.3
-    * timeout 0.3.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.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.
-    * net-imap 0.2.3
-    * rbs 2.5.0
-    * typeprof 0.21.2
-    * debug 1.5.0
-*   The following default gems are now bundled gems.
+
+    * minitest 5.16.3
+    * 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.3
+    * rbs 2.8.2
+    * typeprof 0.21.3
+    * 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
 
@@ -194,15 +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.
-  Users need to install the libyaml library themselves via the package
-  system. [[Feature #18571]]
+* 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
+  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.
@@ -212,51 +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
+
+* 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
 
-### YJIT: New experimental in-process JIT compiler
-
-## Static analysis
-
-### RBS
-
-### TypeProf
-
-## Debugger
-
-## error_highlight
-
-## IRB Autocomplete and Document Display
-
-## Miscellaneous changes
-
-[Feature #12005]: https://bugs.ruby-lang.org/issues/12005
-[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 #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
-[Bug #18782]:     https://bugs.ruby-lang.org/issues/18782
+* 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 fee8528ca7..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?
 
@@ -46,6 +45,10 @@ to see the list of branches:
 You may also want to use https://git.ruby-lang.org/ruby.git (actual master of Ruby source)
 if you are a committer.
 
+## How to build
+
+see [Building Ruby](doc/contributing/building_ruby.md)
+
 ## Ruby home page
 
 https://www.ruby-lang.org/
@@ -75,7 +78,7 @@ See the file [COPYING](rdoc-ref:COPYING).
 Questions about the Ruby language can be asked on the [Ruby-Talk](https://www.ruby-lang.org/en/community/mailing-lists) mailing list
 or on websites like https://stackoverflow.com.
 
-Bugs should be reported at https://bugs.ruby-lang.org. Read ["Reporting Issues"](https://docs.ruby-lang.org/en/master/reporting_issues_md.html) for more information.
+Bugs should be reported at https://bugs.ruby-lang.org. Read ["Reporting Issues"](https://docs.ruby-lang.org/en/master/contributing/reporting_issues_md.html) for more information.
 
 ## Contributing
 
diff --git a/addr2line.c b/addr2line.c
index e102667602..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;
@@ -1292,7 +1372,7 @@ hexdump0(const unsigned char *p, size_t n)
     for (i=0; i < n; i++){
         switch (i & 15) {
           case 0:
-            fprintf(stderr, "%02zd: %02X ", i/16, p[i]);
+            fprintf(stderr, "%02" PRIdSIZE ": %02X ", i/16, p[i]);
             break;
           case 15:
             fprintf(stderr, "%02X\n", p[i]);
@@ -1313,16 +1393,16 @@ div_inspect(DebugInfoValue *v)
 {
     switch (v->type) {
       case VAL_uint:
-        fprintf(stderr,"%d: type:%d size:%zx v:%"PRIx64"\n",__LINE__,v->type,v->size,v->as.uint64);
+        fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:%"PRIx64"\n",__LINE__,v->type,v->size,v->as.uint64);
         break;
       case VAL_int:
-        fprintf(stderr,"%d: type:%d size:%zx v:%"PRId64"\n",__LINE__,v->type,v->size,(int64_t)v->as.uint64);
+        fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:%"PRId64"\n",__LINE__,v->type,v->size,(int64_t)v->as.uint64);
         break;
       case VAL_cstr:
-        fprintf(stderr,"%d: type:%d size:%zx v:'%s'\n",__LINE__,v->type,v->size,v->as.ptr);
+        fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:'%s'\n",__LINE__,v->type,v->size,v->as.ptr);
         break;
       case VAL_data:
-        fprintf(stderr,"%d: type:%d size:%zx v:\n",__LINE__,v->type,v->size);
+        fprintf(stderr,"%d: type:%d size:%" PRIxSIZE " v:\n",__LINE__,v->type,v->size);
         hexdump(v->as.ptr, 16);
         break;
     }
@@ -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;
@@ -2329,8 +2591,8 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
 	    /* if the binary is strip-ed, this may effect */
 	    for (p=dladdr_fbases; *p; p++) {
 		if (*p == info.dli_fbase) {
-		    lines[i].path = info.dli_fname;
-		    lines[i].sname = info.dli_sname;
+		    if (info.dli_fname) lines[i].path = info.dli_fname;
+		    if (info.dli_sname) lines[i].sname = info.dli_sname;
 		    goto next_line;
 		}
 	    }
@@ -2340,9 +2602,11 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
 	    obj->base_addr = (uintptr_t)info.dli_fbase;
 	    path = info.dli_fname;
 	    obj->path = path;
-	    lines[i].path = path;
-            lines[i].sname = info.dli_sname;
-            lines[i].saddr = (uintptr_t)info.dli_saddr;
+	    if (path) lines[i].path = path;
+            if (info.dli_sname) {
+                lines[i].sname = info.dli_sname;
+                lines[i].saddr = (uintptr_t)info.dli_saddr;
+            }
 	    strlcpy(binary_filename, path, PATH_MAX);
 	    if (fill_lines(num_traces, traces, 1, &obj, lines, i) == (uintptr_t)-1)
 		break;
diff --git a/array.c b/array.c
index 7b3f5bd0b0..b76e9a64a3 100644
--- a/array.c
+++ b/array.c
@@ -39,6 +39,37 @@
 
 VALUE rb_cArray;
 
+/* Flags of RArray
+ *
+ * 1:   RARRAY_EMBED_FLAG
+ *          The array is embedded (its contents follow the header, rather than
+ *          being on a separately allocated buffer).
+ * 2:   RARRAY_SHARED_FLAG (equal to ELTS_SHARED)
+ *          The array is shared. The buffer this array points to is owned by
+ *          another array (the shared root).
+ * if USE_RVARGC
+ * 3-9: RARRAY_EMBED_LEN
+ *          The length of the array when RARRAY_EMBED_FLAG is set.
+ * else
+ * 3-4: RARRAY_EMBED_LEN
+ *          The length of the array when RARRAY_EMBED_FLAG is set.
+ * endif
+ * 12:  RARRAY_SHARED_ROOT_FLAG
+ *          The array is a shared root that does reference counting. The buffer
+ *          this array points to is owned by this array but may be pointed to
+ *          by other arrays.
+ *          Note: Frozen arrays may be a shared root without this flag being
+ *                set. Frozen arrays do not have reference counting because
+ *                they cannot be modified. Not updating the reference count
+ *                improves copy-on-write performance. Their reference count is
+ *                assumed to be infinity.
+ * 13:  RARRAY_TRANSIENT_FLAG
+ *          The buffer of the array is allocated on the transient heap.
+ * 14:  RARRAY_PTR_IN_USE_FLAG
+ *          The buffer of the array is in use. This is only used during
+ *          debugging.
+ */
+
 /* for OPTIMIZED_CMP: */
 #define id_cmp idCmp
 
@@ -53,23 +84,6 @@ should_be_T_ARRAY(VALUE ary)
     return RB_TYPE_P(ary, T_ARRAY);
 }
 
-RBIMPL_ATTR_MAYBE_UNUSED()
-static int
-should_not_be_shared_and_embedded(VALUE ary)
-{
-    return !FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG);
-}
-
-#define ARY_SHARED_P(ary) \
-  (assert(should_be_T_ARRAY((VALUE)(ary))), \
-   assert(should_not_be_shared_and_embedded((VALUE)ary)), \
-   FL_TEST_RAW((ary),ELTS_SHARED)!=0)
-
-#define ARY_EMBED_P(ary) \
-  (assert(should_be_T_ARRAY((VALUE)(ary))), \
-   assert(should_not_be_shared_and_embedded((VALUE)ary)), \
-   FL_TEST_RAW((ary), RARRAY_EMBED_FLAG) != 0)
-
 #define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
 #define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
 #define ARY_HEAP_CAPA(a) (assert(!ARY_EMBED_P(a)), assert(!ARY_SHARED_ROOT_P(a)), \
@@ -79,11 +93,11 @@ should_not_be_shared_and_embedded(VALUE ary)
 #define ARY_EMBED_LEN(a) \
     (assert(ARY_EMBED_P(a)), \
      (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
-	 (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
+         (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
 #define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), ARY_CAPA(a) * sizeof(VALUE))
 
 #define ARY_OWNS_HEAP_P(a) (assert(should_be_T_ARRAY((VALUE)(a))), \
-                            !FL_TEST_RAW((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
+                            !FL_TEST_RAW((a), RARRAY_SHARED_FLAG|RARRAY_EMBED_FLAG))
 
 #define FL_SET_EMBED(a) do { \
     assert(!ARY_SHARED_P(a)); \
@@ -95,9 +109,9 @@ should_not_be_shared_and_embedded(VALUE ary)
 #define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
 #define FL_SET_SHARED(ary) do { \
     assert(!ARY_EMBED_P(ary)); \
-    FL_SET((ary), ELTS_SHARED); \
+    FL_SET((ary), RARRAY_SHARED_FLAG); \
 } while (0)
-#define FL_UNSET_SHARED(ary) FL_UNSET((ary), ELTS_SHARED)
+#define FL_UNSET_SHARED(ary) FL_UNSET((ary), RARRAY_SHARED_FLAG)
 
 #define ARY_SET_PTR(ary, p) do { \
     assert(!ARY_EMBED_P(ary)); \
@@ -107,7 +121,6 @@ should_not_be_shared_and_embedded(VALUE ary)
 #define ARY_SET_EMBED_LEN(ary, n) do { \
     long tmp_n = (n); \
     assert(ARY_EMBED_P(ary)); \
-    assert(!OBJ_FROZEN(ary)); \
     RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
     RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
 } while (0)
@@ -148,27 +161,25 @@ should_not_be_shared_and_embedded(VALUE ary)
     RARRAY(ary)->as.heap.aux.capa = (n); \
 } while (0)
 
-#define ARY_SHARED_ROOT(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared_root)
 #define ARY_SET_SHARED(ary, value) do { \
     const VALUE _ary_ = (ary); \
     const VALUE _value_ = (value); \
     assert(!ARY_EMBED_P(_ary_)); \
     assert(ARY_SHARED_P(_ary_)); \
-    assert(ARY_SHARED_ROOT_P(_value_)); \
+    assert(!OBJ_FROZEN(_ary_)); \
+    assert(ARY_SHARED_ROOT_P(_value_) || OBJ_FROZEN(_value_)); \
     RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared_root, _value_); \
 } while (0)
-#define RARRAY_SHARED_ROOT_FLAG FL_USER12
-#define ARY_SHARED_ROOT_P(ary) (assert(should_be_T_ARRAY((VALUE)(ary))), \
-                                FL_TEST_RAW((ary), RARRAY_SHARED_ROOT_FLAG))
-#define ARY_SHARED_ROOT_REFCNT(ary) \
-    (assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)
-#define ARY_SHARED_ROOT_OCCUPIED(ary) (ARY_SHARED_ROOT_REFCNT(ary) == 1)
+
+#define ARY_SHARED_ROOT_OCCUPIED(ary) (!OBJ_FROZEN(ary) && ARY_SHARED_ROOT_REFCNT(ary) == 1)
 #define ARY_SET_SHARED_ROOT_REFCNT(ary, value) do { \
     assert(ARY_SHARED_ROOT_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
     assert((value) >= 0); \
     RARRAY(ary)->as.heap.aux.capa = (value); \
 } while (0)
 #define FL_SET_SHARED_ROOT(ary) do { \
+    assert(!OBJ_FROZEN(ary)); \
     assert(!ARY_EMBED_P(ary)); \
     assert(!RARRAY_TRANSIENT_P(ary)); \
     FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \
@@ -212,6 +223,37 @@ ary_embeddable_p(long capa)
 #endif
 }
 
+bool
+rb_ary_embeddable_p(VALUE 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
+rb_ary_size_as_embedded(VALUE ary)
+{
+    size_t real_size;
+
+    if (ARY_EMBED_P(ary)) {
+        real_size = ary_embed_size(ARY_EMBED_LEN(ary));
+    }
+    else if (rb_ary_embeddable_p(ary)) {
+        real_size = ary_embed_size(ARY_HEAP_CAPA(ary));
+    }
+    else {
+        real_size = sizeof(struct RArray);
+    }
+    return real_size;
+}
+
 
 #if ARRAY_DEBUG
 #define ary_verify(ary) ary_verify_(ary, __FILE__, __LINE__)
@@ -221,12 +263,12 @@ ary_verify_(VALUE ary, const char *file, int line)
 {
     assert(RB_TYPE_P(ary, T_ARRAY));
 
-    if (FL_TEST(ary, ELTS_SHARED)) {
-        VALUE root = RARRAY(ary)->as.heap.aux.shared_root;
+    if (ARY_SHARED_P(ary)) {
+        VALUE root = ARY_SHARED_ROOT(ary);
         const VALUE *ptr = ARY_HEAP_PTR(ary);
         const VALUE *root_ptr = RARRAY_CONST_PTR_TRANSIENT(root);
         long len = ARY_HEAP_LEN(ary), root_len = RARRAY_LEN(root);
-        assert(FL_TEST(root, RARRAY_SHARED_ROOT_FLAG));
+        assert(ARY_SHARED_ROOT_P(root) || OBJ_FROZEN(root));
         assert(root_ptr <= ptr && ptr + len <= root_ptr + root_len);
         ary_verify(root);
     }
@@ -289,7 +331,7 @@ void
 rb_mem_clear(VALUE *mem, long size)
 {
     while (size--) {
-	*mem++ = Qnil;
+        *mem++ = Qnil;
     }
 }
 
@@ -297,7 +339,7 @@ static void
 ary_mem_clear(VALUE ary, long beg, long size)
 {
     RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-	rb_mem_clear(ptr + beg, size);
+        rb_mem_clear(ptr + beg, size);
     });
 }
 
@@ -305,7 +347,7 @@ static inline void
 memfill(register VALUE *mem, register long size, register VALUE val)
 {
     while (size--) {
-	*mem++ = val;
+        *mem++ = val;
     }
 }
 
@@ -313,8 +355,8 @@ static void
 ary_memfill(VALUE ary, long beg, long size, VALUE val)
 {
     RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-	memfill(ptr + beg, size, val);
-	RB_OBJ_WRITTEN(ary, Qundef, val);
+        memfill(ptr + beg, size, val);
+        RB_OBJ_WRITTEN(ary, Qundef, val);
     });
 }
 
@@ -419,14 +461,11 @@ static inline void
 rb_ary_transient_heap_evacuate_(VALUE ary, int transient, int promote)
 {
     if (transient) {
+        assert(!ARY_SHARED_ROOT_P(ary));
+
         VALUE *new_ptr;
         const VALUE *old_ptr = ARY_HEAP_PTR(ary);
         long capa = ARY_HEAP_CAPA(ary);
-        long len  = ARY_HEAP_LEN(ary);
-
-        if (ARY_SHARED_ROOT_P(ary)) {
-            capa = len;
-        }
 
         assert(ARY_OWNS_HEAP_P(ary));
         assert(RARRAY_TRANSIENT_P(ary));
@@ -468,6 +507,27 @@ rb_ary_detransient(VALUE ary)
 }
 #endif
 
+void
+rb_ary_make_embedded(VALUE ary)
+{
+    assert(rb_ary_embeddable_p(ary));
+    if (!ARY_EMBED_P(ary)) {
+        const VALUE *buf = ARY_HEAP_PTR(ary);
+        long len = ARY_HEAP_LEN(ary);
+        bool was_transient = RARRAY_TRANSIENT_P(ary);
+
+        // FL_SET_EMBED also unsets the transient flag
+        FL_SET_EMBED(ary);
+        ARY_SET_EMBED_LEN(ary, len);
+
+        MEMCPY((void *)ARY_EMBED_PTR(ary), (void *)buf, VALUE, len);
+
+        if (!was_transient) {
+            ary_heap_free_ptr(ary, buf, len * sizeof(VALUE));
+        }
+    }
+}
+
 static void
 ary_resize_capa(VALUE ary, long capacity)
 {
@@ -527,10 +587,10 @@ ary_double_capa(VALUE ary, long min)
     long new_capa = ARY_CAPA(ary) / 2;
 
     if (new_capa < ARY_DEFAULT_SIZE) {
-	new_capa = ARY_DEFAULT_SIZE;
+        new_capa = ARY_DEFAULT_SIZE;
     }
     if (new_capa >= ARY_MAX_SIZE - min) {
-	new_capa = (ARY_MAX_SIZE - min) / 2;
+        new_capa = (ARY_MAX_SIZE - min) / 2;
     }
     new_capa += min;
     ary_resize_capa(ary, new_capa);
@@ -541,14 +601,16 @@ ary_double_capa(VALUE ary, long min)
 static void
 rb_ary_decrement_share(VALUE shared_root)
 {
-    long num = ARY_SHARED_ROOT_REFCNT(shared_root);
-    ARY_SET_SHARED_ROOT_REFCNT(shared_root, num - 1);
+    if (!OBJ_FROZEN(shared_root)) {
+        long num = ARY_SHARED_ROOT_REFCNT(shared_root);
+        ARY_SET_SHARED_ROOT_REFCNT(shared_root, num - 1);
+    }
 }
 
 static void
 rb_ary_unshare(VALUE ary)
 {
-    VALUE shared_root = RARRAY(ary)->as.heap.aux.shared_root;
+    VALUE shared_root = ARY_SHARED_ROOT(ary);
     rb_ary_decrement_share(shared_root);
     FL_UNSET_SHARED(ary);
 }
@@ -570,9 +632,11 @@ rb_ary_reset(VALUE ary)
 static VALUE
 rb_ary_increment_share(VALUE shared_root)
 {
-    long num = ARY_SHARED_ROOT_REFCNT(shared_root);
-    assert(num >= 0);
-    ARY_SET_SHARED_ROOT_REFCNT(shared_root, num + 1);
+    if (!OBJ_FROZEN(shared_root)) {
+        long num = ARY_SHARED_ROOT_REFCNT(shared_root);
+        assert(num >= 0);
+        ARY_SET_SHARED_ROOT_REFCNT(shared_root, num + 1);
+    }
     return shared_root;
 }
 
@@ -648,40 +712,40 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
     long capa;
 
     if (old_len > ARY_MAX_SIZE - add_len) {
-	rb_raise(rb_eIndexError, "index %ld too big", new_len);
+        rb_raise(rb_eIndexError, "index %ld too big", new_len);
     }
     if (ARY_SHARED_P(ary)) {
-	if (new_len > ary_embed_capa(ary)) {
+        if (new_len > ary_embed_capa(ary)) {
             VALUE shared_root = ARY_SHARED_ROOT(ary);
             if (ARY_SHARED_ROOT_OCCUPIED(shared_root)) {
                 if (ARY_HEAP_PTR(ary) - RARRAY_CONST_PTR_TRANSIENT(shared_root) + new_len <= RARRAY_LEN(shared_root)) {
-		    rb_ary_modify_check(ary);
+                    rb_ary_modify_check(ary);
 
                     ary_verify(ary);
                     ary_verify(shared_root);
                     return shared_root;
-		}
-		else {
-		    /* if array is shared, then it is likely it participate in push/shift pattern */
-		    rb_ary_modify(ary);
-		    capa = ARY_CAPA(ary);
-		    if (new_len > capa - (capa >> 6)) {
-			ary_double_capa(ary, new_len);
-		    }
+                }
+                else {
+                    /* if array is shared, then it is likely it participate in push/shift pattern */
+                    rb_ary_modify(ary);
+                    capa = ARY_CAPA(ary);
+                    if (new_len > capa - (capa >> 6)) {
+                        ary_double_capa(ary, new_len);
+                    }
                     ary_verify(ary);
-		    return ary;
-		}
-	    }
-	}
+                    return ary;
+                }
+            }
+        }
         ary_verify(ary);
         rb_ary_modify(ary);
     }
     else {
-	rb_ary_modify_check(ary);
+        rb_ary_modify_check(ary);
     }
     capa = ARY_CAPA(ary);
     if (new_len > capa) {
-	ary_double_capa(ary, new_len);
+        ary_double_capa(ary, new_len);
     }
 
     ary_verify(ary);
@@ -719,10 +783,10 @@ VALUE
 rb_ary_shared_with_p(VALUE ary1, VALUE ary2)
 {
     if (!ARY_EMBED_P(ary1) && ARY_SHARED_P(ary1) &&
-	!ARY_EMBED_P(ary2) && ARY_SHARED_P(ary2) &&
-        RARRAY(ary1)->as.heap.aux.shared_root == RARRAY(ary2)->as.heap.aux.shared_root &&
-	RARRAY(ary1)->as.heap.len == RARRAY(ary2)->as.heap.len) {
-	return Qtrue;
+            !ARY_EMBED_P(ary2) && ARY_SHARED_P(ary2) &&
+            ARY_SHARED_ROOT(ary1) == ARY_SHARED_ROOT(ary2) &&
+            ARY_HEAP_LEN(ary1) == ARY_HEAP_LEN(ary2)) {
+        return Qtrue;
     }
     return Qfalse;
 }
@@ -767,10 +831,10 @@ ary_new(VALUE klass, long capa)
     VALUE ary,*ptr;
 
     if (capa < 0) {
-	rb_raise(rb_eArgError, "negative array size (or size too big)");
+        rb_raise(rb_eArgError, "negative array size (or size too big)");
     }
     if (capa > ARY_MAX_SIZE) {
-	rb_raise(rb_eArgError, "array size too big");
+        rb_raise(rb_eArgError, "array size too big");
     }
 
     RUBY_DTRACE_CREATE_HOOK(ARRAY, capa);
@@ -780,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);
     }
 
@@ -814,7 +878,7 @@ VALUE
 
     va_start(ar, n);
     for (i=0; i<n; i++) {
-	ARY_SET(ary, i, va_arg(ar, VALUE));
+        ARY_SET(ary, i, va_arg(ar, VALUE));
     }
     va_end(ar);
 
@@ -829,8 +893,8 @@ rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts)
 
     ary = ary_new(klass, n);
     if (n > 0 && elts) {
-	ary_memcpy(ary, 0, n, elts);
-	ARY_SET_LEN(ary, n);
+        ary_memcpy(ary, 0, n, elts);
+        ARY_SET_LEN(ary, n);
     }
 
     return ary;
@@ -875,10 +939,10 @@ ec_ary_new(rb_execution_context_t *ec, VALUE klass, long capa)
     VALUE ary,*ptr;
 
     if (capa < 0) {
-	rb_raise(rb_eArgError, "negative array size (or size too big)");
+        rb_raise(rb_eArgError, "negative array size (or size too big)");
     }
     if (capa > ARY_MAX_SIZE) {
-	rb_raise(rb_eArgError, "array size too big");
+        rb_raise(rb_eArgError, "array size too big");
     }
 
     RUBY_DTRACE_CREATE_HOOK(ARRAY, capa);
@@ -888,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);
     }
 
@@ -906,15 +970,15 @@ rb_ec_ary_new_from_values(rb_execution_context_t *ec, long n, const VALUE *elts)
 
     ary = ec_ary_new(ec, rb_cArray, n);
     if (n > 0 && elts) {
-	ary_memcpy(ary, 0, n, elts);
-	ARY_SET_LEN(ary, n);
+        ary_memcpy(ary, 0, n, elts);
+        ARY_SET_LEN(ary, n);
     }
 
     return ary;
 }
 
 VALUE
-rb_ary_tmp_new(long capa)
+rb_ary_hidden_new(long capa)
 {
     VALUE ary = ary_new(0, capa);
     rb_ary_transient_heap_evacuate(ary, TRUE);
@@ -922,12 +986,11 @@ rb_ary_tmp_new(long capa)
 }
 
 VALUE
-rb_ary_tmp_new_fill(long capa)
+rb_ary_hidden_new_fill(long capa)
 {
-    VALUE ary = ary_new(0, capa);
+    VALUE ary = rb_ary_hidden_new(capa);
     ary_memfill(ary, 0, capa, Qnil);
     ARY_SET_LEN(ary, capa);
-    rb_ary_transient_heap_evacuate(ary, TRUE);
     return ary;
 }
 
@@ -965,64 +1028,69 @@ RUBY_FUNC_EXPORTED size_t
 rb_ary_memsize(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-	return ARY_CAPA(ary) * sizeof(VALUE);
+        return ARY_CAPA(ary) * sizeof(VALUE);
     }
     else {
-	return 0;
+        return 0;
     }
 }
 
-static inline void
-ary_discard(VALUE ary)
-{
-    rb_ary_free(ary);
-    RBASIC(ary)->flags |= RARRAY_EMBED_FLAG;
-    RBASIC(ary)->flags &= ~(RARRAY_EMBED_LEN_MASK | RARRAY_TRANSIENT_FLAG);
-}
-
 static VALUE
 ary_make_shared(VALUE ary)
 {
-    assert(!ARY_EMBED_P(ary));
+    assert(USE_RVARGC || !ARY_EMBED_P(ary));
     ary_verify(ary);
 
     if (ARY_SHARED_P(ary)) {
         return ARY_SHARED_ROOT(ary);
     }
     else if (ARY_SHARED_ROOT_P(ary)) {
-	return ary;
+        return ary;
     }
     else if (OBJ_FROZEN(ary)) {
-        rb_ary_transient_heap_evacuate(ary, TRUE);
-	ary_shrink_capa(ary);
-	FL_SET_SHARED_ROOT(ary);
-        ARY_SET_SHARED_ROOT_REFCNT(ary, 1);
-	return ary;
+        if (!ARY_EMBED_P(ary)) {
+            rb_ary_transient_heap_evacuate(ary, TRUE);
+            ary_shrink_capa(ary);
+        }
+        return ary;
     }
     else {
-	long capa = ARY_CAPA(ary), len = RARRAY_LEN(ary);
-        const VALUE *ptr;
+        rb_ary_transient_heap_evacuate(ary, TRUE);
+
+        long capa = ARY_CAPA(ary);
+        long len = RARRAY_LEN(ary);
+
+        /* Shared roots cannot be embedded because the reference count
+         * (refcnt) is stored in as.heap.aux.capa. */
         VALUE shared = ary_alloc_heap(0);
-        VALUE vshared = (VALUE)shared;
+        FL_SET_SHARED_ROOT(shared);
 
-        rb_ary_transient_heap_evacuate(ary, TRUE);
-        ptr = ARY_HEAP_PTR(ary);
-
-        FL_UNSET_EMBED(vshared);
-        ARY_SET_LEN(vshared, capa);
-        ARY_SET_PTR(vshared, ptr);
-        ary_mem_clear(vshared, len, capa - len);
-        FL_SET_SHARED_ROOT(vshared);
-        ARY_SET_SHARED_ROOT_REFCNT(vshared, 1);
-	FL_SET_SHARED(ary);
+        if (ARY_EMBED_P(ary)) {
+            /* Cannot use ary_heap_alloc because we don't want to allocate
+             * on the transient heap. */
+            VALUE *ptr = ALLOC_N(VALUE, capa);
+            ARY_SET_PTR(shared, ptr);
+            ary_memcpy(shared, 0, len, RARRAY_PTR(ary));
+
+            FL_UNSET_EMBED(ary);
+            ARY_SET_HEAP_LEN(ary, len);
+            ARY_SET_PTR(ary, ptr);
+        }
+        else {
+            ARY_SET_PTR(shared, RARRAY_PTR(ary));
+        }
+
+        ARY_SET_LEN(shared, capa);
+        ary_mem_clear(shared, len, capa - len);
+        ARY_SET_SHARED_ROOT_REFCNT(shared, 1);
+        FL_SET_SHARED(ary);
         RB_DEBUG_COUNTER_INC(obj_ary_shared_create);
-        ARY_SET_SHARED(ary, vshared);
-        OBJ_FREEZE(vshared);
+        ARY_SET_SHARED(ary, shared);
 
-        ary_verify(vshared);
+        ary_verify(shared);
         ary_verify(ary);
 
-        return vshared;
+        return shared;
     }
 }
 
@@ -1178,45 +1246,45 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
         rb_ary_reset(ary);
         assert(ARY_EMBED_P(ary));
         assert(ARY_EMBED_LEN(ary) == 0);
-	if (rb_block_given_p()) {
-	    rb_warning("given block not used");
-	}
-	return ary;
+        if (rb_block_given_p()) {
+            rb_warning("given block not used");
+        }
+        return ary;
     }
     rb_scan_args(argc, argv, "02", &size, &val);
     if (argc == 1 && !FIXNUM_P(size)) {
-	val = rb_check_array_type(size);
-	if (!NIL_P(val)) {
-	    rb_ary_replace(ary, val);
-	    return ary;
-	}
+        val = rb_check_array_type(size);
+        if (!NIL_P(val)) {
+            rb_ary_replace(ary, val);
+            return ary;
+        }
     }
 
     len = NUM2LONG(size);
     /* NUM2LONG() may call size.to_int, ary can be frozen, modified, etc */
     if (len < 0) {
-	rb_raise(rb_eArgError, "negative array size");
+        rb_raise(rb_eArgError, "negative array size");
     }
     if (len > ARY_MAX_SIZE) {
-	rb_raise(rb_eArgError, "array size too big");
+        rb_raise(rb_eArgError, "array size too big");
     }
     /* recheck after argument conversion */
     rb_ary_modify(ary);
     ary_resize_capa(ary, len);
     if (rb_block_given_p()) {
-	long i;
+        long i;
 
-	if (argc == 2) {
-	    rb_warn("block supersedes default value argument");
-	}
-	for (i=0; i<len; i++) {
-	    rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
-	    ARY_SET_LEN(ary, i + 1);
-	}
+        if (argc == 2) {
+            rb_warn("block supersedes default value argument");
+        }
+        for (i=0; i<len; i++) {
+            rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
+            ARY_SET_LEN(ary, i + 1);
+        }
     }
     else {
-	ary_memfill(ary, 0, len, val);
-	ARY_SET_LEN(ary, len);
+        ary_memfill(ary, 0, len, val);
+        ARY_SET_LEN(ary, len);
     }
     return ary;
 }
@@ -1247,26 +1315,26 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
     long len = RARRAY_LEN(ary);
 
     if (idx < 0) {
-	idx += len;
-	if (idx < 0) {
-	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
-		     idx - len, -len);
-	}
+        idx += len;
+        if (idx < 0) {
+            rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+                     idx - len, -len);
+        }
     }
     else if (idx >= ARY_MAX_SIZE) {
-	rb_raise(rb_eIndexError, "index %ld too big", idx);
+        rb_raise(rb_eIndexError, "index %ld too big", idx);
     }
 
     rb_ary_modify(ary);
     if (idx >= ARY_CAPA(ary)) {
-	ary_double_capa(ary, idx);
+        ary_double_capa(ary, idx);
     }
     if (idx > len) {
-	ary_mem_clear(ary, len, idx - len + 1);
+        ary_mem_clear(ary, len, idx - len + 1);
     }
 
     if (idx >= len) {
-	ARY_SET_LEN(ary, idx + 1);
+        ARY_SET_LEN(ary, idx + 1);
     }
     ARY_SET(ary, idx, val);
 }
@@ -1278,17 +1346,20 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
     assert(len >= 0);
     assert(offset+len <= RARRAY_LEN(ary));
 
-    if (ary_embeddable_p(len)) {
+    const size_t rarray_embed_capa_max = (sizeof(struct RArray) - offsetof(struct RArray, as.ary)) / sizeof(VALUE);
+
+    if ((size_t)len <= rarray_embed_capa_max && ary_embeddable_p(len)) {
         VALUE result = ary_alloc_embed(klass, len);
         ary_memcpy(result, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary) + offset);
         ARY_SET_EMBED_LEN(result, len);
         return result;
     }
     else {
-        VALUE shared, result = ary_alloc_heap(klass);
+        VALUE shared = ary_make_shared(ary);
+
+        VALUE result = ary_alloc_heap(klass);
         assert(!ARY_EMBED_P(result));
 
-        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);
@@ -1313,16 +1384,19 @@ ary_make_partial_step(VALUE ary, VALUE klass, long offset, long len, long step)
     const VALUE *values = RARRAY_CONST_PTR_TRANSIENT(ary);
     const long orig_len = len;
 
-    if ((step > 0 && step >= len) || (step < 0 && (step < -len))) {
+    if (step > 0 && step >= len) {
         VALUE result = ary_new(klass, 1);
         VALUE *ptr = (VALUE *)ARY_EMBED_PTR(result);
         RB_OBJ_WRITE(result, ptr, values[offset]);
         ARY_SET_EMBED_LEN(result, 1);
         return result;
     }
+    else if (step < 0 && step < -len) {
+        step = -len;
+    }
 
     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));
@@ -1377,13 +1451,13 @@ ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos
     n = NUM2LONG(argv[0]);
     len = RARRAY_LEN(ary);
     if (n > len) {
-	n = len;
+        n = len;
     }
     else if (n < 0) {
-	rb_raise(rb_eArgError, "negative array size");
+        rb_raise(rb_eArgError, "negative array size");
     }
     if (last) {
-	offset = len - n;
+        offset = len - n;
     }
     return ary_make_partial(ary, rb_cArray, offset, n);
 }
@@ -1411,7 +1485,7 @@ rb_ary_push(VALUE ary, VALUE item)
     long idx = RARRAY_LEN((ary_verify(ary), ary));
     VALUE target_ary = ary_ensure_room_for_push(ary, 1);
     RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-	RB_OBJ_WRITE(target_ary, &ptr[idx], item);
+        RB_OBJ_WRITE(target_ary, &ptr[idx], item);
     });
     ARY_SET_LEN(ary, idx + 1);
     ary_verify(ary);
@@ -1464,10 +1538,10 @@ rb_ary_pop(VALUE ary)
     n = RARRAY_LEN(ary);
     if (n == 0) return Qnil;
     if (ARY_OWNS_HEAP_P(ary) &&
-	n * 3 < ARY_CAPA(ary) &&
-	ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
+        n * 3 < ARY_CAPA(ary) &&
+        ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
     {
-	ary_resize_capa(ary, n * 2);
+        ary_resize_capa(ary, n * 2);
     }
     --n;
     ARY_SET_LEN(ary, n);
@@ -1512,7 +1586,7 @@ rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
     VALUE result;
 
     if (argc == 0) {
-	return rb_ary_pop(ary);
+        return rb_ary_pop(ary);
     }
 
     rb_ary_modify_check(ary);
@@ -1580,7 +1654,7 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
     long n;
 
     if (argc == 0) {
-	return rb_ary_shift(ary);
+        return rb_ary_shift(ary);
     }
 
     rb_ary_modify_check(ary);
@@ -1652,7 +1726,7 @@ ary_modify_for_unshift(VALUE ary, int argc)
     rb_ary_modify(ary);
     capa = ARY_CAPA(ary);
     if (capa - (capa >> 6) <= new_len) {
-	ary_double_capa(ary, new_len);
+        ary_double_capa(ary, new_len);
     }
 
     /* use shared array for big "queues" */
@@ -1660,20 +1734,20 @@ ary_modify_for_unshift(VALUE ary, int argc)
         ary_verify(ary);
 
         /* make a room for unshifted items */
-	capa = ARY_CAPA(ary);
-	ary_make_shared(ary);
+        capa = ARY_CAPA(ary);
+        ary_make_shared(ary);
 
         head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary);
         return make_room_for_unshift(ary, head, (void *)sharedp, argc, capa, len);
     }
     else {
-	/* sliding items */
+        /* sliding items */
         RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-	    MEMMOVE(ptr + argc, ptr, VALUE, len);
-	});
+            MEMMOVE(ptr + argc, ptr, VALUE, len);
+        });
 
         ary_verify(ary);
-	return ary;
+        return ary;
     }
 }
 
@@ -1730,8 +1804,8 @@ rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
     VALUE target_ary;
 
     if (argc == 0) {
-	rb_ary_modify_check(ary);
-	return ary;
+        rb_ary_modify_check(ary);
+        return ary;
     }
 
     target_ary = ary_ensure_room_for_unshift(ary, argc);
@@ -1753,7 +1827,7 @@ rb_ary_elt(VALUE ary, long offset)
     long len = RARRAY_LEN(ary);
     if (len == 0) return Qnil;
     if (offset < 0 || len <= offset) {
-	return Qnil;
+        return Qnil;
     }
     return RARRAY_AREF(ary, offset);
 }
@@ -1774,7 +1848,7 @@ rb_ary_subseq_step(VALUE ary, long beg, long len, long step)
     if (beg < 0 || len < 0) return Qnil;
 
     if (alen < len || alen < beg + len) {
-	len = alen - beg;
+        len = alen - beg;
     }
     klass = rb_cArray;
     if (len == 0) return ary_new(klass, 0);
@@ -1904,7 +1978,7 @@ rb_ary_aref(int argc, const VALUE *argv, VALUE ary)
 {
     rb_check_arity(argc, 1, 2);
     if (argc == 2) {
-	return rb_ary_aref2(ary, argv[0], argv[1]);
+        return rb_ary_aref2(ary, argv[0], argv[1]);
     }
     return rb_ary_aref1(ary, argv[0]);
 }
@@ -1915,7 +1989,7 @@ rb_ary_aref2(VALUE ary, VALUE b, VALUE e)
     long beg = NUM2LONG(b);
     long len = NUM2LONG(e);
     if (beg < 0) {
-	beg += RARRAY_LEN(ary);
+        beg += RARRAY_LEN(ary);
     }
     return rb_ary_subseq(ary, beg, len);
 }
@@ -1927,7 +2001,7 @@ rb_ary_aref1(VALUE ary, VALUE arg)
 
     /* special case - speeding up */
     if (FIXNUM_P(arg)) {
-	return rb_ary_entry(ary, FIX2LONG(arg));
+        return rb_ary_entry(ary, FIX2LONG(arg));
     }
     /* check if idx is Range or ArithmeticSequence */
     switch (rb_arithmetic_sequence_beg_len_step(arg, &beg, &len, &step, RARRAY_LEN(ary), 0)) {
@@ -1996,11 +2070,11 @@ static VALUE
 rb_ary_first(int argc, VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	if (RARRAY_LEN(ary) == 0) return Qnil;
-	return RARRAY_AREF(ary, 0);
+        if (RARRAY_LEN(ary) == 0) return Qnil;
+        return RARRAY_AREF(ary, 0);
     }
     else {
-	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
+        return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
     }
 }
 
@@ -2019,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]
@@ -2042,12 +2116,12 @@ VALUE
 rb_ary_last(int argc, const VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	long len = RARRAY_LEN(ary);
-	if (len == 0) return Qnil;
-	return RARRAY_AREF(ary, len-1);
+        long len = RARRAY_LEN(ary);
+        if (len == 0) return Qnil;
+        return RARRAY_AREF(ary, len-1);
     }
     else {
-	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
+        return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
     }
 }
 
@@ -2098,20 +2172,20 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
     rb_scan_args(argc, argv, "11", &pos, &ifnone);
     block_given = rb_block_given_p();
     if (block_given && argc == 2) {
-	rb_warn("block supersedes default value argument");
+        rb_warn("block supersedes default value argument");
     }
     idx = NUM2LONG(pos);
 
     if (idx < 0) {
-	idx +=  RARRAY_LEN(ary);
+        idx +=  RARRAY_LEN(ary);
     }
     if (idx < 0 || RARRAY_LEN(ary) <= idx) {
-	if (block_given) return rb_yield(pos);
-	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "index %ld outside of array bounds: %ld...%ld",
-			idx - (idx < 0 ? RARRAY_LEN(ary) : 0), -RARRAY_LEN(ary), RARRAY_LEN(ary));
-	}
-	return ifnone;
+        if (block_given) return rb_yield(pos);
+        if (argc == 1) {
+            rb_raise(rb_eIndexError, "index %ld outside of array bounds: %ld...%ld",
+                        idx - (idx < 0 ? RARRAY_LEN(ary) : 0), -RARRAY_LEN(ary), RARRAY_LEN(ary));
+        }
+        return ifnone;
     }
     return RARRAY_AREF(ary, idx);
 }
@@ -2161,23 +2235,23 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
     long i;
 
     if (argc == 0) {
-	RETURN_ENUMERATOR(ary, 0, 0);
-	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
-		return LONG2NUM(i);
-	    }
-	}
-	return Qnil;
+        RETURN_ENUMERATOR(ary, 0, 0);
+        for (i=0; i<RARRAY_LEN(ary); i++) {
+            if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
+                return LONG2NUM(i);
+            }
+        }
+        return Qnil;
     }
     rb_check_arity(argc, 0, 1);
     val = argv[0];
     if (rb_block_given_p())
-	rb_warn("given block not used");
+        rb_warn("given block not used");
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	VALUE e = RARRAY_AREF(ary, i);
-	if (rb_equal(e, val)) {
-	    return LONG2NUM(i);
-	}
+        VALUE e = RARRAY_AREF(ary, i);
+        if (rb_equal(e, val)) {
+            return LONG2NUM(i);
+        }
     }
     return Qnil;
 }
@@ -2222,25 +2296,25 @@ rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
     long i = RARRAY_LEN(ary), len;
 
     if (argc == 0) {
-	RETURN_ENUMERATOR(ary, 0, 0);
-	while (i--) {
-	    if (RTEST(rb_yield(RARRAY_AREF(ary, i))))
-		return LONG2NUM(i);
-	    if (i > (len = RARRAY_LEN(ary))) {
-		i = len;
-	    }
-	}
-	return Qnil;
+        RETURN_ENUMERATOR(ary, 0, 0);
+        while (i--) {
+            if (RTEST(rb_yield(RARRAY_AREF(ary, i))))
+                return LONG2NUM(i);
+            if (i > (len = RARRAY_LEN(ary))) {
+                i = len;
+            }
+        }
+        return Qnil;
     }
     rb_check_arity(argc, 0, 1);
     val = argv[0];
     if (rb_block_given_p())
-	rb_warn("given block not used");
+        rb_warn("given block not used");
     while (i--) {
-	VALUE e = RARRAY_AREF(ary, i);
-	if (rb_equal(e, val)) {
-	    return LONG2NUM(i);
-	}
+        VALUE e = RARRAY_AREF(ary, i);
+        if (rb_equal(e, val)) {
+            return LONG2NUM(i);
+        }
         if (i > RARRAY_LEN(ary)) {
             break;
         }
@@ -2266,54 +2340,54 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
     olen = RARRAY_LEN(ary);
     if (beg < 0) {
-	beg += olen;
-	if (beg < 0) {
-	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
-		     beg - olen, -olen);
-	}
+        beg += olen;
+        if (beg < 0) {
+            rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+                     beg - olen, -olen);
+        }
     }
     if (olen < len || olen < beg + len) {
-	len = olen - beg;
+        len = olen - beg;
     }
 
     {
         const VALUE *optr = RARRAY_CONST_PTR_TRANSIENT(ary);
-	rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1;
+        rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1;
     }
 
     if (beg >= olen) {
-	VALUE target_ary;
-	if (beg > ARY_MAX_SIZE - rlen) {
-	    rb_raise(rb_eIndexError, "index %ld too big", beg);
-	}
-	target_ary = ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */
-	len = beg + rlen;
-	ary_mem_clear(ary, olen, beg - olen);
-	if (rlen > 0) {
+        VALUE target_ary;
+        if (beg > ARY_MAX_SIZE - rlen) {
+            rb_raise(rb_eIndexError, "index %ld too big", beg);
+        }
+        target_ary = ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */
+        len = beg + rlen;
+        ary_mem_clear(ary, olen, beg - olen);
+        if (rlen > 0) {
             if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs;
-	    ary_memcpy0(ary, beg, rlen, rptr, target_ary);
-	}
-	ARY_SET_LEN(ary, len);
+            ary_memcpy0(ary, beg, rlen, rptr, target_ary);
+        }
+        ARY_SET_LEN(ary, len);
     }
     else {
-	long alen;
-
-	if (olen - len > ARY_MAX_SIZE - rlen) {
-	    rb_raise(rb_eIndexError, "index %ld too big", olen + rlen - len);
-	}
-	rb_ary_modify(ary);
-	alen = olen + rlen - len;
-	if (alen >= ARY_CAPA(ary)) {
-	    ary_double_capa(ary, alen);
-	}
-
-	if (len != rlen) {
+        long alen;
+
+        if (olen - len > ARY_MAX_SIZE - rlen) {
+            rb_raise(rb_eIndexError, "index %ld too big", olen + rlen - len);
+        }
+        rb_ary_modify(ary);
+        alen = olen + rlen - len;
+        if (alen >= ARY_CAPA(ary)) {
+            ary_double_capa(ary, alen);
+        }
+
+        if (len != rlen) {
             RARRAY_PTR_USE_TRANSIENT(ary, ptr,
                                      MEMMOVE(ptr + beg + rlen, ptr + beg + len,
                                              VALUE, olen - (beg + len)));
-	    ARY_SET_LEN(ary, alen);
-	}
-	if (rlen > 0) {
+            ARY_SET_LEN(ary, alen);
+        }
+        if (rlen > 0) {
             if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs;
             /* give up wb-protected ary */
             RB_OBJ_WB_UNPROTECT_FOR(ARRAY, ary);
@@ -2323,7 +2397,7 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
              */
             RARRAY_PTR_USE_TRANSIENT(ary, ptr,
                                      MEMMOVE(ptr + beg, rptr, VALUE, rlen));
-	}
+        }
     }
 }
 
@@ -2334,10 +2408,10 @@ rb_ary_set_len(VALUE ary, long len)
 
     rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
-	rb_raise(rb_eRuntimeError, "can't set length of shared ");
+        rb_raise(rb_eRuntimeError, "can't set length of shared ");
     }
     if (len > (capa = (long)ARY_CAPA(ary))) {
-	rb_bug("probable buffer overflow: %ld for %ld", len, capa);
+        rb_bug("probable buffer overflow: %ld for %ld", len, capa);
     }
     ARY_SET_LEN(ary, len);
 }
@@ -2351,14 +2425,14 @@ rb_ary_resize(VALUE ary, long len)
     olen = RARRAY_LEN(ary);
     if (len == olen) return ary;
     if (len > ARY_MAX_SIZE) {
-	rb_raise(rb_eIndexError, "index %ld too big", len);
+        rb_raise(rb_eIndexError, "index %ld too big", len);
     }
     if (len > olen) {
-	if (len >= ARY_CAPA(ary)) {
-	    ary_double_capa(ary, len);
-	}
-	ary_mem_clear(ary, olen, len - olen);
-	ARY_SET_LEN(ary, len);
+        if (len >= ARY_CAPA(ary)) {
+            ary_double_capa(ary, len);
+        }
+        ary_mem_clear(ary, olen, len - olen);
+        ARY_SET_LEN(ary, len);
     }
     else if (ARY_EMBED_P(ary)) {
         ARY_SET_EMBED_LEN(ary, len);
@@ -2377,11 +2451,11 @@ rb_ary_resize(VALUE ary, long len)
         if (is_malloc_ptr) ruby_sized_xfree((void *)ptr, ptr_capa);
     }
     else {
-	if (olen > len + ARY_DEFAULT_SIZE) {
+        if (olen > len + ARY_DEFAULT_SIZE) {
             size_t new_capa = ary_heap_realloc(ary, len);
             ARY_SET_CAPA(ary, new_capa);
-	}
-	ARY_SET_HEAP_LEN(ary, len);
+        }
+        ARY_SET_HEAP_LEN(ary, len);
     }
     ary_verify(ary);
     return ary;
@@ -2525,16 +2599,16 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
     rb_check_arity(argc, 2, 3);
     rb_ary_modify_check(ary);
     if (argc == 3) {
-	beg = NUM2LONG(argv[0]);
-	len = NUM2LONG(argv[1]);
+        beg = NUM2LONG(argv[0]);
+        len = NUM2LONG(argv[1]);
         return ary_aset_by_rb_ary_splice(ary, beg, len, argv[2]);
     }
     if (FIXNUM_P(argv[0])) {
-	offset = FIX2LONG(argv[0]);
+        offset = FIX2LONG(argv[0]);
         return ary_aset_by_rb_ary_store(ary, offset, argv[1]);
     }
     if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
-	/* check if idx is Range */
+        /* check if idx is Range */
         return ary_aset_by_rb_ary_splice(ary, beg, len, argv[1]);
     }
 
@@ -2588,15 +2662,15 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
     pos = NUM2LONG(argv[0]);
     if (argc == 1) return ary;
     if (pos == -1) {
-	pos = RARRAY_LEN(ary);
+        pos = RARRAY_LEN(ary);
     }
     else if (pos < 0) {
-	long minpos = -RARRAY_LEN(ary) - 1;
-	if (pos < minpos) {
-	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
-		     pos, minpos);
-	}
-	pos++;
+        long minpos = -RARRAY_LEN(ary) - 1;
+        if (pos < minpos) {
+            rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+                     pos, minpos);
+        }
+        pos++;
     }
     rb_ary_splice(ary, pos, 0, argv + 1, argc - 1);
     return ary;
@@ -2663,7 +2737,7 @@ rb_ary_each(VALUE ary)
     ary_verify(ary);
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rb_yield(RARRAY_AREF(ary, i));
+        rb_yield(RARRAY_AREF(ary, i));
     }
     return ary;
 }
@@ -2720,7 +2794,7 @@ rb_ary_each_index(VALUE ary)
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rb_yield(LONG2NUM(i));
+        rb_yield(LONG2NUM(i));
     }
     return ary;
 }
@@ -2778,12 +2852,12 @@ rb_ary_reverse_each(VALUE ary)
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     len = RARRAY_LEN(ary);
     while (len--) {
-	long nlen;
-	rb_yield(RARRAY_AREF(ary, len));
-	nlen = RARRAY_LEN(ary);
-	if (nlen < len) {
-	    len = nlen;
-	}
+        long nlen;
+        rb_yield(RARRAY_AREF(ary, len));
+        nlen = RARRAY_LEN(ary);
+        if (nlen < len) {
+            len = nlen;
+        }
     }
     return ary;
 }
@@ -2849,10 +2923,10 @@ recursive_join(VALUE obj, VALUE argp, int recur)
     int *first = (int *)arg[3];
 
     if (recur) {
-	rb_raise(rb_eArgError, "recursive array join");
+        rb_raise(rb_eArgError, "recursive array join");
     }
     else {
-	ary_join_1(obj, ary, sep, 0, result, first);
+        ary_join_1(obj, ary, sep, 0, result, first);
     }
     return Qnil;
 }
@@ -2865,11 +2939,11 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
 
     if (max > 0) rb_enc_copy(result, RARRAY_AREF(ary, 0));
     for (i=0; i<max; i++) {
-	val = RARRAY_AREF(ary, i);
+        val = RARRAY_AREF(ary, i);
         if (!RB_TYPE_P(val, T_STRING)) break;
-	if (i > 0 && !NIL_P(sep))
-	    rb_str_buf_append(result, sep);
-	rb_str_buf_append(result, val);
+        if (i > 0 && !NIL_P(sep))
+            rb_str_buf_append(result, sep);
+        rb_str_buf_append(result, val);
     }
     return i;
 }
@@ -2908,16 +2982,16 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
     VALUE val, tmp;
 
     for (; i<RARRAY_LEN(ary); i++) {
-	if (i > 0 && !NIL_P(sep))
-	    rb_str_buf_append(result, sep);
+        if (i > 0 && !NIL_P(sep))
+            rb_str_buf_append(result, sep);
 
-	val = RARRAY_AREF(ary, i);
-	if (RB_TYPE_P(val, T_STRING)) {
+        val = RARRAY_AREF(ary, i);
+        if (RB_TYPE_P(val, T_STRING)) {
             ary_join_1_str(result, val, first);
-	}
-	else if (RB_TYPE_P(val, T_ARRAY)) {
+        }
+        else if (RB_TYPE_P(val, T_ARRAY)) {
             ary_join_1_ary(val, ary, sep, result, val, first);
-	}
+        }
         else if (!NIL_P(tmp = rb_check_string_type(val))) {
             ary_join_1_str(result, tmp, first);
         }
@@ -2926,7 +3000,7 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
         }
         else {
             ary_join_1_str(result, rb_obj_as_string(val), first);
-	}
+        }
     }
 }
 
@@ -2939,26 +3013,26 @@ rb_ary_join(VALUE ary, VALUE sep)
     if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
 
     if (!NIL_P(sep)) {
-	StringValue(sep);
-	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
+        StringValue(sep);
+        len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
     }
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	val = RARRAY_AREF(ary, i);
-	tmp = rb_check_string_type(val);
+        val = RARRAY_AREF(ary, i);
+        tmp = rb_check_string_type(val);
 
-	if (NIL_P(tmp) || tmp != val) {
-	    int first;
+        if (NIL_P(tmp) || tmp != val) {
+            int first;
             long n = RARRAY_LEN(ary);
             if (i > n) i = n;
             result = rb_str_buf_new(len + (n-i)*10);
-	    rb_enc_associate(result, rb_usascii_encoding());
+            rb_enc_associate(result, rb_usascii_encoding());
             i = ary_join_0(ary, sep, i, result);
-	    first = i == 0;
-	    ary_join_1(ary, ary, sep, i, result, &first);
-	    return result;
-	}
+            first = i == 0;
+            ary_join_1(ary, ary, sep, i, result, &first);
+            return result;
+        }
 
-	len += RSTRING_LEN(tmp);
+        len += RSTRING_LEN(tmp);
     }
 
     result = rb_str_new(0, len);
@@ -3021,10 +3095,10 @@ inspect_ary(VALUE ary, VALUE dummy, int recur)
     if (recur) return rb_usascii_str_new_cstr("[...]");
     str = rb_str_buf_new2("[");
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	s = rb_inspect(RARRAY_AREF(ary, i));
-	if (i > 0) rb_str_buf_cat2(str, ", ");
-	else rb_enc_copy(str, s);
-	rb_str_buf_append(str, s);
+        s = rb_inspect(RARRAY_AREF(ary, i));
+        if (i > 0) rb_str_buf_cat2(str, ", ");
+        else rb_enc_copy(str, s);
+        rb_str_buf_append(str, s);
     }
     rb_str_buf_cat2(str, "]");
     return str;
@@ -3081,9 +3155,9 @@ static VALUE
 rb_ary_to_a(VALUE ary)
 {
     if (rb_obj_class(ary) != rb_cArray) {
-	VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
-	rb_ary_replace(dup, ary);
-	return dup;
+        VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
+        rb_ary_replace(dup, ary);
+        return dup;
     }
     return ary;
 }
@@ -3121,18 +3195,18 @@ rb_ary_to_h(VALUE ary)
     int block_given = rb_block_given_p();
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	const VALUE e = rb_ary_elt(ary, i);
-	const VALUE elt = block_given ? rb_yield_force_blockarg(e) : e;
-	const VALUE key_value_pair = rb_check_array_type(elt);
-	if (NIL_P(key_value_pair)) {
-	    rb_raise(rb_eTypeError, "wrong element type %"PRIsVALUE" at %ld (expected array)",
-		     rb_obj_class(elt), i);
-	}
-	if (RARRAY_LEN(key_value_pair) != 2) {
-	    rb_raise(rb_eArgError, "wrong array length at %ld (expected 2, was %ld)",
-		i, RARRAY_LEN(key_value_pair));
-	}
-	rb_hash_aset(hash, RARRAY_AREF(key_value_pair, 0), RARRAY_AREF(key_value_pair, 1));
+        const VALUE e = rb_ary_elt(ary, i);
+        const VALUE elt = block_given ? rb_yield_force_blockarg(e) : e;
+        const VALUE key_value_pair = rb_check_array_type(elt);
+        if (NIL_P(key_value_pair)) {
+            rb_raise(rb_eTypeError, "wrong element type %"PRIsVALUE" at %ld (expected array)",
+                     rb_obj_class(elt), i);
+        }
+        if (RARRAY_LEN(key_value_pair) != 2) {
+            rb_raise(rb_eArgError, "wrong array length at %ld (expected 2, was %ld)",
+                i, RARRAY_LEN(key_value_pair));
+        }
+        rb_hash_aset(hash, RARRAY_AREF(key_value_pair, 0), RARRAY_AREF(key_value_pair, 1));
     }
     return hash;
 }
@@ -3154,9 +3228,9 @@ static void
 ary_reverse(VALUE *p1, VALUE *p2)
 {
     while (p1 < p2) {
-	VALUE tmp = *p1;
-	*p1++ = *p2;
-	*p2-- = tmp;
+        VALUE tmp = *p1;
+        *p1++ = *p2;
+        *p2-- = tmp;
     }
 }
 
@@ -3171,7 +3245,7 @@ rb_ary_reverse(VALUE ary)
         RARRAY_PTR_USE_TRANSIENT(ary, p1, {
             p2 = p1 + len - 1;	/* points last item */
             ary_reverse(p1, p2);
-	}); /* WB: no new reference */
+        }); /* WB: no new reference */
     }
     return ary;
 }
@@ -3214,7 +3288,7 @@ rb_ary_reverse_m(VALUE ary)
     if (len > 0) {
         const VALUE *p1 = RARRAY_CONST_PTR_TRANSIENT(ary);
         VALUE *p2 = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(dup) + len - 1;
-	do *p2-- = *p1++; while (--len > 0);
+        do *p2-- = *p1++; while (--len > 0);
     }
     ARY_SET_LEN(dup, RARRAY_LEN(ary));
     return dup;
@@ -3376,11 +3450,11 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
     len = RARRAY_LEN(ary);
     rotated = rb_ary_new2(len);
     if (len > 0) {
-	cnt = rotate_count(cnt, len);
+        cnt = rotate_count(cnt, len);
         ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
-	len -= cnt;
-	ary_memcpy(rotated, 0, len, ptr + cnt);
-	ary_memcpy(rotated, len, cnt, ptr);
+        len -= cnt;
+        ary_memcpy(rotated, 0, len, ptr + cnt);
+        ary_memcpy(rotated, len, cnt, ptr);
     }
     ARY_SET_LEN(rotated, RARRAY_LEN(ary));
     return rotated;
@@ -3389,14 +3463,13 @@ 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
 sort_reentered(VALUE ary)
 {
     if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort reentered");
+        rb_raise(rb_eRuntimeError, "sort reentered");
     }
     return Qnil;
 }
@@ -3435,16 +3508,16 @@ 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 ((long)a > (long)b) return 1;
-	if ((long)a < (long)b) return -1;
-	return 0;
+    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)) {
-	return rb_str_cmp(a, b);
+    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)) {
-	return rb_float_cmp(a, b);
+    if (RB_FLOAT_TYPE_P(a) && CMP_OPTIMIZABLE(FLOAT)) {
+        return rb_float_cmp(a, b);
     }
 
     retval = rb_funcallv(a, id_cmp, 1, &b);
@@ -3501,25 +3574,23 @@ rb_ary_sort_bang(VALUE ary)
     rb_ary_modify(ary);
     assert(!ARY_SHARED_P(ary));
     if (RARRAY_LEN(ary) > 1) {
-	VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
-	struct ary_sort_data data;
-	long len = RARRAY_LEN(ary);
-	RBASIC_CLEAR_CLASS(tmp);
-	data.ary = tmp;
+        VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
+        struct ary_sort_data data;
+        long len = RARRAY_LEN(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, {
+        RARRAY_PTR_USE(tmp, ptr, {
             ruby_qsort(ptr, len, sizeof(VALUE),
                        rb_block_given_p()?sort_1:sort_2, &data);
-	}); /* WB: no new reference */
-	rb_ary_modify(ary);
+        }); /* WB: no new reference */
+        rb_ary_modify(ary);
         if (ARY_EMBED_P(tmp)) {
             if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
                 rb_ary_unshare(ary);
-		FL_SET_EMBED(ary);
+                FL_SET_EMBED(ary);
             }
-	    ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
+            ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
             ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
         }
         else {
@@ -3624,7 +3695,7 @@ rb_ary_bsearch(VALUE ary)
     VALUE index_result = rb_ary_bsearch_index(ary);
 
     if (FIXNUM_P(index_result)) {
-	return rb_ary_entry(ary, FIX2LONG(index_result));
+        return rb_ary_entry(ary, FIX2LONG(index_result));
     }
     return index_result;
 }
@@ -3647,39 +3718,39 @@ rb_ary_bsearch_index(VALUE ary)
 
     RETURN_ENUMERATOR(ary, 0, 0);
     while (low < high) {
-	mid = low + ((high - low) / 2);
-	val = rb_ary_entry(ary, mid);
-	v = rb_yield(val);
-	if (FIXNUM_P(v)) {
-	    if (v == INT2FIX(0)) return INT2FIX(mid);
-	    smaller = (SIGNED_VALUE)v < 0; /* Fixnum preserves its sign-bit */
-	}
-	else if (v == Qtrue) {
-	    satisfied = 1;
-	    smaller = 1;
-	}
-	else if (!RTEST(v)) {
-	    smaller = 0;
-	}
-	else if (rb_obj_is_kind_of(v, rb_cNumeric)) {
-	    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;
-	    }
-	}
-	else {
-	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE
-		     " (must be numeric, true, false or nil)",
-		     rb_obj_class(v));
-	}
-	if (smaller) {
-	    high = mid;
-	}
-	else {
-	    low = mid + 1;
-	}
+        mid = low + ((high - low) / 2);
+        val = rb_ary_entry(ary, mid);
+        v = rb_yield(val);
+        if (FIXNUM_P(v)) {
+            if (v == INT2FIX(0)) return INT2FIX(mid);
+            smaller = (SIGNED_VALUE)v < 0; /* Fixnum preserves its sign-bit */
+        }
+        else if (v == Qtrue) {
+            satisfied = 1;
+            smaller = 1;
+        }
+        else if (!RTEST(v)) {
+            smaller = 0;
+        }
+        else if (rb_obj_is_kind_of(v, rb_cNumeric)) {
+            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 = 0; break;
+              case -1: smaller = 1;
+            }
+        }
+        else {
+            rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE
+                     " (must be numeric, true, false or nil)",
+                     rb_obj_class(v));
+        }
+        if (smaller) {
+            high = mid;
+        }
+        else {
+            low = mid + 1;
+        }
     }
     if (!satisfied) return Qnil;
     return INT2FIX(low);
@@ -3794,7 +3865,7 @@ rb_ary_collect_bang(VALUE ary)
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY_AREF(ary, i)));
+        rb_ary_store(ary, i, rb_yield(RARRAY_AREF(ary, i)));
     }
     return ary;
 }
@@ -3806,21 +3877,21 @@ rb_get_values_at(VALUE obj, long olen, int argc, const VALUE *argv, VALUE (*func
     long beg, len, i, j;
 
     for (i=0; i<argc; i++) {
-	if (FIXNUM_P(argv[i])) {
-	    rb_ary_push(result, (*func)(obj, FIX2LONG(argv[i])));
-	    continue;
-	}
-	/* check if idx is Range */
-	if (rb_range_beg_len(argv[i], &beg, &len, olen, 1)) {
-	    long end = olen < beg+len ? olen : beg+len;
-	    for (j = beg; j < end; j++) {
-		rb_ary_push(result, (*func)(obj, j));
-	    }
-	    if (beg + len > j)
-		rb_ary_resize(result, RARRAY_LEN(result) + (beg + len) - j);
-	    continue;
-	}
-	rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
+        if (FIXNUM_P(argv[i])) {
+            rb_ary_push(result, (*func)(obj, FIX2LONG(argv[i])));
+            continue;
+        }
+        /* check if idx is Range */
+        if (rb_range_beg_len(argv[i], &beg, &len, olen, 1)) {
+            long end = olen < beg+len ? olen : beg+len;
+            for (j = beg; j < end; j++) {
+                rb_ary_push(result, (*func)(obj, j));
+            }
+            if (beg + len > j)
+                rb_ary_resize(result, RARRAY_LEN(result) + (beg + len) - j);
+            continue;
+        }
+        rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
     }
     return result;
 }
@@ -3830,25 +3901,25 @@ append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx)
 {
     long beg, len;
     if (FIXNUM_P(idx)) {
-	beg = FIX2LONG(idx);
+        beg = FIX2LONG(idx);
     }
     /* check if idx is Range */
     else if (rb_range_beg_len(idx, &beg, &len, olen, 1)) {
-	if (len > 0) {
+        if (len > 0) {
             const VALUE *const src = RARRAY_CONST_PTR_TRANSIENT(ary);
-	    const long end = beg + len;
-	    const long prevlen = RARRAY_LEN(result);
-	    if (beg < olen) {
-		rb_ary_cat(result, src + beg, end > olen ? olen-beg : len);
-	    }
-	    if (end > olen) {
-		rb_ary_store(result, prevlen + len - 1, Qnil);
-	    }
-	}
-	return result;
+            const long end = beg + len;
+            const long prevlen = RARRAY_LEN(result);
+            if (beg < olen) {
+                rb_ary_cat(result, src + beg, end > olen ? olen-beg : len);
+            }
+            if (end > olen) {
+                rb_ary_store(result, prevlen + len - 1, Qnil);
+            }
+        }
+        return result;
     }
     else {
-	beg = NUM2LONG(idx);
+        beg = NUM2LONG(idx);
     }
     return rb_ary_push(result, rb_ary_entry(ary, beg));
 }
@@ -3902,7 +3973,7 @@ rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
     long i, olen = RARRAY_LEN(ary);
     VALUE result = rb_ary_new_capa(argc);
     for (i = 0; i < argc; ++i) {
-	append_values_at_single(result, ary, olen, argv[i]);
+        append_values_at_single(result, ary, olen, argv[i]);
     }
     RB_GC_GUARD(ary);
     return result;
@@ -3939,9 +4010,9 @@ rb_ary_select(VALUE ary)
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     result = rb_ary_new2(RARRAY_LEN(ary));
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
-	    rb_ary_push(result, rb_ary_elt(ary, i));
-	}
+        if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
+            rb_ary_push(result, rb_ary_elt(ary, i));
+        }
     }
     return result;
 }
@@ -3959,12 +4030,12 @@ select_bang_i(VALUE a)
     long i1, i2;
 
     for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) {
-	VALUE v = RARRAY_AREF(ary, i1);
-	if (!RTEST(rb_yield(v))) continue;
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
-	}
-	arg->len[1] = ++i2;
+        VALUE v = RARRAY_AREF(ary, i1);
+        if (!RTEST(rb_yield(v))) continue;
+        if (i1 != i2) {
+            rb_ary_store(ary, i2, v);
+        }
+        arg->len[1] = ++i2;
     }
     return (i1 == i2) ? Qnil : ary;
 }
@@ -3978,15 +4049,15 @@ select_bang_ensure(VALUE a)
     long i1 = arg->len[0], i2 = arg->len[1];
 
     if (i2 < len && i2 < i1) {
-	long tail = 0;
+        long tail = 0;
         rb_ary_modify(ary);
-	if (i1 < len) {
-	    tail = len - i1;
+        if (i1 < len) {
+            tail = len - i1;
             RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
-		    MEMMOVE(ptr + i2, ptr + i1, VALUE, tail);
-		});
-	}
-	ARY_SET_LEN(ary, i2 + tail);
+                    MEMMOVE(ptr + i2, ptr + i1, VALUE, tail);
+                });
+        }
+        ARY_SET_LEN(ary, i2 + tail);
     }
     return ary;
 }
@@ -4058,11 +4129,11 @@ ary_resize_smaller(VALUE ary, long len)
 {
     rb_ary_modify(ary);
     if (RARRAY_LEN(ary) > len) {
-	ARY_SET_LEN(ary, len);
-	if (len * 2 < ARY_CAPA(ary) &&
-	    ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
-	    ary_resize_capa(ary, len * 2);
-	}
+        ARY_SET_LEN(ary, len);
+        if (len * 2 < ARY_CAPA(ary) &&
+            ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
+            ary_resize_capa(ary, len * 2);
+        }
     }
 }
 
@@ -4109,22 +4180,22 @@ rb_ary_delete(VALUE ary, VALUE item)
     long i1, i2;
 
     for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
-	VALUE e = RARRAY_AREF(ary, i1);
+        VALUE e = RARRAY_AREF(ary, i1);
 
-	if (rb_equal(e, item)) {
-	    v = e;
-	    continue;
-	}
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, e);
-	}
-	i2++;
+        if (rb_equal(e, item)) {
+            v = e;
+            continue;
+        }
+        if (i1 != i2) {
+            rb_ary_store(ary, i2, e);
+        }
+        i2++;
     }
     if (RARRAY_LEN(ary) == i2) {
-	if (rb_block_given_p()) {
-	    return rb_yield(item);
-	}
-	return Qnil;
+        if (rb_block_given_p()) {
+            return rb_yield(item);
+        }
+        return Qnil;
     }
 
     ary_resize_smaller(ary, i2);
@@ -4139,18 +4210,18 @@ rb_ary_delete_same(VALUE ary, VALUE item)
     long i1, i2;
 
     for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
-	VALUE e = RARRAY_AREF(ary, i1);
+        VALUE e = RARRAY_AREF(ary, i1);
 
-	if (e == item) {
-	    continue;
-	}
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, e);
-	}
-	i2++;
+        if (e == item) {
+            continue;
+        }
+        if (i1 != i2) {
+            rb_ary_store(ary, i2, e);
+        }
+        i2++;
     }
     if (RARRAY_LEN(ary) == i2) {
-	return;
+        return;
     }
 
     ary_resize_smaller(ary, i2);
@@ -4164,8 +4235,8 @@ rb_ary_delete_at(VALUE ary, long pos)
 
     if (pos >= len) return Qnil;
     if (pos < 0) {
-	pos += len;
-	if (pos < 0) return Qnil;
+        pos += len;
+        if (pos < 0) return Qnil;
     }
 
     rb_ary_modify(ary);
@@ -4317,23 +4388,23 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
     arg1 = argv[0];
 
     if (argc == 2) {
-	pos = NUM2LONG(argv[0]);
-	len = NUM2LONG(argv[1]);
+        pos = NUM2LONG(argv[0]);
+        len = NUM2LONG(argv[1]);
         return ary_slice_bang_by_rb_ary_splice(ary, pos, len);
     }
 
     if (!FIXNUM_P(arg1)) {
-	switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
-	  case Qtrue:
-	    /* valid range */
+        switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
+          case Qtrue:
+            /* valid range */
             return ary_slice_bang_by_rb_ary_splice(ary, pos, len);
-	  case Qnil:
-	    /* invalid range */
-	    return Qnil;
-	  default:
-	    /* not a range */
-	    break;
-	}
+          case Qnil:
+            /* invalid range */
+            return Qnil;
+          default:
+            /* not a range */
+            break;
+        }
     }
 
     return rb_ary_delete_at(ary, NUM2LONG(arg1));
@@ -4345,11 +4416,11 @@ ary_reject(VALUE orig, VALUE result)
     long i;
 
     for (i = 0; i < RARRAY_LEN(orig); i++) {
-	VALUE v = RARRAY_AREF(orig, i);
+        VALUE v = RARRAY_AREF(orig, i);
 
         if (!RTEST(rb_yield(v))) {
-	    rb_ary_push(result, v);
-	}
+            rb_ary_push(result, v);
+        }
     }
     return result;
 }
@@ -4362,12 +4433,12 @@ reject_bang_i(VALUE a)
     long i1, i2;
 
     for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) {
-	VALUE v = RARRAY_AREF(ary, i1);
-	if (RTEST(rb_yield(v))) continue;
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
-	}
-	arg->len[1] = ++i2;
+        VALUE v = RARRAY_AREF(ary, i1);
+        if (RTEST(rb_yield(v))) continue;
+        if (i1 != i2) {
+            rb_ary_store(ary, i2, v);
+        }
+        arg->len[1] = ++i2;
     }
     return (i1 == i2) ? Qnil : ary;
 }
@@ -4488,9 +4559,9 @@ 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)
-	rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
-		 rb_obj_class(obj));
+    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;
 }
 
@@ -4559,51 +4630,51 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
     VALUE result = Qnil;
 
     for (i=0; i<argc; i++) {
-	argv[i] = take_items(argv[i], len);
+        argv[i] = take_items(argv[i], len);
     }
 
     if (rb_block_given_p()) {
-	int arity = rb_block_arity();
-
-	if (arity > 1) {
-	    VALUE work, *tmp;
-
-	    tmp = ALLOCV_N(VALUE, work, argc+1);
-
-	    for (i=0; i<RARRAY_LEN(ary); i++) {
-		tmp[0] = RARRAY_AREF(ary, i);
-		for (j=0; j<argc; j++) {
-		    tmp[j+1] = rb_ary_elt(argv[j], i);
-		}
-		rb_yield_values2(argc+1, tmp);
-	    }
-
-	    if (work) ALLOCV_END(work);
-	}
-	else {
-	    for (i=0; i<RARRAY_LEN(ary); i++) {
-		VALUE tmp = rb_ary_new2(argc+1);
-
-		rb_ary_push(tmp, RARRAY_AREF(ary, i));
-		for (j=0; j<argc; j++) {
-		    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
-		}
-		rb_yield(tmp);
-	    }
-	}
+        int arity = rb_block_arity();
+
+        if (arity > 1) {
+            VALUE work, *tmp;
+
+            tmp = ALLOCV_N(VALUE, work, argc+1);
+
+            for (i=0; i<RARRAY_LEN(ary); i++) {
+                tmp[0] = RARRAY_AREF(ary, i);
+                for (j=0; j<argc; j++) {
+                    tmp[j+1] = rb_ary_elt(argv[j], i);
+                }
+                rb_yield_values2(argc+1, tmp);
+            }
+
+            if (work) ALLOCV_END(work);
+        }
+        else {
+            for (i=0; i<RARRAY_LEN(ary); i++) {
+                VALUE tmp = rb_ary_new2(argc+1);
+
+                rb_ary_push(tmp, RARRAY_AREF(ary, i));
+                for (j=0; j<argc; j++) {
+                    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+                }
+                rb_yield(tmp);
+            }
+        }
     }
     else {
-	result = rb_ary_new_capa(len);
+        result = rb_ary_new_capa(len);
 
-	for (i=0; i<len; i++) {
-	    VALUE tmp = rb_ary_new_capa(argc+1);
+        for (i=0; i<len; i++) {
+            VALUE tmp = rb_ary_new_capa(argc+1);
 
-	    rb_ary_push(tmp, RARRAY_AREF(ary, i));
-	    for (j=0; j<argc; j++) {
-		rb_ary_push(tmp, rb_ary_elt(argv[j], i));
-	    }
-	    rb_ary_push(result, tmp);
-	}
+            rb_ary_push(tmp, RARRAY_AREF(ary, i));
+            for (j=0; j<argc; j++) {
+                rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+            }
+            rb_ary_push(result, tmp);
+        }
     }
 
     return result;
@@ -4630,21 +4701,21 @@ rb_ary_transpose(VALUE ary)
     alen = RARRAY_LEN(ary);
     if (alen == 0) return rb_ary_dup(ary);
     for (i=0; i<alen; i++) {
-	tmp = to_ary(rb_ary_elt(ary, i));
-	if (elen < 0) {		/* first element */
-	    elen = RARRAY_LEN(tmp);
-	    result = rb_ary_new2(elen);
-	    for (j=0; j<elen; j++) {
-		rb_ary_store(result, j, rb_ary_new2(alen));
-	    }
-	}
-	else if (elen != RARRAY_LEN(tmp)) {
-	    rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)",
-		     RARRAY_LEN(tmp), elen);
-	}
-	for (j=0; j<elen; j++) {
-	    rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
-	}
+        tmp = to_ary(rb_ary_elt(ary, i));
+        if (elen < 0) {		/* first element */
+            elen = RARRAY_LEN(tmp);
+            result = rb_ary_new2(elen);
+            for (j=0; j<elen; j++) {
+                rb_ary_store(result, j, rb_ary_new2(alen));
+            }
+        }
+        else if (elen != RARRAY_LEN(tmp)) {
+            rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)",
+                     RARRAY_LEN(tmp), elen);
+        }
+        for (j=0; j<elen; j++) {
+            rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
+        }
     }
     return result;
 }
@@ -4721,11 +4792,11 @@ rb_ary_clear(VALUE ary)
 {
     rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
-	if (!ARY_EMBED_P(ary)) {
-	    rb_ary_unshare(ary);
-	    FL_SET_EMBED(ary);
+        if (!ARY_EMBED_P(ary)) {
+            rb_ary_unshare(ary);
+            FL_SET_EMBED(ary);
             ARY_SET_EMBED_LEN(ary, 0);
-	}
+        }
     }
     else {
         ARY_SET_LEN(ary, 0);
@@ -4940,59 +5011,59 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
     long beg = 0, end = 0, len = 0;
 
     if (rb_block_given_p()) {
-	rb_scan_args(argc, argv, "02", &arg1, &arg2);
-	argc += 1;		/* hackish */
+        rb_scan_args(argc, argv, "02", &arg1, &arg2);
+        argc += 1;		/* hackish */
     }
     else {
-	rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
+        rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
     }
     switch (argc) {
       case 1:
-	beg = 0;
-	len = RARRAY_LEN(ary);
-	break;
+        beg = 0;
+        len = RARRAY_LEN(ary);
+        break;
       case 2:
-	if (rb_range_beg_len(arg1, &beg, &len, RARRAY_LEN(ary), 1)) {
-	    break;
-	}
-	/* fall through */
+        if (rb_range_beg_len(arg1, &beg, &len, RARRAY_LEN(ary), 1)) {
+            break;
+        }
+        /* fall through */
       case 3:
-	beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
-	if (beg < 0) {
-	    beg = RARRAY_LEN(ary) + beg;
-	    if (beg < 0) beg = 0;
-	}
-	len = NIL_P(arg2) ? RARRAY_LEN(ary) - beg : NUM2LONG(arg2);
-	break;
+        beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
+        if (beg < 0) {
+            beg = RARRAY_LEN(ary) + beg;
+            if (beg < 0) beg = 0;
+        }
+        len = NIL_P(arg2) ? RARRAY_LEN(ary) - beg : NUM2LONG(arg2);
+        break;
     }
     rb_ary_modify(ary);
     if (len < 0) {
         return ary;
     }
     if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) {
-	rb_raise(rb_eArgError, "argument too big");
+        rb_raise(rb_eArgError, "argument too big");
     }
     end = beg + len;
     if (RARRAY_LEN(ary) < end) {
-	if (end >= ARY_CAPA(ary)) {
-	    ary_resize_capa(ary, end);
-	}
-	ary_mem_clear(ary, RARRAY_LEN(ary), end - RARRAY_LEN(ary));
-	ARY_SET_LEN(ary, end);
+        if (end >= ARY_CAPA(ary)) {
+            ary_resize_capa(ary, end);
+        }
+        ary_mem_clear(ary, RARRAY_LEN(ary), end - RARRAY_LEN(ary));
+        ARY_SET_LEN(ary, end);
     }
 
-    if (item == Qundef) {
-	VALUE v;
-	long i;
+    if (UNDEF_P(item)) {
+        VALUE v;
+        long i;
 
-	for (i=beg; i<end; i++) {
-	    v = rb_yield(LONG2NUM(i));
-	    if (i>=RARRAY_LEN(ary)) break;
-	    ARY_SET(ary, i, v);
-	}
+        for (i=beg; i<end; i++) {
+            v = rb_yield(LONG2NUM(i));
+            if (i>=RARRAY_LEN(ary)) break;
+            ARY_SET(ary, i, v);
+        }
     }
     else {
-	ary_memfill(ary, beg, len, item);
+        ary_memfill(ary, beg, len, item);
     }
     return ary;
 }
@@ -5055,15 +5126,15 @@ rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
     rb_ary_modify_check(ary);
 
     if (argc == 1) {
-	rb_ary_concat(ary, argv[0]);
+        rb_ary_concat(ary, argv[0]);
     }
     else if (argc > 1) {
-	int i;
-	VALUE args = rb_ary_tmp_new(argc);
-	for (i = 0; i < argc; i++) {
-	    rb_ary_concat(args, argv[i]);
-	}
-	ary_append(ary, args);
+        int i;
+        VALUE args = rb_ary_hidden_new(argc);
+        for (i = 0; i < argc; i++) {
+            rb_ary_concat(args, argv[i]);
+        }
+        ary_append(ary, args);
     }
 
     ary_verify(ary);
@@ -5103,19 +5174,19 @@ rb_ary_times(VALUE ary, VALUE times)
 
     tmp = rb_check_string_type(times);
     if (!NIL_P(tmp)) {
-	return rb_ary_join(ary, tmp);
+        return rb_ary_join(ary, tmp);
     }
 
     len = NUM2LONG(times);
     if (len == 0) {
         ary2 = ary_new(rb_cArray, 0);
-	goto out;
+        goto out;
     }
     if (len < 0) {
-	rb_raise(rb_eArgError, "negative argument");
+        rb_raise(rb_eArgError, "negative argument");
     }
     if (ARY_MAX_SIZE/len < RARRAY_LEN(ary)) {
-	rb_raise(rb_eArgError, "argument too big");
+        rb_raise(rb_eArgError, "argument too big");
     }
     len *= RARRAY_LEN(ary);
 
@@ -5125,8 +5196,8 @@ rb_ary_times(VALUE ary, VALUE times)
     ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
     t = RARRAY_LEN(ary);
     if (0 < t) {
-	ary_memcpy(ary2, 0, t, ptr);
-	while (t <= len/2) {
+        ary_memcpy(ary2, 0, t, ptr);
+        while (t <= len/2) {
             ary_memcpy(ary2, t, t, RARRAY_CONST_PTR_TRANSIENT(ary2));
             t *= 2;
         }
@@ -5160,10 +5231,10 @@ rb_ary_assoc(VALUE ary, VALUE key)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = rb_check_array_type(RARRAY_AREF(ary, i));
-	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
-	    rb_equal(RARRAY_AREF(v, 0), key))
-	    return v;
+        v = rb_check_array_type(RARRAY_AREF(ary, i));
+        if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
+            rb_equal(RARRAY_AREF(v, 0), key))
+            return v;
     }
     return Qnil;
 }
@@ -5190,11 +5261,11 @@ rb_ary_rassoc(VALUE ary, VALUE value)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = RARRAY_AREF(ary, i);
-	if (RB_TYPE_P(v, T_ARRAY) &&
-	    RARRAY_LEN(v) > 1 &&
-	    rb_equal(RARRAY_AREF(v, 1), value))
-	    return v;
+        v = RARRAY_AREF(ary, i);
+        if (RB_TYPE_P(v, T_ARRAY) &&
+            RARRAY_LEN(v) > 1 &&
+            rb_equal(RARRAY_AREF(v, 1), value))
+            return v;
     }
     return Qnil;
 }
@@ -5213,22 +5284,22 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
     len1 = RARRAY_LEN(ary1);
 
     for (i = 0; i < len1; i++) {
-	if (*p1 != *p2) {
-	    if (rb_equal(*p1, *p2)) {
-		len1 = RARRAY_LEN(ary1);
-		if (len1 != RARRAY_LEN(ary2))
-		    return Qfalse;
-		if (len1 < i)
-		    return Qtrue;
+        if (*p1 != *p2) {
+            if (rb_equal(*p1, *p2)) {
+                len1 = RARRAY_LEN(ary1);
+                if (len1 != RARRAY_LEN(ary2))
+                    return Qfalse;
+                if (len1 < i)
+                    return Qtrue;
                 p1 = RARRAY_CONST_PTR(ary1) + i;
                 p2 = RARRAY_CONST_PTR(ary2) + i;
-	    }
-	    else {
-		return Qfalse;
-	    }
-	}
-	p1++;
-	p2++;
+            }
+            else {
+                return Qfalse;
+            }
+        }
+        p1++;
+        p2++;
     }
     return Qtrue;
 }
@@ -5256,10 +5327,10 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
     if (!RB_TYPE_P(ary2, T_ARRAY)) {
-	if (!rb_respond_to(ary2, idTo_ary)) {
-	    return Qfalse;
-	}
-	return rb_equal(ary2, ary1);
+        if (!rb_respond_to(ary2, idTo_ary)) {
+            return Qfalse;
+        }
+        return rb_equal(ary2, ary1);
     }
     if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
     if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue;
@@ -5273,8 +5344,8 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
 
     if (recur) return Qtrue; /* Subtle! */
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-	if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
-	    return Qfalse;
+        if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+            return Qfalse;
     }
     return Qtrue;
 }
@@ -5329,8 +5400,8 @@ rb_ary_hash(VALUE ary)
     h = rb_hash_start(RARRAY_LEN(ary));
     h = rb_hash_uint(h, (st_index_t)rb_ary_hash);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	n = rb_hash(RARRAY_AREF(ary, i));
-	h = rb_hash_uint(h, NUM2LONG(n));
+        n = rb_hash(RARRAY_AREF(ary, i));
+        h = rb_hash_uint(h, NUM2LONG(n));
     }
     h = rb_hash_end(h);
     return ST2FIX(h);
@@ -5354,10 +5425,10 @@ rb_ary_includes(VALUE ary, VALUE item)
     VALUE e;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	e = RARRAY_AREF(ary, i);
-	if (rb_equal(e, item)) {
-	    return Qtrue;
-	}
+        e = RARRAY_AREF(ary, i);
+        if (rb_equal(e, item)) {
+            return Qtrue;
+        }
     }
     return Qfalse;
 }
@@ -5369,10 +5440,10 @@ rb_ary_includes_by_eql(VALUE ary, VALUE item)
     VALUE e;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	e = RARRAY_AREF(ary, i);
-	if (rb_eql(item, e)) {
-	    return Qtrue;
-	}
+        e = RARRAY_AREF(ary, i);
+        if (rb_eql(item, e)) {
+            return Qtrue;
+        }
     }
     return Qfalse;
 }
@@ -5385,14 +5456,14 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
     if (recur) return Qundef;	/* Subtle! */
     len = RARRAY_LEN(ary1);
     if (len > RARRAY_LEN(ary2)) {
-	len = RARRAY_LEN(ary2);
+        len = RARRAY_LEN(ary2);
     }
     for (i=0; i<len; i++) {
-	VALUE e1 = rb_ary_elt(ary1, i), e2 = rb_ary_elt(ary2, i);
-	VALUE v = rb_funcallv(e1, id_cmp, 1, &e2);
-	if (v != INT2FIX(0)) {
-	    return v;
-	}
+        VALUE e1 = rb_ary_elt(ary1, i), e2 = rb_ary_elt(ary2, i);
+        VALUE v = rb_funcallv(e1, id_cmp, 1, &e2);
+        if (v != INT2FIX(0)) {
+            return v;
+        }
     }
     return Qundef;
 }
@@ -5438,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);
@@ -5451,8 +5522,8 @@ ary_add_hash(VALUE hash, VALUE ary)
     long i;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	VALUE elt = RARRAY_AREF(ary, i);
-	rb_hash_add_new_element(hash, elt, elt);
+        VALUE elt = RARRAY_AREF(ary, i);
+        rb_hash_add_new_element(hash, elt, elt);
     }
     return hash;
 }
@@ -5480,8 +5551,8 @@ ary_add_hash_by(VALUE hash, VALUE ary)
     long i;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	VALUE v = rb_ary_elt(ary, i), k = rb_yield(v);
-	rb_hash_add_new_element(hash, k, v);
+        VALUE v = rb_ary_elt(ary, i), k = rb_yield(v);
+        rb_hash_add_new_element(hash, k, v);
     }
     return hash;
 }
@@ -5499,7 +5570,7 @@ ary_recycle_hash(VALUE hash)
     assert(RBASIC_CLASS(hash) == 0);
     if (RHASH_ST_TABLE_P(hash)) {
         st_table *tbl = RHASH_ST_TABLE(hash);
-	st_free_table(tbl);
+        st_free_table(tbl);
         RHASH_ST_CLEAR(hash);
     }
 }
@@ -5520,7 +5591,7 @@ ary_recycle_hash(VALUE hash)
  *  Related: Array#difference.
  */
 
-static VALUE
+VALUE
 rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
@@ -5532,18 +5603,18 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
     ary3 = rb_ary_new();
 
     if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN || RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
-	for (i=0; i<RARRAY_LEN(ary1); i++) {
-	    VALUE elt = rb_ary_elt(ary1, i);
-	    if (rb_ary_includes_by_eql(ary2, elt)) continue;
-	    rb_ary_push(ary3, elt);
-	}
-	return ary3;
+        for (i=0; i<RARRAY_LEN(ary1); i++) {
+            VALUE elt = rb_ary_elt(ary1, i);
+            if (rb_ary_includes_by_eql(ary2, elt)) continue;
+            rb_ary_push(ary3, elt);
+        }
+        return ary3;
     }
 
     hash = ary_make_hash(ary2);
     for (i=0; i<RARRAY_LEN(ary1); i++) {
         if (rb_hash_stlike_lookup(hash, RARRAY_AREF(ary1, i), NULL)) continue;
-	rb_ary_push(ary3, rb_ary_elt(ary1, i));
+        rb_ary_push(ary3, rb_ary_elt(ary1, i));
     }
     ary_recycle_hash(hash);
     return ary3;
@@ -5633,23 +5704,23 @@ rb_ary_and(VALUE ary1, VALUE ary2)
     if (RARRAY_LEN(ary1) == 0 || RARRAY_LEN(ary2) == 0) return ary3;
 
     if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN && RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
-	for (i=0; i<RARRAY_LEN(ary1); i++) {
-	    v = RARRAY_AREF(ary1, i);
-	    if (!rb_ary_includes_by_eql(ary2, v)) continue;
-	    if (rb_ary_includes_by_eql(ary3, v)) continue;
-	    rb_ary_push(ary3, v);
-	}
-	return ary3;
+        for (i=0; i<RARRAY_LEN(ary1); i++) {
+            v = RARRAY_AREF(ary1, i);
+            if (!rb_ary_includes_by_eql(ary2, v)) continue;
+            if (rb_ary_includes_by_eql(ary3, v)) continue;
+            rb_ary_push(ary3, v);
+        }
+        return ary3;
     }
 
     hash = ary_make_hash(ary2);
 
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-	v = RARRAY_AREF(ary1, i);
-	vv = (st_data_t)v;
+        v = RARRAY_AREF(ary1, i);
+        vv = (st_data_t)v;
         if (rb_hash_stlike_delete(hash, &vv, 0)) {
-	    rb_ary_push(ary3, v);
-	}
+            rb_ary_push(ary3, v);
+        }
     }
     ary_recycle_hash(hash);
 
@@ -5742,10 +5813,10 @@ rb_ary_or(VALUE ary1, VALUE ary2)
 
     ary2 = to_ary(ary2);
     if (RARRAY_LEN(ary1) + RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
-	ary3 = rb_ary_new();
+        ary3 = rb_ary_new();
         rb_ary_union(ary3, ary1);
         rb_ary_union(ary3, ary2);
-	return ary3;
+        return ary3;
     }
 
     hash = ary_make_hash(ary1);
@@ -5989,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;
@@ -5999,23 +6069,23 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
 
     const long n = RARRAY_LEN(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) {
-	       result = v;
-	   }
-	}
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+           v = RARRAY_AREF(ary, i);
+           if (UNDEF_P(result) || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) {
+               result = v;
+           }
+        }
     }
     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 {
@@ -6023,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;
 }
 
@@ -6158,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;
@@ -6168,23 +6237,23 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
 
     const long n = RARRAY_LEN(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) {
-	       result = v;
-	   }
-	}
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+           v = RARRAY_AREF(ary, i);
+           if (UNDEF_P(result) || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) {
+               result = v;
+           }
+        }
     }
     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 {
@@ -6192,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;
 }
 
@@ -6274,19 +6343,19 @@ rb_ary_uniq_bang(VALUE ary)
     if (RARRAY_LEN(ary) <= 1)
         return Qnil;
     if (rb_block_given_p())
-	hash = ary_make_hash_by(ary);
+        hash = ary_make_hash_by(ary);
     else
-	hash = ary_make_hash(ary);
+        hash = ary_make_hash(ary);
 
     hash_size = RHASH_SIZE(hash);
     if (RARRAY_LEN(ary) == hash_size) {
-	return Qnil;
+        return Qnil;
     }
     rb_ary_modify_check(ary);
     ARY_SET_LEN(ary, 0);
     if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
-	rb_ary_unshare(ary);
-	FL_SET_EMBED(ary);
+        rb_ary_unshare(ary);
+        FL_SET_EMBED(ary);
     }
     ary_resize_capa(ary, hash_size);
     rb_hash_foreach(hash, push_value, ary);
@@ -6328,12 +6397,12 @@ rb_ary_uniq(VALUE ary)
         uniq = rb_ary_dup(ary);
     }
     else if (rb_block_given_p()) {
-	hash = ary_make_hash_by(ary);
-	uniq = rb_hash_values(hash);
+        hash = ary_make_hash_by(ary);
+        uniq = rb_hash_values(hash);
     }
     else {
-	hash = ary_make_hash(ary);
-	uniq = rb_hash_values(hash);
+        hash = ary_make_hash(ary);
+        uniq = rb_hash_values(hash);
     }
     if (hash) {
         ary_recycle_hash(hash);
@@ -6362,12 +6431,12 @@ rb_ary_compact_bang(VALUE ary)
     end = p + RARRAY_LEN(ary);
 
     while (t < end) {
-	if (NIL_P(*t)) t++;
-	else *p++ = *t++;
+        if (NIL_P(*t)) t++;
+        else *p++ = *t++;
     }
     n = p - RARRAY_CONST_PTR_TRANSIENT(ary);
     if (RARRAY_LEN(ary) == n) {
-	return Qnil;
+        return Qnil;
     }
     ary_resize_smaller(ary, n);
 
@@ -6425,25 +6494,25 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
     long i, n = 0;
 
     if (rb_check_arity(argc, 0, 1) == 0) {
-	VALUE v;
+        VALUE v;
 
-	if (!rb_block_given_p())
-	    return LONG2NUM(RARRAY_LEN(ary));
+        if (!rb_block_given_p())
+            return LONG2NUM(RARRAY_LEN(ary));
 
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    v = RARRAY_AREF(ary, i);
-	    if (RTEST(rb_yield(v))) n++;
-	}
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            v = RARRAY_AREF(ary, i);
+            if (RTEST(rb_yield(v))) n++;
+        }
     }
     else {
         VALUE obj = argv[0];
 
-	if (rb_block_given_p()) {
-	    rb_warn("given block not used");
-	}
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    if (rb_equal(RARRAY_AREF(ary, i), obj)) n++;
-	}
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            if (rb_equal(RARRAY_AREF(ary, i), obj)) n++;
+        }
     }
 
     return LONG2NUM(n);
@@ -6477,64 +6546,64 @@ flatten(VALUE ary, int level)
     rb_ary_push(stack, LONG2NUM(i + 1));
 
     if (level < 0) {
-	vmemo = rb_hash_new();
-	RBASIC_CLEAR_CLASS(vmemo);
-	memo = st_init_numtable();
-	rb_hash_st_table_set(vmemo, memo);
-	st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
-	st_insert(memo, (st_data_t)tmp, (st_data_t)Qtrue);
+        vmemo = rb_hash_new();
+        RBASIC_CLEAR_CLASS(vmemo);
+        memo = st_init_numtable();
+        rb_hash_st_table_set(vmemo, memo);
+        st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
+        st_insert(memo, (st_data_t)tmp, (st_data_t)Qtrue);
     }
 
     ary = tmp;
     i = 0;
 
     while (1) {
-	while (i < RARRAY_LEN(ary)) {
-	    elt = RARRAY_AREF(ary, i++);
-	    if (level >= 0 && RARRAY_LEN(stack) / 2 >= level) {
-		rb_ary_push(result, elt);
-		continue;
-	    }
-	    tmp = rb_check_array_type(elt);
-	    if (RBASIC(result)->klass) {
-		if (memo) {
-		    RB_GC_GUARD(vmemo);
-		    st_clear(memo);
-		}
-		rb_raise(rb_eRuntimeError, "flatten reentered");
-	    }
-	    if (NIL_P(tmp)) {
-		rb_ary_push(result, elt);
-	    }
-	    else {
-		if (memo) {
-		    id = (st_data_t)tmp;
-		    if (st_is_member(memo, id)) {
-			st_clear(memo);
-			rb_raise(rb_eArgError, "tried to flatten recursive array");
-		    }
-		    st_insert(memo, id, (st_data_t)Qtrue);
-		}
-		rb_ary_push(stack, ary);
-		rb_ary_push(stack, LONG2NUM(i));
-		ary = tmp;
-		i = 0;
-	    }
-	}
-	if (RARRAY_LEN(stack) == 0) {
-	    break;
-	}
-	if (memo) {
-	    id = (st_data_t)ary;
-	    st_delete(memo, &id, 0);
-	}
-	tmp = rb_ary_pop(stack);
-	i = NUM2LONG(tmp);
-	ary = rb_ary_pop(stack);
+        while (i < RARRAY_LEN(ary)) {
+            elt = RARRAY_AREF(ary, i++);
+            if (level >= 0 && RARRAY_LEN(stack) / 2 >= level) {
+                rb_ary_push(result, elt);
+                continue;
+            }
+            tmp = rb_check_array_type(elt);
+            if (RBASIC(result)->klass) {
+                if (memo) {
+                    RB_GC_GUARD(vmemo);
+                    st_clear(memo);
+                }
+                rb_raise(rb_eRuntimeError, "flatten reentered");
+            }
+            if (NIL_P(tmp)) {
+                rb_ary_push(result, elt);
+            }
+            else {
+                if (memo) {
+                    id = (st_data_t)tmp;
+                    if (st_is_member(memo, id)) {
+                        st_clear(memo);
+                        rb_raise(rb_eArgError, "tried to flatten recursive array");
+                    }
+                    st_insert(memo, id, (st_data_t)Qtrue);
+                }
+                rb_ary_push(stack, ary);
+                rb_ary_push(stack, LONG2NUM(i));
+                ary = tmp;
+                i = 0;
+            }
+        }
+        if (RARRAY_LEN(stack) == 0) {
+            break;
+        }
+        if (memo) {
+            id = (st_data_t)ary;
+            st_delete(memo, &id, 0);
+        }
+        tmp = rb_ary_pop(stack);
+        i = NUM2LONG(tmp);
+        ary = rb_ary_pop(stack);
     }
 
     if (memo) {
-	st_clear(memo);
+        st_clear(memo);
     }
 
     RBASIC_SET_CLASS(result, rb_cArray);
@@ -6585,7 +6654,7 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
 
     result = flatten(ary, level);
     if (result == ary) {
-	return Qnil;
+        return Qnil;
     }
     if (!(mod = ARY_EMBED_P(result))) rb_obj_freeze(result);
     rb_ary_replace(ary, result);
@@ -6656,16 +6725,16 @@ rb_ary_shuffle_bang(rb_execution_context_t *ec, VALUE ary, VALUE randgen)
     rb_ary_modify(ary);
     i = len = RARRAY_LEN(ary);
     RARRAY_PTR_USE(ary, ptr, {
-	while (i) {
-	    long j = RAND_UPTO(i);
-	    VALUE tmp;
+        while (i) {
+            long j = RAND_UPTO(i);
+            VALUE tmp;
             if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR_TRANSIENT(ary)) {
                 rb_raise(rb_eRuntimeError, "modified during shuffle");
-	    }
-	    tmp = ptr[--i];
-	    ptr[i] = ptr[j];
-	    ptr[j] = tmp;
-	}
+            }
+            tmp = ptr[--i];
+            ptr[i] = ptr[j];
+            ptr[j] = tmp;
+        }
     }); /* WB: no new reference */
     return ary;
 }
@@ -6688,120 +6757,120 @@ ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE
 
     len = RARRAY_LEN(ary);
     if (!to_array) {
-	if (len < 2)
-	    i = 0;
-	else
-	    i = RAND_UPTO(len);
+        if (len < 2)
+            i = 0;
+        else
+            i = RAND_UPTO(len);
 
-	return rb_ary_elt(ary, i);
+        return rb_ary_elt(ary, i);
     }
     n = NUM2LONG(nv);
     if (n < 0) rb_raise(rb_eArgError, "negative sample number");
     if (n > len) n = len;
     if (n <= numberof(idx)) {
-	for (i = 0; i < n; ++i) {
-	    rnds[i] = RAND_UPTO(len - i);
-	}
+        for (i = 0; i < n; ++i) {
+            rnds[i] = RAND_UPTO(len - i);
+        }
     }
     k = len;
     len = RARRAY_LEN(ary);
     if (len < k && n <= numberof(idx)) {
-	for (i = 0; i < n; ++i) {
-	    if (rnds[i] >= len) return rb_ary_new_capa(0);
-	}
+        for (i = 0; i < n; ++i) {
+            if (rnds[i] >= len) return rb_ary_new_capa(0);
+        }
     }
     if (n > len) n = len;
     switch (n) {
       case 0:
-	return rb_ary_new_capa(0);
+        return rb_ary_new_capa(0);
       case 1:
-	i = rnds[0];
-	return rb_ary_new_from_args(1, RARRAY_AREF(ary, i));
+        i = rnds[0];
+        return rb_ary_new_from_args(1, RARRAY_AREF(ary, i));
       case 2:
-	i = rnds[0];
-	j = rnds[1];
-	if (j >= i) j++;
-	return rb_ary_new_from_args(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j));
+        i = rnds[0];
+        j = rnds[1];
+        if (j >= i) j++;
+        return rb_ary_new_from_args(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j));
       case 3:
-	i = rnds[0];
-	j = rnds[1];
-	k = rnds[2];
-	{
-	    long l = j, g = i;
-	    if (j >= i) l = i, g = ++j;
-	    if (k >= l && (++k >= g)) ++k;
-	}
-	return rb_ary_new_from_args(3, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j), RARRAY_AREF(ary, k));
+        i = rnds[0];
+        j = rnds[1];
+        k = rnds[2];
+        {
+            long l = j, g = i;
+            if (j >= i) l = i, g = ++j;
+            if (k >= l && (++k >= g)) ++k;
+        }
+        return rb_ary_new_from_args(3, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j), RARRAY_AREF(ary, k));
     }
     memo_threshold =
-	len < 2560 ? len / 128 :
-	len < 5120 ? len / 64 :
-	len < 10240 ? len / 32 :
-	len / 16;
+        len < 2560 ? len / 128 :
+        len < 5120 ? len / 64 :
+        len < 10240 ? len / 32 :
+        len / 16;
     if (n <= numberof(idx)) {
-	long sorted[numberof(idx)];
-	sorted[0] = idx[0] = rnds[0];
-	for (i=1; i<n; i++) {
-	    k = rnds[i];
-	    for (j = 0; j < i; ++j) {
-		if (k < sorted[j]) break;
-		++k;
-	    }
-	    memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
-	    sorted[j] = idx[i] = k;
-	}
-	result = rb_ary_new_capa(n);
+        long sorted[numberof(idx)];
+        sorted[0] = idx[0] = rnds[0];
+        for (i=1; i<n; i++) {
+            k = rnds[i];
+            for (j = 0; j < i; ++j) {
+                if (k < sorted[j]) break;
+                ++k;
+            }
+            memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
+            sorted[j] = idx[i] = k;
+        }
+        result = rb_ary_new_capa(n);
         RARRAY_PTR_USE_TRANSIENT(result, ptr_result, {
-	    for (i=0; i<n; i++) {
-		ptr_result[i] = RARRAY_AREF(ary, idx[i]);
-	    }
-	});
+            for (i=0; i<n; i++) {
+                ptr_result[i] = RARRAY_AREF(ary, idx[i]);
+            }
+        });
     }
     else if (n <= memo_threshold / 2) {
-	long max_idx = 0;
+        long max_idx = 0;
 #undef RUBY_UNTYPED_DATA_WARNING
 #define RUBY_UNTYPED_DATA_WARNING 0
-	VALUE vmemo = Data_Wrap_Struct(0, 0, st_free_table, 0);
-	st_table *memo = st_init_numtable_with_size(n);
-	DATA_PTR(vmemo) = memo;
-	result = rb_ary_new_capa(n);
-	RARRAY_PTR_USE(result, ptr_result, {
-	    for (i=0; i<n; i++) {
-		long r = RAND_UPTO(len-i) + i;
-		ptr_result[i] = r;
-		if (r > max_idx) max_idx = r;
-	    }
-	    len = RARRAY_LEN(ary);
-	    if (len <= max_idx) n = 0;
-	    else if (n > len) n = len;
+        VALUE vmemo = Data_Wrap_Struct(0, 0, st_free_table, 0);
+        st_table *memo = st_init_numtable_with_size(n);
+        DATA_PTR(vmemo) = memo;
+        result = rb_ary_new_capa(n);
+        RARRAY_PTR_USE(result, ptr_result, {
+            for (i=0; i<n; i++) {
+                long r = RAND_UPTO(len-i) + i;
+                ptr_result[i] = r;
+                if (r > max_idx) max_idx = r;
+            }
+            len = RARRAY_LEN(ary);
+            if (len <= max_idx) n = 0;
+            else if (n > len) n = len;
             RARRAY_PTR_USE_TRANSIENT(ary, ptr_ary, {
-		for (i=0; i<n; i++) {
-		    long j2 = j = ptr_result[i];
-		    long i2 = i;
-		    st_data_t value;
-		    if (st_lookup(memo, (st_data_t)i, &value)) i2 = (long)value;
-		    if (st_lookup(memo, (st_data_t)j, &value)) j2 = (long)value;
-		    st_insert(memo, (st_data_t)j, (st_data_t)i2);
-		    ptr_result[i] = ptr_ary[j2];
-		}
-	    });
-	});
-	DATA_PTR(vmemo) = 0;
-	st_free_table(memo);
+                for (i=0; i<n; i++) {
+                    long j2 = j = ptr_result[i];
+                    long i2 = i;
+                    st_data_t value;
+                    if (st_lookup(memo, (st_data_t)i, &value)) i2 = (long)value;
+                    if (st_lookup(memo, (st_data_t)j, &value)) j2 = (long)value;
+                    st_insert(memo, (st_data_t)j, (st_data_t)i2);
+                    ptr_result[i] = ptr_ary[j2];
+                }
+            });
+        });
+        DATA_PTR(vmemo) = 0;
+        st_free_table(memo);
     }
     else {
-	result = rb_ary_dup(ary);
-	RBASIC_CLEAR_CLASS(result);
-	RB_GC_GUARD(ary);
-	RARRAY_PTR_USE(result, ptr_result, {
-	    for (i=0; i<n; i++) {
-		j = RAND_UPTO(len-i) + i;
-		nv = ptr_result[j];
-		ptr_result[j] = ptr_result[i];
-		ptr_result[i] = nv;
-	    }
-	});
-	RBASIC_SET_CLASS_RAW(result, rb_cArray);
+        result = rb_ary_dup(ary);
+        RBASIC_CLEAR_CLASS(result);
+        RB_GC_GUARD(ary);
+        RARRAY_PTR_USE(result, ptr_result, {
+            for (i=0; i<n; i++) {
+                j = RAND_UPTO(len-i) + i;
+                nv = ptr_result[j];
+                ptr_result[j] = ptr_result[i];
+                ptr_result[i] = nv;
+            }
+        });
+        RBASIC_SET_CLASS_RAW(result, rb_cArray);
     }
     ARY_SET_LEN(result, n);
 
@@ -6820,7 +6889,7 @@ rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj)
     long mul;
     VALUE n = Qnil;
     if (args && (RARRAY_LEN(args) > 0)) {
-	n = RARRAY_AREF(args, 0);
+        n = RARRAY_AREF(args, 0);
     }
     if (RARRAY_LEN(self) == 0) return INT2FIX(0);
     if (NIL_P(n)) return DBL2NUM(HUGE_VAL);
@@ -6887,9 +6956,6 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
     return Qnil;
 }
 
-#define tmpary(n) rb_ary_tmp_new(n)
-#define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray))
-
 /*
  * Build a ruby array of the corresponding values and yield it to the
  * associated block.
@@ -6925,32 +6991,32 @@ permute0(const long n, const long r, long *const p, char *const used, const VALU
     long i = 0, index = 0;
 
     for (;;) {
-	const char *const unused = memchr(&used[i], 0, n-i);
-	if (!unused) {
-	    if (!index) break;
-	    i = p[--index];                /* pop index */
-	    used[i++] = 0;                 /* index unused */
-	}
-	else {
-	    i = unused - used;
-	    p[index] = i;
-	    used[i] = 1;                   /* mark index used */
-	    ++index;
-	    if (index < r-1) {             /* if not done yet */
-		p[index] = i = 0;
-		continue;
-	    }
-	    for (i = 0; i < n; ++i) {
-		if (used[i]) continue;
-		p[index] = i;
-		if (!yield_indexed_values(values, r, p)) {
-		    rb_raise(rb_eRuntimeError, "permute reentered");
-		}
-	    }
-	    i = p[--index];                /* pop index */
-	    used[i] = 0;                   /* index unused */
-	    p[index] = ++i;
-	}
+        const char *const unused = memchr(&used[i], 0, n-i);
+        if (!unused) {
+            if (!index) break;
+            i = p[--index];                /* pop index */
+            used[i++] = 0;                 /* index unused */
+        }
+        else {
+            i = unused - used;
+            p[index] = i;
+            used[i] = 1;                   /* mark index used */
+            ++index;
+            if (index < r-1) {             /* if not done yet */
+                p[index] = i = 0;
+                continue;
+            }
+            for (i = 0; i < n; ++i) {
+                if (used[i]) continue;
+                p[index] = i;
+                if (!yield_indexed_values(values, r, p)) {
+                    rb_raise(rb_eRuntimeError, "permute reentered");
+                }
+            }
+            i = p[--index];                /* pop index */
+            used[i] = 0;                   /* index unused */
+            p[index] = ++i;
+        }
     }
 }
 
@@ -6963,14 +7029,14 @@ descending_factorial(long from, long how_many)
 {
     VALUE cnt;
     if (how_many > 0) {
-	cnt = LONG2FIX(from);
-	while (--how_many > 0) {
-	    long v = --from;
-	    cnt = rb_int_mul(cnt, LONG2FIX(v));
-	}
+        cnt = LONG2FIX(from);
+        while (--how_many > 0) {
+            long v = --from;
+            cnt = rb_int_mul(cnt, LONG2FIX(v));
+        }
     }
     else {
-	cnt = LONG2FIX(how_many == 0);
+        cnt = LONG2FIX(how_many == 0);
     }
     return cnt;
 }
@@ -6981,18 +7047,18 @@ binomial_coefficient(long comb, long size)
     VALUE r;
     long i;
     if (comb > size-comb) {
-	comb = size-comb;
+        comb = size-comb;
     }
     if (comb < 0) {
-	return LONG2FIX(0);
+        return LONG2FIX(0);
     }
     else if (comb == 0) {
-	return LONG2FIX(1);
+        return LONG2FIX(1);
     }
     r = LONG2FIX(size);
     for (i = 1; i < comb; ++i) {
-	r = rb_int_mul(r, LONG2FIX(size - i));
-	r = rb_int_idiv(r, LONG2FIX(i + 1));
+        r = rb_int_mul(r, LONG2FIX(size - i));
+        r = rb_int_idiv(r, LONG2FIX(i + 1));
     }
     return r;
 }
@@ -7098,28 +7164,28 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
         r = NUM2LONG(argv[0]);            /* Permutation size from argument */
 
     if (r < 0 || n < r) {
-	/* no permutations: yield nothing */
+        /* no permutations: yield nothing */
     }
     else if (r == 0) { /* exactly one permutation: the zero-length array */
-	rb_yield(rb_ary_new2(0));
+        rb_yield(rb_ary_new2(0));
     }
     else if (r == 1) { /* this is a special, easy case */
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
-	}
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
+        }
     }
     else {             /* this is the general case */
-	volatile VALUE t0;
-	long *p = ALLOCV_N(long, t0, r+roomof(n, sizeof(long)));
-	char *used = (char*)(p + r);
-	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC_CLEAR_CLASS(ary0);
+        volatile VALUE t0;
+        long *p = ALLOCV_N(long, t0, r+roomof(n, sizeof(long)));
+        char *used = (char*)(p + r);
+        VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+        RBASIC_CLEAR_CLASS(ary0);
 
-	MEMZERO(used, char, n); /* initialize array */
+        MEMZERO(used, char, n); /* initialize array */
 
-	permute0(n, r, p, used, ary0); /* compute and yield permutations */
-	ALLOCV_END(t0);
-	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
+        permute0(n, r, p, used, ary0); /* compute and yield permutations */
+        ALLOCV_END(t0);
+        RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
@@ -7132,16 +7198,16 @@ combinate0(const long len, const long n, long *const stack, const VALUE values)
     MEMZERO(stack+1, long, n);
     stack[0] = -1;
     for (;;) {
-	for (lev++; lev < n; lev++) {
-	    stack[lev+1] = stack[lev]+1;
-	}
-	if (!yield_indexed_values(values, n, stack+1)) {
-	    rb_raise(rb_eRuntimeError, "combination reentered");
-	}
-	do {
-	    if (lev == 0) return;
-	    stack[lev--]++;
-	} while (stack[lev+1]+n == len+lev+1);
+        for (lev++; lev < n; lev++) {
+            stack[lev+1] = stack[lev]+1;
+        }
+        if (!yield_indexed_values(values, n, stack+1)) {
+            rb_raise(rb_eRuntimeError, "combination reentered");
+        }
+        do {
+            if (lev == 0) return;
+            stack[lev--]++;
+        } while (stack[lev+1]+n == len+lev+1);
     }
 }
 
@@ -7217,25 +7283,25 @@ rb_ary_combination(VALUE ary, VALUE num)
     RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_combination_size);
     len = RARRAY_LEN(ary);
     if (n < 0 || len < n) {
-	/* yield nothing */
+        /* yield nothing */
     }
     else if (n == 0) {
-	rb_yield(rb_ary_new2(0));
+        rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
-	}
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
+        }
     }
     else {
-	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	volatile VALUE t0;
-	long *stack = ALLOCV_N(long, t0, n+1);
+        VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+        volatile VALUE t0;
+        long *stack = ALLOCV_N(long, t0, n+1);
 
-	RBASIC_CLEAR_CLASS(ary0);
-	combinate0(len, n, stack, ary0);
-	ALLOCV_END(t0);
-	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
+        RBASIC_CLEAR_CLASS(ary0);
+        combinate0(len, n, stack, ary0);
+        ALLOCV_END(t0);
+        RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
@@ -7259,19 +7325,19 @@ rpermute0(const long n, const long r, long *const p, const VALUE values)
 
     p[index] = i;
     for (;;) {
-	if (++index < r-1) {
-	    p[index] = i = 0;
-	    continue;
-	}
-	for (i = 0; i < n; ++i) {
-	    p[index] = i;
-	    if (!yield_indexed_values(values, r, p)) {
-		rb_raise(rb_eRuntimeError, "repeated permute reentered");
-	    }
-	}
-	do {
-	    if (index <= 0) return;
-	} while ((i = ++p[--index]) >= n);
+        if (++index < r-1) {
+            p[index] = i = 0;
+            continue;
+        }
+        for (i = 0; i < n; ++i) {
+            p[index] = i;
+            if (!yield_indexed_values(values, r, p)) {
+                rb_raise(rb_eRuntimeError, "repeated permute reentered");
+            }
+        }
+        do {
+            if (index <= 0) return;
+        } while ((i = ++p[--index]) >= n);
     }
 }
 
@@ -7282,10 +7348,10 @@ rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj)
     long k = NUM2LONG(RARRAY_AREF(args, 0));
 
     if (k < 0) {
-	return LONG2FIX(0);
+        return LONG2FIX(0);
     }
     if (n <= 0) {
-	return LONG2FIX(!k);
+        return LONG2FIX(!k);
     }
     return rb_int_positive_pow(n, (unsigned long)k);
 }
@@ -7365,25 +7431,25 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
     r = NUM2LONG(num);                    /* Permutation size from argument */
 
     if (r < 0) {
-	/* no permutations: yield nothing */
+        /* no permutations: yield nothing */
     }
     else if (r == 0) { /* exactly one permutation: the zero-length array */
-	rb_yield(rb_ary_new2(0));
+        rb_yield(rb_ary_new2(0));
     }
     else if (r == 1) { /* this is a special, easy case */
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
-	}
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
+        }
     }
     else {             /* this is the general case */
-	volatile VALUE t0;
-	long *p = ALLOCV_N(long, t0, r);
-	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC_CLEAR_CLASS(ary0);
+        volatile VALUE t0;
+        long *p = ALLOCV_N(long, t0, r);
+        VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+        RBASIC_CLEAR_CLASS(ary0);
 
-	rpermute0(n, r, p, ary0); /* compute and yield repeated permutations */
-	ALLOCV_END(t0);
-	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
+        rpermute0(n, r, p, ary0); /* compute and yield repeated permutations */
+        ALLOCV_END(t0);
+        RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
@@ -7395,19 +7461,19 @@ rcombinate0(const long n, const long r, long *const p, const long rest, const VA
 
     p[index] = i;
     for (;;) {
-	if (++index < r-1) {
-	    p[index] = i;
-	    continue;
-	}
-	for (; i < n; ++i) {
-	    p[index] = i;
-	    if (!yield_indexed_values(values, r, p)) {
-		rb_raise(rb_eRuntimeError, "repeated combination reentered");
-	    }
-	}
-	do {
-	    if (index <= 0) return;
-	} while ((i = ++p[--index]) >= n);
+        if (++index < r-1) {
+            p[index] = i;
+            continue;
+        }
+        for (; i < n; ++i) {
+            p[index] = i;
+            if (!yield_indexed_values(values, r, p)) {
+                rb_raise(rb_eRuntimeError, "repeated combination reentered");
+            }
+        }
+        do {
+            if (index <= 0) return;
+        } while ((i = ++p[--index]) >= n);
     }
 }
 
@@ -7417,7 +7483,7 @@ rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj)
     long n = RARRAY_LEN(ary);
     long k = NUM2LONG(RARRAY_AREF(args, 0));
     if (k == 0) {
-	return LONG2FIX(1);
+        return LONG2FIX(1);
     }
     return binomial_coefficient(k, n + k - 1);
 }
@@ -7494,28 +7560,28 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
     RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_combination_size);   /* Return enumerator if no block */
     len = RARRAY_LEN(ary);
     if (n < 0) {
-	/* yield nothing */
+        /* yield nothing */
     }
     else if (n == 0) {
-	rb_yield(rb_ary_new2(0));
+        rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
-	}
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
+        }
     }
     else if (len == 0) {
-	/* yield nothing */
+        /* yield nothing */
     }
     else {
-	volatile VALUE t0;
-	long *p = ALLOCV_N(long, t0, n);
-	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC_CLEAR_CLASS(ary0);
+        volatile VALUE t0;
+        long *p = ALLOCV_N(long, t0, n);
+        VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+        RBASIC_CLEAR_CLASS(ary0);
 
-	rcombinate0(len, n, p, n, ary0); /* compute and yield repeated combinations */
-	ALLOCV_END(t0);
-	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
+        rcombinate0(len, n, p, n, ary0); /* compute and yield repeated combinations */
+        ALLOCV_END(t0);
+        RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
@@ -7584,7 +7650,7 @@ static VALUE
 rb_ary_product(int argc, VALUE *argv, VALUE ary)
 {
     int n = argc+1;    /* How many arrays we're operating on */
-    volatile VALUE t0 = tmpary(n);
+    volatile VALUE t0 = rb_ary_hidden_new(n);
     volatile VALUE t1 = Qundef;
     VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */
     int *counters = ALLOCV_N(int, t1, n); /* The current position in each one */
@@ -7605,64 +7671,64 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 
     /* Otherwise, allocate and fill in an array of results */
     if (rb_block_given_p()) {
-	/* Make defensive copies of arrays; exit if any is empty */
-	for (i = 0; i < n; i++) {
-	    if (RARRAY_LEN(arrays[i]) == 0) goto done;
-	    arrays[i] = ary_make_shared_copy(arrays[i]);
-	}
+        /* Make defensive copies of arrays; exit if any is empty */
+        for (i = 0; i < n; i++) {
+            if (RARRAY_LEN(arrays[i]) == 0) goto done;
+            arrays[i] = ary_make_shared_copy(arrays[i]);
+        }
     }
     else {
-	/* Compute the length of the result array; return [] if any is empty */
-	for (i = 0; i < n; i++) {
-	    long k = RARRAY_LEN(arrays[i]);
-	    if (k == 0) {
-		result = rb_ary_new2(0);
-		goto done;
-	    }
+        /* Compute the length of the result array; return [] if any is empty */
+        for (i = 0; i < n; i++) {
+            long k = RARRAY_LEN(arrays[i]);
+            if (k == 0) {
+                result = rb_ary_new2(0);
+                goto done;
+            }
             if (MUL_OVERFLOW_LONG_P(resultlen, k))
-		rb_raise(rb_eRangeError, "too big to product");
-	    resultlen *= k;
-	}
-	result = rb_ary_new2(resultlen);
+                rb_raise(rb_eRangeError, "too big to product");
+            resultlen *= k;
+        }
+        result = rb_ary_new2(resultlen);
     }
     for (;;) {
-	int m;
-	/* fill in one subarray */
-	VALUE subarray = rb_ary_new2(n);
-	for (j = 0; j < n; j++) {
-	    rb_ary_push(subarray, rb_ary_entry(arrays[j], counters[j]));
-	}
-
-	/* put it on the result array */
-	if (NIL_P(result)) {
+        int m;
+        /* fill in one subarray */
+        VALUE subarray = rb_ary_new2(n);
+        for (j = 0; j < n; j++) {
+            rb_ary_push(subarray, rb_ary_entry(arrays[j], counters[j]));
+        }
+
+        /* put it on the result array */
+        if (NIL_P(result)) {
             FL_SET(t0, RARRAY_SHARED_ROOT_FLAG);
-	    rb_yield(subarray);
+            rb_yield(subarray);
             if (!FL_TEST(t0, RARRAY_SHARED_ROOT_FLAG)) {
-		rb_raise(rb_eRuntimeError, "product reentered");
-	    }
-	    else {
+                rb_raise(rb_eRuntimeError, "product reentered");
+            }
+            else {
                 FL_UNSET(t0, RARRAY_SHARED_ROOT_FLAG);
-	    }
-	}
-	else {
-	    rb_ary_push(result, subarray);
-	}
-
-	/*
-	 * Increment the last counter.  If it overflows, reset to 0
-	 * and increment the one before it.
-	 */
-	m = n-1;
-	counters[m]++;
-	while (counters[m] == RARRAY_LEN(arrays[m])) {
-	    counters[m] = 0;
-	    /* If the first counter overflows, we are done */
-	    if (--m < 0) goto done;
-	    counters[m]++;
-	}
+            }
+        }
+        else {
+            rb_ary_push(result, subarray);
+        }
+
+        /*
+         * Increment the last counter.  If it overflows, reset to 0
+         * and increment the one before it.
+         */
+        m = n-1;
+        counters[m]++;
+        while (counters[m] == RARRAY_LEN(arrays[m])) {
+            counters[m] = 0;
+            /* If the first counter overflows, we are done */
+            if (--m < 0) goto done;
+            counters[m]++;
+        }
     }
+
 done:
-    tmpary_discard(t0);
     ALLOCV_END(t1);
 
     return NIL_P(result) ? ary : result;
@@ -7691,7 +7757,7 @@ rb_ary_take(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
     if (len < 0) {
-	rb_raise(rb_eArgError, "attempt to take negative size");
+        rb_raise(rb_eArgError, "attempt to take negative size");
     }
     return rb_ary_subseq(obj, 0, len);
 }
@@ -7726,7 +7792,7 @@ rb_ary_take_while(VALUE ary)
 
     RETURN_ENUMERATOR(ary, 0, 0);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
+        if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_take(ary, LONG2FIX(i));
 }
@@ -7754,7 +7820,7 @@ rb_ary_drop(VALUE ary, VALUE n)
     VALUE result;
     long pos = NUM2LONG(n);
     if (pos < 0) {
-	rb_raise(rb_eArgError, "attempt to drop negative size");
+        rb_raise(rb_eArgError, "attempt to drop negative size");
     }
 
     result = rb_ary_subseq(ary, pos, RARRAY_LEN(ary));
@@ -7790,7 +7856,7 @@ rb_ary_drop_while(VALUE ary)
 
     RETURN_ENUMERATOR(ary, 0, 0);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
+        if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_drop(ary, LONG2FIX(i));
 }
@@ -7839,9 +7905,9 @@ rb_ary_any_p(int argc, VALUE *argv, VALUE ary)
         if (rb_block_given_p()) {
             rb_warn("given block not used");
         }
-	for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	    if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qtrue;
-	}
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qtrue;
+        }
     }
     else if (!rb_block_given_p()) {
         for (i = 0; i < len; ++i) {
@@ -7849,9 +7915,9 @@ rb_ary_any_p(int argc, VALUE *argv, VALUE ary)
         }
     }
     else {
-	for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qtrue;
-	}
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qtrue;
+        }
     }
     return Qfalse;
 }
@@ -8084,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) {
@@ -8163,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);
@@ -8673,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/README.md b/benchmark/README.md
index c222164be3..e11381cad9 100644
--- a/benchmark/README.md
+++ b/benchmark/README.md
@@ -28,16 +28,18 @@ See also:
 
 ```console
 Usage: benchmark-driver [options] RUBY|YAML...
-    -r, --runner TYPE                Specify runner type: ips, time, memory, once (default: ips)
-    -o, --output TYPE                Specify output type: compare, simple, markdown, record (default: compare)
+    -r, --runner TYPE                Specify runner type: ips, time, memory, once, block (default: ips)
+    -o, --output TYPE                Specify output type: compare, simple, markdown, record, all (default: compare)
     -e, --executables EXECS          Ruby executables (e1::path1 arg1; e2::path2 arg2;...)
         --rbenv VERSIONS             Ruby executables in rbenv (x.x.x arg1;y.y.y arg2;...)
         --repeat-count NUM           Try benchmark NUM times and use the fastest result or the worst memory usage
         --repeat-result TYPE         Yield "best", "average" or "worst" result with --repeat-count (default: best)
+        --alternate                  Alternate executables instead of running the same executable in a row with --repeat-count
         --bundler                    Install and use gems specified in Gemfile
         --filter REGEXP              Filter out benchmarks with given regexp
         --run-duration SECONDS       Warmup estimates loop_count to run for this duration (default: 3)
-    -v, --verbose                    Verbose mode. Multiple -v options increase visibility (max: 2)
+        --timeout SECONDS            Timeout ruby command execution with timeout(1)
+    -v, --verbose                    Verbose mode. Multiple -v options increase visilibity (max: 2)
 ```
 
 ## make benchmark
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/buffer_each.yml b/benchmark/buffer_each.yml
new file mode 100644
index 0000000000..417941104e
--- /dev/null
+++ b/benchmark/buffer_each.yml
@@ -0,0 +1,27 @@
+prelude: |
+  # frozen_string_literal: true
+  Warning[:experimental] = false
+  string = "The quick brown fox jumped over the lazy dog."
+  array = string.bytes
+  buffer = IO::Buffer.for(string)
+benchmark:
+  string.each_byte: |
+    upcased = String.new
+    string.each_byte do |byte|
+      upcased << (byte ^ 32)
+    end
+  array.each: |
+    upcased = String.new
+    array.each do |byte|
+      upcased << (byte ^ 32)
+    end
+  buffer.each: |
+    upcased = String.new
+    buffer.each(:U8) do |offset, byte|
+      upcased << (byte ^ 32)
+    end
+  buffer.each_byte: |
+    upcased = String.new
+    buffer.each_byte do |byte|
+      upcased << (byte ^ 32)
+    end
diff --git a/benchmark/buffer_get.yml b/benchmark/buffer_get.yml
index e375dcf85d..9e1f99d64e 100644
--- a/benchmark/buffer_get.yml
+++ b/benchmark/buffer_get.yml
@@ -1,9 +1,25 @@
+prelude: |
+  # frozen_string_literal: true
+  Warning[:experimental] = false
+  string = "The quick brown fox jumped over the lazy dog."
+  buffer = IO::Buffer.for(string)
+  format = [:U32, :U32, :U32, :U32]
 benchmark:
-  - name: buffer.get
-    prelude: buffer = IO::Buffer.new(32, IO::Buffer::MAPPED)
-    script: buffer.get(:U32, 0)
-    loop_count: 20000000
-  - name: string.unpack
-    prelude: string = "\0" * 32
-    script: string.unpack("C")
-    loop_count: 20000000
+  string.unpack1: |
+    [
+      string.unpack1("N"),
+      string.unpack1("N", offset: 4),
+      string.unpack1("N", offset: 8),
+      string.unpack1("N", offset: 12),
+    ]
+  buffer.get_value: |
+    [
+      buffer.get_value(:U32, 0),
+      buffer.get_value(:U32, 4),
+      buffer.get_value(:U32, 8),
+      buffer.get_value(:U32, 12),
+    ]
+  buffer.get_values: |
+    buffer.get_values(format, 0)
+  string.unpack: |
+    string.unpack("NNNN")
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/lib/benchmark_driver/runner/mjit_exec.rb b/benchmark/lib/benchmark_driver/runner/mjit_exec.rb
deleted file mode 100644
index eac3dfba84..0000000000
--- a/benchmark/lib/benchmark_driver/runner/mjit_exec.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-require 'benchmark_driver/struct'
-require 'benchmark_driver/metric'
-require 'erb'
-
-# A special runner dedicated for measuring mjit_exec overhead.
-class BenchmarkDriver::Runner::MjitExec
-  METRIC = BenchmarkDriver::Metric.new(name: 'Iteration per second', unit: 'i/s')
-
-  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
-  Job = ::BenchmarkDriver::Struct.new(
-    :name,        # @param [String] name - This is mandatory for all runner
-    :metrics,     # @param [Array<BenchmarkDriver::Metric>]
-    :num_methods, # @param [Integer] num_methods - The number of methods to be defined
-    :loop_count,  # @param [Integer] loop_count
-    :from_jit,    # @param [TrueClass,FalseClass] from_jit - Whether the mjit_exec() is from JIT or not
-    :to_jit,      # @param [TrueClass,FalseClass] to_jit - Whether the mjit_exec() is to JIT or not
-  )
-  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
-  class << JobParser = Module.new
-    # @param [Array,String] num_methods
-    # @param [Integer] loop_count
-    # @param [TrueClass,FalseClass] from_jit
-    # @param [TrueClass,FalseClass] to_jit
-    def parse(num_methods:, loop_count:, from_jit:, to_jit:)
-      if num_methods.is_a?(String)
-        num_methods = eval(num_methods)
-      end
-
-      num_methods.map do |num|
-        if num_methods.size > 1
-          suffix = "[#{'%4d' % num}]"
-        else
-          suffix = "_#{num}"
-        end
-        Job.new(
-          name: "mjit_exec_#{from_jit ? 'JT' : 'VM'}2#{to_jit ? 'JT' : 'VM'}#{suffix}",
-          metrics: [METRIC],
-          num_methods: num,
-          loop_count: loop_count,
-          from_jit: from_jit,
-          to_jit: to_jit,
-        )
-      end
-    end
-  end
-
-  # @param [BenchmarkDriver::Config::RunnerConfig] config
-  # @param [BenchmarkDriver::Output] output
-  # @param [BenchmarkDriver::Context] contexts
-  def initialize(config:, output:, contexts:)
-    @config = config
-    @output = output
-    @contexts = contexts
-  end
-
-  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
-  # @param [Array<BenchmarkDriver::Runner::Peak::Job>] jobs
-  def run(jobs)
-    @output.with_benchmark do
-      jobs.each do |job|
-        @output.with_job(name: job.name) do
-          @contexts.each do |context|
-            result = BenchmarkDriver::Repeater.with_repeat(config: @config, larger_better: true, rest_on_average: :average) do
-              run_benchmark(job, context: context)
-            end
-            value, duration = result.value
-            @output.with_context(name: context.name, executable: context.executable, gems: context.gems, prelude: context.prelude) do
-              @output.report(values: { METRIC => value }, duration: duration, loop_count: job.loop_count)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  private
-
-  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
-  # @param [BenchmarkDriver::Context] context
-  # @return [BenchmarkDriver::Metrics]
-  def run_benchmark(job, context:)
-    if job.from_jit
-      if job.to_jit
-        benchmark = BenchmarkJT2JT.new(num_methods: job.num_methods, loop_count: job.loop_count)
-      else
-        raise NotImplementedError, "JT2VM is not implemented yet"
-      end
-    else
-      if job.to_jit
-        benchmark = BenchmarkVM2JT.new(num_methods: job.num_methods, loop_count: job.loop_count)
-      else
-        benchmark = BenchmarkVM2VM.new(num_methods: job.num_methods, loop_count: job.loop_count)
-      end
-    end
-
-    duration = Tempfile.open(['benchmark_driver-result', '.txt']) do |f|
-      with_script(benchmark.render(result: f.path)) do |path|
-        opt = []
-        if context.executable.command.any? { |c| c.start_with?('--jit') }
-          opt << '--jit-min-calls=2'
-        end
-        IO.popen([*context.executable.command, '--disable-gems', *opt, path], &:read)
-        if $?.success?
-          Float(f.read)
-        else
-          BenchmarkDriver::Result::ERROR
-        end
-      end
-    end
-
-    [job.loop_count.to_f / duration, duration]
-  end
-
-  def with_script(script)
-    if @config.verbose >= 2
-      sep = '-' * 30
-      $stdout.puts "\n\n#{sep}[Script begin]#{sep}\n#{script}#{sep}[Script end]#{sep}\n\n"
-    end
-
-    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
-      f.puts script
-      f.close
-      return yield(f.path)
-    end
-  end
-
-  # @param [Integer] num_methods
-  # @param [Integer] loop_count
-  BenchmarkVM2VM = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
-    # @param [String] result - A file to write result
-    def render(result:)
-      ERB.new(<<~EOS, trim_mode: '%').result(binding)
-        % num_methods.times do |i|
-        def a<%= i %>
-          nil
-        end
-        % end
-        RubyVM::MJIT.pause if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-
-        def vm
-          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          i = 0
-          while i < <%= loop_count / 1000 %>
-        % 1000.times do |i|
-            a<%= i % num_methods %>
-        % end
-            i += 1
-          end
-        % (loop_count % 1000).times do |i|
-          a<%= i % num_methods %>
-        % end
-          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
-        end
-
-        vm # warmup call cache
-        File.write(<%= result.dump %>, vm)
-      EOS
-    end
-  end
-  private_constant :BenchmarkVM2VM
-
-  # @param [Integer] num_methods
-  # @param [Integer] loop_count
-  BenchmarkVM2JT = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
-    # @param [String] result - A file to write result
-    def render(result:)
-      ERB.new(<<~EOS, trim_mode: '%').result(binding)
-        % num_methods.times do |i|
-        def a<%= i %>
-          nil
-        end
-        a<%= i %>
-        a<%= i %> # --jit-min-calls=2
-        % end
-        RubyVM::MJIT.pause if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-
-        def vm
-          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          i = 0
-          while i < <%= loop_count / 1000 %>
-        % 1000.times do |i|
-            a<%= i % num_methods %>
-        % end
-            i += 1
-          end
-        % (loop_count % 1000).times do |i|
-          a<%= i % num_methods %>
-        % end
-          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
-        end
-
-        vm # warmup call cache
-        File.write(<%= result.dump %>, vm)
-      EOS
-    end
-  end
-  private_constant :BenchmarkVM2JT
-
-  # @param [Integer] num_methods
-  # @param [Integer] loop_count
-  BenchmarkJT2JT = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
-    # @param [String] result - A file to write result
-    def render(result:)
-      ERB.new(<<~EOS, trim_mode: '%').result(binding)
-        % num_methods.times do |i|
-        def a<%= i %>
-          nil
-        end
-        % end
-
-        # You may need to:
-        #   * Increase `JIT_ISEQ_SIZE_THRESHOLD` to 10000000 in mjit.h
-        #   * Always return false in `inlinable_iseq_p()` of mjit_compile.c
-        def jit
-          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          i = 0
-          while i < <%= loop_count / 1000 %>
-        % 1000.times do |i|
-            a<%= i % num_methods %>
-        % end
-            i += 1
-          end
-        % (loop_count % 1000).times do |i|
-          a<%= i % num_methods %>
-        % end
-          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
-        end
-
-        jit
-        jit
-        RubyVM::MJIT.pause if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-        File.write(<%= result.dump %>, jit)
-      EOS
-    end
-  end
-  private_constant :BenchmarkJT2JT
-end
diff --git a/benchmark/marshal_dump_load_integer.yml b/benchmark/marshal_dump_load_integer.yml
new file mode 100644
index 0000000000..78ebf823d2
--- /dev/null
+++ b/benchmark/marshal_dump_load_integer.yml
@@ -0,0 +1,22 @@
+prelude: |
+  smallint_array = 1000.times.map { |x| x }
+  bigint32_array = 1000.times.map { |x| x + 2**32 }
+  bigint64_array = 1000.times.map { |x| x + 2**64 }
+
+  smallint_dump = Marshal.dump(smallint_array)
+  bigint32_dump = Marshal.dump(bigint32_array)
+  bigint64_dump = Marshal.dump(bigint64_array)
+benchmark:
+  marshal_dump_integer_small: |
+    Marshal.dump(smallint_array)
+  marshal_dump_integer_over_32_bit: |
+    Marshal.dump(bigint32_array)
+  marshal_dump_integer_over_64_bit: |
+    Marshal.dump(bigint64_array)
+  marshal_load_integer_small: |
+    Marshal.load(smallint_dump)
+  marshal_load_integer_over_32_bit: |
+    Marshal.load(bigint32_dump)
+  marshal_load_integer_over_64_bit: |
+    Marshal.load(bigint64_dump)
+loop_count: 4000
diff --git a/benchmark/masgn.yml b/benchmark/masgn.yml
index 4be9333e23..31cb8ee4a3 100644
--- a/benchmark/masgn.yml
+++ b/benchmark/masgn.yml
@@ -1,7 +1,7 @@
 prelude: |
   a = [nil] * 3
   b = Class.new{attr_writer :a, :b, :c}.new
-  c, d, e, f = nil, nil, nil, nil
+  c = d = e = f = g = h = i = nil
 benchmark:
   array2_2: "c = (a[0], a[1] = 1, 2)"
   array2_3: "c = (a[0], a[1] = 1, 2, 3)"
@@ -27,3 +27,27 @@ benchmark:
   lvar2_3p: "(d, e = 1, 2, 3; nil)"
   lvar3_2p: "(d, e, f = 1, 2; nil)"
   lvar3_3p: "(d, e, f = 1, 2, 3; nil)"
+  array2_2lv: "c = (a[0], a[1] = g, h)"
+  array2_ilv: "c = (a[0], a[1] = g, h, i)"
+  arrayi_2lv: "c = (a[0], a[1], a[2] = g, h)"
+  arrayi_ilv: "c = (a[0], a[1], a[2] = g, h, i)"
+  attr2_2lv: "c = (b.a, b.b = g, h)"
+  attr2_ilv: "c = (b.a, b.b = g, h, i)"
+  attri_2lv: "c = (b.a, b.b, b.c = g, h)"
+  attri_ilv: "c = (b.a, b.b, b.c = g, h, i)"
+  lvar2_2lv: "c = (d, e = g, h)"
+  lvar2_ilv: "c = (d, e = g, h, i)"
+  lvari_2lv: "c = (d, e, f = g, h)"
+  lvari_ilv: "c = (d, e, f = g, h, i)"
+  array2_2plv: "(a[0], a[1] = g, h; nil)"
+  array2_iplv: "(a[0], a[1] = g, h, i; nil)"
+  arrayi_2plv: "(a[0], a[1], a[2] = g, h; nil)"
+  arrayi_iplv: "(a[0], a[1], a[2] = g, h, i; nil)"
+  attr2_2plv: "(b.a, b.b = g, h; nil)"
+  attr2_iplv: "(b.a, b.b = g, h, i; nil)"
+  attri_2plv: "(b.a, b.b, b.c = g, h; nil)"
+  attri_iplv: "(b.a, b.b, b.c = g, h, i; nil)"
+  lvar2_2plv: "(d, e = g, h; nil)"
+  lvar2_iplv: "(d, e = g, h, i; nil)"
+  lvari_2plv: "(d, e, f = g, h; nil)"
+  lvari_iplv: "(d, e, f = g, h, i; nil)"
diff --git a/benchmark/mjit_exec_jt2jt.yml b/benchmark/mjit_exec_jt2jt.yml
deleted file mode 100644
index 6c303c7a44..0000000000
--- a/benchmark/mjit_exec_jt2jt.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-type: lib/benchmark_driver/runner/mjit_exec
-num_methods: [1]
-#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
-loop_count: 50000000
-from_jit: true
-to_jit: true
diff --git a/benchmark/mjit_exec_vm2jt.yml b/benchmark/mjit_exec_vm2jt.yml
deleted file mode 100644
index 764883f070..0000000000
--- a/benchmark/mjit_exec_vm2jt.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-type: lib/benchmark_driver/runner/mjit_exec
-num_methods: [1]
-#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
-loop_count: 50000000
-from_jit: false
-to_jit: true
diff --git a/benchmark/mjit_exec_vm2vm.yml b/benchmark/mjit_exec_vm2vm.yml
deleted file mode 100644
index 030aa76c1c..0000000000
--- a/benchmark/mjit_exec_vm2vm.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-type: lib/benchmark_driver/runner/mjit_exec
-num_methods: [1]
-#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
-loop_count: 50000000
-from_jit: false
-to_jit: false
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/so_nbody.rb b/benchmark/so_nbody.rb
index d6c5bb9e61..9884fc4edc 100644
--- a/benchmark/so_nbody.rb
+++ b/benchmark/so_nbody.rb
@@ -12,38 +12,38 @@ def _puts *args
 end
 
 class Planet
- attr_accessor :x, :y, :z, :vx, :vy, :vz, :mass
+  attr_accessor :x, :y, :z, :vx, :vy, :vz, :mass
 
- def initialize(x, y, z, vx, vy, vz, mass)
-  @x, @y, @z = x, y, z
-  @vx, @vy, @vz = vx * DAYS_PER_YEAR, vy * DAYS_PER_YEAR, vz * DAYS_PER_YEAR
-  @mass = mass * SOLAR_MASS
- end
-
- def move_from_i(bodies, nbodies, dt, i)
-  while i < nbodies
-   b2 = bodies[i]
-   dx = @x - b2.x
-   dy = @y - b2.y
-   dz = @z - b2.z
-
-   distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
-   mag = dt / (distance * distance * distance)
-   b_mass_mag, b2_mass_mag = @mass * mag, b2.mass * mag
-
-   @vx -= dx * b2_mass_mag
-   @vy -= dy * b2_mass_mag
-   @vz -= dz * b2_mass_mag
-   b2.vx += dx * b_mass_mag
-   b2.vy += dy * b_mass_mag
-   b2.vz += dz * b_mass_mag
-   i += 1
+  def initialize(x, y, z, vx, vy, vz, mass)
+    @x, @y, @z = x, y, z
+    @vx, @vy, @vz = vx * DAYS_PER_YEAR, vy * DAYS_PER_YEAR, vz * DAYS_PER_YEAR
+    @mass = mass * SOLAR_MASS
   end
 
-  @x += dt * @vx
-  @y += dt * @vy
-  @z += dt * @vz
- end
+  def move_from_i(bodies, nbodies, dt, i)
+    while i < nbodies
+      b2 = bodies[i]
+      dx = @x - b2.x
+      dy = @y - b2.y
+      dz = @z - b2.z
+
+      distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
+      mag = dt / (distance * distance * distance)
+      b_mass_mag, b2_mass_mag = @mass * mag, b2.mass * mag
+
+      @vx -= dx * b2_mass_mag
+      @vy -= dy * b2_mass_mag
+      @vz -= dz * b2_mass_mag
+      b2.vx += dx * b_mass_mag
+      b2.vy += dy * b_mass_mag
+      b2.vz += dz * b_mass_mag
+      i += 1
+    end
+
+    @x += dt * @vx
+    @y += dt * @vy
+    @z += dt * @vz
+  end
 end
 
 def energy(bodies)
diff --git a/benchmark/string_concat.yml b/benchmark/string_concat.yml
new file mode 100644
index 0000000000..e65c00cca9
--- /dev/null
+++ b/benchmark/string_concat.yml
@@ -0,0 +1,45 @@
+prelude: |
+  CHUNK = "a" * 64
+  UCHUNK = "é" * 32
+  GC.disable # GC causes a lot of variance
+benchmark:
+  binary_concat_7bit: |
+    buffer = String.new(capacity: 4096, encoding: Encoding::BINARY)
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+  utf8_concat_7bit: |
+    buffer = String.new(capacity: 4096, encoding: Encoding::UTF_8)
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+    buffer << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK << CHUNK
+  utf8_concat_UTF8: |
+    buffer = String.new(capacity: 4096, encoding: Encoding::UTF_8)
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+    buffer << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK << UCHUNK
+  interpolation: |
+    buffer = "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}" \
+      "#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}#{CHUNK}"
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/benchmark/vm_const.yml b/benchmark/vm_const.yml
index 6064d4eed0..8939ca0cd3 100644
--- a/benchmark/vm_const.yml
+++ b/benchmark/vm_const.yml
@@ -1,7 +1,13 @@
 prelude: |
   Const = 1
+  A = B = C = D = E = F = G = H = I = J = K = L = M = N = O = P = Q = R = S = T = U = V = W = X = Y = Z = 1
+  def foo
+    A; B; C; D; E; F; G; H; I; J; K; L; M; N; O; P; Q; R; S; T; U; V; W; X; Y; Z
+  end
 benchmark:
   vm_const: |
     j = Const
     k = Const
+  vm_const_many: |
+    foo
 loop_count: 30000000
diff --git a/benchmark/vm_freezeobj.yml b/benchmark/vm_freezeobj.yml
new file mode 100644
index 0000000000..69a795a354
--- /dev/null
+++ b/benchmark/vm_freezeobj.yml
@@ -0,0 +1,6 @@
+prelude: |
+ objs = 100000.times.map { Object.new }
+benchmark:
+  vm_freeze_obj: |
+    objs.map(&:freeze)
+loop_count: 600
diff --git a/benchmark/vm_ivar_embedded_obj_init.yml b/benchmark/vm_ivar_embedded_obj_init.yml
new file mode 100644
index 0000000000..74fe20a630
--- /dev/null
+++ b/benchmark/vm_ivar_embedded_obj_init.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C
+    def set_ivars
+      @a = nil
+      @b = nil
+      @c = nil
+    end
+  end
+
+  c = C.new
+benchmark:
+  vm_ivar_embedded_obj_init: |
+    c.set_ivars
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_init.yml b/benchmark/vm_ivar_extended_obj_init.yml
index c6f1633907..f054bab282 100644
--- a/benchmark/vm_ivar_init.yml
+++ b/benchmark/vm_ivar_extended_obj_init.yml
@@ -1,6 +1,6 @@
 prelude: |
   class C
-    def initialize
+    def set_ivars
       @a = nil
       @b = nil
       @c = nil
@@ -8,7 +8,9 @@ prelude: |
       @e = nil
     end
   end
+
+  c = C.new
 benchmark:
-  vm_ivar_init: |
-    C.new
+  vm_ivar_extended_obj_init: |
+    c.set_ivars
 loop_count: 30000000
diff --git a/benchmark/vm_ivar_generic_get.yml b/benchmark/vm_ivar_generic_get.yml
new file mode 100644
index 0000000000..dae2d37671
--- /dev/null
+++ b/benchmark/vm_ivar_generic_get.yml
@@ -0,0 +1,17 @@
+prelude: |
+  class C < Array
+    attr_reader :a, :b, :c
+    def initialize
+      @a = nil
+      @b = nil
+      @c = nil
+    end
+  end
+
+  c = C.new
+benchmark:
+  vm_ivar_generic_get: |
+    c.a
+    c.b
+    c.c
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_generic_set.yml b/benchmark/vm_ivar_generic_set.yml
new file mode 100644
index 0000000000..102a6577fb
--- /dev/null
+++ b/benchmark/vm_ivar_generic_set.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C < Array
+    def set_ivars
+      @a = nil
+      @b = nil
+      @c = nil
+    end
+  end
+
+  c = C.new
+benchmark:
+  vm_ivar_generic_set: |
+    c.set_ivars
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_get.yml b/benchmark/vm_ivar_get.yml
new file mode 100644
index 0000000000..9174af6965
--- /dev/null
+++ b/benchmark/vm_ivar_get.yml
@@ -0,0 +1,37 @@
+prelude: |
+  class Example
+    def initialize
+      @v0 = 1
+      @v1 = 2
+      @v3 = 3
+      @levar = 1
+    end
+
+    def get_value_loop
+      sum = 0
+
+      i = 0
+      while i < 1000000
+        # 10 times to de-emphasize loop overhead
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        sum += @levar
+        i += 1
+      end
+
+      return sum
+    end
+  end
+
+  obj = Example.new
+benchmark:
+  vm_ivar_get: |
+    obj.get_value_loop
+loop_count: 100
diff --git a/benchmark/vm_ivar_get_unintialized.yml b/benchmark/vm_ivar_get_unintialized.yml
new file mode 100644
index 0000000000..a1ccfb06ce
--- /dev/null
+++ b/benchmark/vm_ivar_get_unintialized.yml
@@ -0,0 +1,12 @@
+prelude: |
+  class Example
+    def read
+      @uninitialized
+    end
+  end
+
+  obj = Example.new
+benchmark:
+  vm_ivar_get_uninitialized: |
+    obj.read
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_lazy_set.yml b/benchmark/vm_ivar_lazy_set.yml
new file mode 100644
index 0000000000..7372ffcfbc
--- /dev/null
+++ b/benchmark/vm_ivar_lazy_set.yml
@@ -0,0 +1,12 @@
+prelude: |
+  class Example
+    def lazy_set
+      @uninitialized ||= 123
+    end
+  end
+
+  objs = 10000000.times.map { Example.new }
+benchmark:
+  vm_ivar_lazy_set: |
+    objs.each(&:lazy_set)
+loop_count: 1
diff --git a/benchmark/vm_ivar_set_on_instance.yml b/benchmark/vm_ivar_set_on_instance.yml
new file mode 100644
index 0000000000..91857b7742
--- /dev/null
+++ b/benchmark/vm_ivar_set_on_instance.yml
@@ -0,0 +1,35 @@
+prelude: |
+  class TheClass
+    def initialize
+      @v0 = 1
+      @v1 = 2
+      @v3 = 3
+      @levar = 1
+    end
+
+    def set_value_loop
+      # 1M
+      i = 0
+      while i < 1000000
+        # 10 times to de-emphasize loop overhead
+        @levar = i
+        @levar = i
+        @levar = i
+        @levar = i
+        @levar = i
+        @levar = i
+        @levar = i
+        @levar = i
+        @levar = i
+        @levar = i
+        i += 1
+      end
+    end
+  end
+
+  obj = TheClass.new
+
+benchmark:
+  vm_ivar_set_on_instance: |
+    obj.set_value_loop
+loop_count: 100
diff --git a/benchmark/vm_ivar_set_subclass.yml b/benchmark/vm_ivar_set_subclass.yml
index 2653d36ded..bc8bf5bf6b 100644
--- a/benchmark/vm_ivar_set_subclass.yml
+++ b/benchmark/vm_ivar_set_subclass.yml
@@ -1,6 +1,6 @@
 prelude: |
   class A
-    def initialize
+    def set_ivars
       @a = nil
       @b = nil
       @c = nil
@@ -10,8 +10,11 @@ prelude: |
   end
   class B < A; end
   class C < A; end
+
+  b = B.new
+  c = C.new
 benchmark:
   vm_ivar_init_subclass: |
-    B.new
-    C.new
+    b.set_ivars
+    c.set_ivars
 loop_count: 3000000
diff --git a/benchmark/vm_lvar_cond_set.yml b/benchmark/vm_lvar_cond_set.yml
new file mode 100644
index 0000000000..1845f9d12e
--- /dev/null
+++ b/benchmark/vm_lvar_cond_set.yml
@@ -0,0 +1,8 @@
+benchmark:
+  vm_lvar_cond_set: |
+    a ||= 1
+    b ||= 1
+    c ||= 1
+    d ||= 1
+    nil
+loop_count: 30000000
diff --git a/bignum.c b/bignum.c
index 75651f9524..cb2c3b6f07 100644
--- a/bignum.c
+++ b/bignum.c
@@ -105,8 +105,8 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
 #endif
 
 #define BIGZEROP(x) (BIGNUM_LEN(x) == 0 || \
-		     (BDIGITS(x)[0] == 0 && \
-		      (BIGNUM_LEN(x) == 1 || bigzero_p(x))))
+                     (BDIGITS(x)[0] == 0 && \
+                      (BIGNUM_LEN(x) == 1 || bigzero_p(x))))
 #define BIGSIZE(x) (BIGNUM_LEN(x) == 0 ? (size_t)0 : \
     BDIGITS(x)[BIGNUM_LEN(x)-1] ? \
         (size_t)(BIGNUM_LEN(x)*SIZEOF_BDIGIT - nlz(BDIGITS(x)[BIGNUM_LEN(x)-1])/CHAR_BIT) : \
@@ -419,9 +419,9 @@ bary_small_lshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift)
     assert(0 <= shift && shift < BITSPERDIG);
 
     for (i=0; i<n; i++) {
-	num = num | (BDIGIT_DBL)*xds++ << shift;
-	*zds++ = BIGLO(num);
-	num = BIGDN(num);
+        num = num | (BDIGIT_DBL)*xds++ << shift;
+        *zds++ = BIGLO(num);
+        num = BIGDN(num);
     }
     return BIGLO(num);
 }
@@ -437,9 +437,9 @@ bary_small_rshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift, BDIGIT hi
     num = BIGUP(higher_bdigit);
     for (i = 0; i < n; i++) {
         BDIGIT x = xds[n - i - 1];
-	num = (num | x) >> shift;
+        num = (num | x) >> shift;
         zds[n - i - 1] = BIGLO(num);
-	num = BIGUP(x);
+        num = BIGUP(x);
     }
 }
 
@@ -449,7 +449,7 @@ bary_zero_p(const BDIGIT *xds, size_t xn)
     if (xn == 0)
         return 1;
     do {
-	if (xds[--xn]) return 0;
+        if (xds[--xn]) return 0;
     } while (xn);
     return 1;
 }
@@ -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;
@@ -1350,9 +1350,9 @@ bary_subb(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yd
 
     num = borrow ? -1 : 0;
     for (i = 0; i < sn; i++) {
-	num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
+        num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
     }
     if (yn <= xn) {
         for (; i < xn; i++) {
@@ -1371,7 +1371,7 @@ bary_subb(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yd
     }
     if (num == 0) goto num_is_zero;
     for (; i < zn; i++) {
-	zds[i] = BDIGMAX;
+        zds[i] = BDIGMAX;
     }
     return 1;
 
@@ -1379,10 +1379,10 @@ bary_subb(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yd
     if (xds == zds && xn == zn)
         return 0;
     for (; i < xn; i++) {
-	zds[i] = xds[i];
+        zds[i] = xds[i];
     }
     for (; i < zn; i++) {
-	zds[i] = 0;
+        zds[i] = 0;
     }
     return 0;
 }
@@ -1409,27 +1409,27 @@ bary_addc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yd
     assert(yn <= zn);
 
     if (xn > yn) {
-	const BDIGIT *tds;
-	tds = xds; xds = yds; yds = tds;
-	i = xn; xn = yn; yn = i;
+        const BDIGIT *tds;
+        tds = xds; xds = yds; yds = tds;
+        i = xn; xn = yn; yn = i;
     }
 
     num = carry ? 1 : 0;
     for (i = 0; i < xn; i++) {
-	num += (BDIGIT_DBL)xds[i] + yds[i];
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
+        num += (BDIGIT_DBL)xds[i] + yds[i];
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
     }
     for (; i < yn; i++) {
         if (num == 0) goto num_is_zero;
-	num += yds[i];
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
+        num += yds[i];
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
     }
     for (; i < zn; i++) {
         if (num == 0) goto num_is_zero;
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
     }
     return num != 0;
 
@@ -1437,10 +1437,10 @@ bary_addc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yd
     if (yds == zds && yn == zn)
         return 0;
     for (; i < yn; i++) {
-	zds[i] = yds[i];
+        zds[i] = yds[i];
     }
     for (; i < zn; i++) {
-	zds[i] = 0;
+        zds[i] = 0;
     }
     return 0;
 }
@@ -1597,30 +1597,30 @@ bary_sq_fast(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn)
         return;
 
     for (i = 0; i < xn-1; i++) {
-	v = (BDIGIT_DBL)xds[i];
-	if (!v)
+        v = (BDIGIT_DBL)xds[i];
+        if (!v)
             continue;
-	c = (BDIGIT_DBL)zds[i + i] + v * v;
-	zds[i + i] = BIGLO(c);
-	c = BIGDN(c);
-	v *= 2;
+        c = (BDIGIT_DBL)zds[i + i] + v * v;
+        zds[i + i] = BIGLO(c);
+        c = BIGDN(c);
+        v *= 2;
         vl = BIGLO(v);
         vh = (int)BIGDN(v);
-	for (j = i + 1; j < xn; j++) {
-	    w = (BDIGIT_DBL)xds[j];
-	    c += (BDIGIT_DBL)zds[i + j] + vl * w;
-	    zds[i + j] = BIGLO(c);
-	    c = BIGDN(c);
-	    if (vh)
+        for (j = i + 1; j < xn; j++) {
+            w = (BDIGIT_DBL)xds[j];
+            c += (BDIGIT_DBL)zds[i + j] + vl * w;
+            zds[i + j] = BIGLO(c);
+            c = BIGDN(c);
+            if (vh)
                 c += w;
-	}
-	if (c) {
-	    c += (BDIGIT_DBL)zds[i + xn];
-	    zds[i + xn] = BIGLO(c);
-	    c = BIGDN(c);
+        }
+        if (c) {
+            c += (BDIGIT_DBL)zds[i + xn];
+            zds[i + xn] = BIGLO(c);
+            c = BIGDN(c);
             if (c)
                 zds[i + xn + 1] += (BDIGIT)c;
-	}
+        }
     }
 
     /* i == xn-1 */
@@ -1710,7 +1710,7 @@ bary_mul_balance_with_mulfunc(BDIGIT *const zds, const size_t zn,
                      zds + n, tn,
                      wds, xn);
         }
-	n += r;
+        n += r;
     }
     BDIGITS_ZERO(zds+xn+yn, zn - (xn+yn));
 
@@ -2102,21 +2102,21 @@ bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGI
         v3n = u3n; v3ds = u3ds; v3p = u3p;
     }
     else {
-	/* v1 <- y0 + y2 */
+        /* v1 <- y0 + y2 */
         bary_add(v1ds, v1n, y0ds, y0n, y2ds, y2n);
         v1p = 1;
 
-	/* y(-1) : v2 <- v1 - y1 = y0 - y1 + y2 */
+        /* y(-1) : v2 <- v1 - y1 = y0 - y1 + y2 */
         v2p = 1;
         if (bary_sub(v2ds, v2n, v1ds, v1n, y1ds, y1n)) {
             bary_2comp(v2ds, v2n);
             v2p = 0;
         }
 
-	/* y(1) : v1 <- v1 + y1 = y0 + y1 + y2 */
+        /* y(1) : v1 <- v1 + y1 = y0 + y1 + y2 */
         bary_add(v1ds, v1n, v1ds, v1n, y1ds, y1n);
 
-	/* y(-2) : v3 <- 2 * (v2 + y2) - y0 = y0 - 2 * (y1 - 2 * y2) */
+        /* y(-2) : v3 <- 2 * (v2 + y2) - y0 = y0 - 2 * (y1 - 2 * y2) */
         v3p = 1;
         if (v2p) {
             bary_add(v3ds, v3n, v2ds, v2n, y2ds, y2n);
@@ -2447,8 +2447,8 @@ bary_mul_precheck(BDIGIT **zdsp, size_t *znp, const BDIGIT **xdsp, size_t *xnp,
     if (xn > yn) {
         const BDIGIT *tds;
         size_t tn;
-	tds = xds; xds = yds; yds = tds;
-	tn = xn; xn = yn; yn = tn;
+        tds = xds; xds = yds; yds = tds;
+        tn = xn; xn = yn; yn = tn;
     }
     assert(xn <= yn);
 
@@ -2598,26 +2598,26 @@ bigdivrem1(void *ptr)
     BDIGIT q;
 
     do {
-	if (bds->stop) {
-	    bds->zn = zn;
-	    return 0;
+        if (bds->stop) {
+            bds->zn = zn;
+            return 0;
         }
-	if (zds[zn-1] == yds[yn-1]) q = BDIGMAX;
-	else q = (BDIGIT)((BIGUP(zds[zn-1]) + zds[zn-2])/yds[yn-1]);
-	if (q) {
+        if (zds[zn-1] == yds[yn-1]) q = BDIGMAX;
+        else q = (BDIGIT)((BIGUP(zds[zn-1]) + zds[zn-2])/yds[yn-1]);
+        if (q) {
             num = bigdivrem_mulsub(zds+zn-(yn+1), yn+1,
                                    q,
                                    yds, yn);
-	    while (num) { /* "add back" required */
-		q--;
+            while (num) { /* "add back" required */
+                q--;
                 num = bary_add(zds+zn-(yn+1), yn,
                                zds+zn-(yn+1), yn,
                                yds, yn);
                 num--;
-	    }
-	}
+            }
+        }
         zn--;
-	zds[zn] = q;
+        zds[zn] = q;
     } while (zn > yn);
     return 0;
 }
@@ -2686,16 +2686,16 @@ bigdivrem_restoring(BDIGIT *zds, size_t zn, BDIGIT *yds, size_t yn)
     bds.zn = zn - ynzero;
     if (bds.zn > 10000 || bds.yn > 10000) {
       retry:
-	bds.stop = Qfalse;
+        bds.stop = Qfalse;
         rb_nogvl(bigdivrem1, &bds, rb_big_stop, &bds, RB_NOGVL_UBF_ASYNC_SAFE);
 
-	if (bds.stop == Qtrue) {
-	    /* execute trap handler, but exception was not raised. */
-	    goto retry;
-	}
+        if (bds.stop == Qtrue) {
+            /* execute trap handler, but exception was not raised. */
+            goto retry;
+        }
     }
     else {
-	bigdivrem1(&bds);
+        bigdivrem1(&bds);
     }
 }
 
@@ -2953,7 +2953,7 @@ int
 rb_cmpint(VALUE val, VALUE a, VALUE b)
 {
     if (NIL_P(val)) {
-	rb_cmperr(a, b);
+        rb_cmperr(a, b);
     }
     if (FIXNUM_P(val)) {
         long l = FIX2LONG(val);
@@ -2962,9 +2962,9 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
         return 0;
     }
     if (RB_BIGNUM_TYPE_P(val)) {
-	if (BIGZEROP(val)) return 0;
-	if (BIGNUM_SIGN(val)) return 1;
-	return -1;
+        if (BIGZEROP(val)) return 0;
+        if (BIGNUM_SIGN(val)) return 1;
+        return -1;
     }
     if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
     if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
@@ -2974,8 +2974,8 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
 #define BIGNUM_SET_LEN(b,l) \
     (BIGNUM_EMBED_P(b) ? \
      (void)(RBASIC(b)->flags = \
-	    (RBASIC(b)->flags & ~BIGNUM_EMBED_LEN_MASK) | \
-	    ((l) << BIGNUM_EMBED_LEN_SHIFT)) : \
+            (RBASIC(b)->flags & ~BIGNUM_EMBED_LEN_MASK) | \
+            ((l) << BIGNUM_EMBED_LEN_SHIFT)) : \
      (void)(RBIGNUM(b)->as.heap.len = (l)))
 
 static void
@@ -2983,33 +2983,33 @@ rb_big_realloc(VALUE big, size_t len)
 {
     BDIGIT *ds;
     if (BIGNUM_EMBED_P(big)) {
-	if (BIGNUM_EMBED_LEN_MAX < len) {
-	    ds = ALLOC_N(BDIGIT, len);
-	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, BIGNUM_EMBED_LEN_MAX);
-	    RBIGNUM(big)->as.heap.len = BIGNUM_LEN(big);
-	    RBIGNUM(big)->as.heap.digits = ds;
+        if (BIGNUM_EMBED_LEN_MAX < len) {
+            ds = ALLOC_N(BDIGIT, len);
+            MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, BIGNUM_EMBED_LEN_MAX);
+            RBIGNUM(big)->as.heap.len = BIGNUM_LEN(big);
+            RBIGNUM(big)->as.heap.digits = ds;
             FL_UNSET_RAW(big, BIGNUM_EMBED_FLAG);
-	}
+        }
     }
     else {
-	if (len <= BIGNUM_EMBED_LEN_MAX) {
-	    ds = RBIGNUM(big)->as.heap.digits;
+        if (len <= BIGNUM_EMBED_LEN_MAX) {
+            ds = RBIGNUM(big)->as.heap.digits;
             FL_SET_RAW(big, BIGNUM_EMBED_FLAG);
-	    BIGNUM_SET_LEN(big, len);
+            BIGNUM_SET_LEN(big, len);
             (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
-	    if (ds) {
-		MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
-		xfree(ds);
-	    }
-	}
-	else {
-	    if (BIGNUM_LEN(big) == 0) {
-		RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
-	    }
-	    else {
-		REALLOC_N(RBIGNUM(big)->as.heap.digits, BDIGIT, len);
-	    }
-	}
+            if (ds) {
+                MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
+                xfree(ds);
+            }
+        }
+        else {
+            if (BIGNUM_LEN(big) == 0) {
+                RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
+            }
+            else {
+                REALLOC_N(RBIGNUM(big)->as.heap.digits, BDIGIT, len);
+            }
+        }
     }
 }
 
@@ -3095,7 +3095,7 @@ abs2twocomp(VALUE *xp, long *n_ret)
         MEMCPY(BDIGITS(z), ds, BDIGIT, n);
         bary_2comp(BDIGITS(z), n);
         hibits = BDIGMAX;
-	*xp = z;
+        *xp = z;
     }
     *n_ret = n;
     return hibits;
@@ -3119,7 +3119,7 @@ bigtrunc(VALUE x)
     if (len == 0) return x;
     while (--len && !ds[len]);
     if (BIGNUM_LEN(x) > len+1) {
-	rb_big_resize(x, len+1);
+        rb_big_resize(x, len+1);
     }
     return x;
 }
@@ -3172,7 +3172,7 @@ static VALUE
 bignorm(VALUE x)
 {
     if (RB_BIGNUM_TYPE_P(x)) {
-	x = bigfixize(x);
+        x = bigfixize(x);
     }
     return x;
 }
@@ -3194,8 +3194,8 @@ rb_uint2big(uintptr_t n)
     digits[0] = n;
 #else
     for (i = 0; i < bdigit_roomof(SIZEOF_VALUE); i++) {
-	digits[i] = BIGLO(n);
-	n = BIGDN(n);
+        digits[i] = BIGLO(n);
+        n = BIGDN(n);
     }
 #endif
 
@@ -3214,14 +3214,14 @@ rb_int2big(intptr_t n)
 
     if (n < 0) {
         u = 1 + (VALUE)(-(n + 1)); /* u = -n avoiding overflow */
-	neg = 1;
+        neg = 1;
     }
     else {
         u = n;
     }
     big = rb_uint2big(u);
     if (neg) {
-	BIGNUM_SET_NEGATIVE_SIGN(big);
+        BIGNUM_SET_NEGATIVE_SIGN(big);
     }
     return big;
 }
@@ -3380,7 +3380,7 @@ absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_num
 
     if (sign == 2) {
 #if defined __GNUC__ && (__GNUC__ == 4 && __GNUC_MINOR__ == 4)
-	*nlz_bits_ret = 0;
+        *nlz_bits_ret = 0;
 #endif
         return (size_t)-1;
     }
@@ -3700,7 +3700,7 @@ rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t na
         }
         else if (num_bdigits == numberof(fixbuf)) {
             val = bignew((long)num_bdigits+1, 0);
-	    MEMCPY(BDIGITS(val), fixbuf, BDIGIT, num_bdigits);
+            MEMCPY(BDIGITS(val), fixbuf, BDIGIT, num_bdigits);
             BDIGITS(val)[num_bdigits++] = 1;
         }
         else {
@@ -3712,9 +3712,9 @@ rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t na
         BDIGIT_DBL u = fixbuf[0] + BIGUP(fixbuf[1]);
         if (u == 0)
             return LONG2FIX(0);
-	if (0 < sign && POSFIXABLE(u))
+        if (0 < sign && POSFIXABLE(u))
             return LONG2FIX((long)u);
-	if (sign < 0 && BDIGIT_MSB(fixbuf[1]) == 0 &&
+        if (sign < 0 && BDIGIT_MSB(fixbuf[1]) == 0 &&
                 NEGFIXABLE(-(BDIGIT_DBL_SIGNED)u))
             return LONG2FIX((long)-(BDIGIT_DBL_SIGNED)u);
         val = bignew((long)num_bdigits, 0 <= sign);
@@ -3766,41 +3766,41 @@ str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size
     int c;
 
     if (!len) {
-	*num_digits_p = 0;
-	*len_p = 0;
-	return TRUE;
+        *num_digits_p = 0;
+        *len_p = 0;
+        return TRUE;
     }
 
     if (badcheck && *str == '_') return FALSE;
 
     while ((c = *str++) != 0) {
-	if (c == '_') {
-	    if (nondigit) {
+        if (c == '_') {
+            if (nondigit) {
                 if (badcheck) return FALSE;
-		break;
-	    }
-	    nondigit = (char) c;
-	}
-	else if ((c = conv_digit(c)) < 0 || c >= base) {
-	    break;
-	}
-	else {
-	    nondigit = 0;
-	    num_digits++;
-	    digits_end = str;
-	}
-	if (len > 0 && !--len) break;
+                break;
+            }
+            nondigit = (char) c;
+        }
+        else if ((c = conv_digit(c)) < 0 || c >= base) {
+            break;
+        }
+        else {
+            nondigit = 0;
+            num_digits++;
+            digits_end = str;
+        }
+        if (len > 0 && !--len) break;
     }
     if (badcheck && nondigit) return FALSE;
     if (badcheck && len) {
-	str--;
-	while (*str && ISSPACE(*str)) {
-	    str++;
-	    if (len > 0 && !--len) break;
-	}
-	if (len && *str) {
-	    return FALSE;
-	}
+        str--;
+        while (*str && ISSPACE(*str)) {
+            str++;
+            if (len > 0 && !--len) break;
+        }
+        if (len && *str) {
+            return FALSE;
+        }
     }
     *num_digits_p = num_digits;
     *len_p = digits_end - digits_start;
@@ -4042,8 +4042,8 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
     char *end;
     VALUE ret = rb_cstr_parse_inum(str, -1, (badcheck ? NULL : &end), base);
     if (NIL_P(ret)) {
-	if (badcheck) rb_invalid_str(str, "Integer()");
-	ret = INT2FIX(0);
+        if (badcheck) rb_invalid_str(str, "Integer()");
+        ret = INT2FIX(0);
     }
     return ret;
 }
@@ -4067,7 +4067,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 
 VALUE
 rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
-		  int base, int flags)
+                  int base, int flags)
 {
     const char *const s = str;
     char sign = 1;
@@ -4084,82 +4084,82 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
     const int badcheck = !endp;
 
 #define ADV(n) do {\
-	if (len > 0 && len <= (n)) goto bad; \
-	str += (n); \
-	len -= (n); \
+        if (len > 0 && len <= (n)) goto bad; \
+        str += (n); \
+        len -= (n); \
     } while (0)
 #define ASSERT_LEN() do {\
-	assert(len != 0); \
-	if (len0 >= 0) assert(s + len0 == str + len); \
+        assert(len != 0); \
+        if (len0 >= 0) assert(s + len0 == str + len); \
     } while (0)
 
     if (!str) {
         goto bad;
     }
     if (len && (flags & RB_INT_PARSE_SIGN)) {
-	while (ISSPACE(*str)) ADV(1);
+        while (ISSPACE(*str)) ADV(1);
 
-	if (str[0] == '+') {
-	    ADV(1);
-	}
-	else if (str[0] == '-') {
-	    ADV(1);
-	    sign = 0;
-	}
-	ASSERT_LEN();
+        if (str[0] == '+') {
+            ADV(1);
+        }
+        else if (str[0] == '-') {
+            ADV(1);
+            sign = 0;
+        }
+        ASSERT_LEN();
     }
     if (base <= 0) {
-	if (str[0] == '0' && len > 1) {
-	    switch (str[1]) {
-	      case 'x': case 'X':
-		base = 16;
-		ADV(2);
-		break;
-	      case 'b': case 'B':
-		base = 2;
-		ADV(2);
-		break;
-	      case 'o': case 'O':
-		base = 8;
-		ADV(2);
-		break;
-	      case 'd': case 'D':
-		base = 10;
-		ADV(2);
-		break;
-	      default:
-		base = 8;
-	    }
-	}
-	else if (base < -1) {
-	    base = -base;
-	}
-	else {
-	    base = 10;
-	}
+        if (str[0] == '0' && len > 1) {
+            switch (str[1]) {
+              case 'x': case 'X':
+                base = 16;
+                ADV(2);
+                break;
+              case 'b': case 'B':
+                base = 2;
+                ADV(2);
+                break;
+              case 'o': case 'O':
+                base = 8;
+                ADV(2);
+                break;
+              case 'd': case 'D':
+                base = 10;
+                ADV(2);
+                break;
+              default:
+                base = 8;
+            }
+        }
+        else if (base < -1) {
+            base = -base;
+        }
+        else {
+            base = 10;
+        }
     }
     else if (len == 1 || !(flags & RB_INT_PARSE_PREFIX)) {
-	/* no prefix */
+        /* no prefix */
     }
     else if (base == 2) {
-	if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
-	    ADV(2);
-	}
+        if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
+            ADV(2);
+        }
     }
     else if (base == 8) {
-	if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
-	    ADV(2);
-	}
+        if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
+            ADV(2);
+        }
     }
     else if (base == 10) {
-	if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
-	    ADV(2);
-	}
+        if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
+            ADV(2);
+        }
     }
     else if (base == 16) {
-	if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
-	    ADV(2);
-	}
+        if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
+            ADV(2);
+        }
     }
     if (!valid_radix_p(base)) {
         invalid_radix(base);
@@ -4167,73 +4167,72 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
     if (!len) goto bad;
     num_digits = str - s;
     if (*str == '0' && len != 1) { /* squeeze preceding 0s */
-	int us = 0;
-	const char *end = len < 0 ? NULL : str + len;
-	++num_digits;
-	while ((c = *++str) == '0' ||
-	       ((flags & RB_INT_PARSE_UNDERSCORE) && c == '_')) {
-	    if (c == '_') {
-		if (++us >= 2)
-		    break;
-	    }
-	    else {
-		++num_digits;
-		us = 0;
-	    }
-	    if (str == end) break;
-	}
-	if (!c || ISSPACE(c)) --str;
-	if (end) len = end - str;
-	ASSERT_LEN();
+        int us = 0;
+        const char *end = len < 0 ? NULL : str + len;
+        ++num_digits;
+        while ((c = *++str) == '0' ||
+               ((flags & RB_INT_PARSE_UNDERSCORE) && c == '_')) {
+            if (c == '_') {
+                if (++us >= 2)
+                    break;
+            }
+            else {
+                ++num_digits;
+                us = 0;
+            }
+            if (str == end) break;
+        }
+        if (!c || ISSPACE(c)) --str;
+        if (end) len = end - str;
     }
     c = *str;
     c = conv_digit(c);
     if (c < 0 || c >= base) {
-	if (!badcheck && num_digits) z = INT2FIX(0);
-	goto bad;
+        if (!badcheck && num_digits) z = INT2FIX(0);
+        goto bad;
     }
 
     if (ndigits) *ndigits = num_digits;
     val = ruby_scan_digits(str, len, base, &num_digits, &ov);
     if (!ov) {
-	const char *end = &str[num_digits];
-	if (num_digits > 0 && *end == '_' && (flags & RB_INT_PARSE_UNDERSCORE))
-	    goto bigparse;
-	if (endp) *endp = (char *)end;
-	if (ndigits) *ndigits += num_digits;
-	if (badcheck) {
-	    if (num_digits == 0) return Qnil; /* no number */
-	    while (len < 0 ? *end : end < str + len) {
-		if (!ISSPACE(*end)) return Qnil; /* trailing garbage */
-		end++;
-	    }
-	}
-
-	if (POSFIXABLE(val)) {
-	    if (sign) return LONG2FIX(val);
-	    else {
-		long result = -(long)val;
-		return LONG2FIX(result);
-	    }
-	}
-	else {
-	    VALUE big = rb_uint2big(val);
-	    BIGNUM_SET_SIGN(big, sign);
-	    return bignorm(big);
-	}
+        const char *end = &str[num_digits];
+        if (num_digits > 0 && *end == '_' && (flags & RB_INT_PARSE_UNDERSCORE))
+            goto bigparse;
+        if (endp) *endp = (char *)end;
+        if (ndigits) *ndigits += num_digits;
+        if (badcheck) {
+            if (num_digits == 0) return Qnil; /* no number */
+            while (len < 0 ? *end : end < str + len) {
+                if (!ISSPACE(*end)) return Qnil; /* trailing garbage */
+                end++;
+            }
+        }
+
+        if (POSFIXABLE(val)) {
+            if (sign) return LONG2FIX(val);
+            else {
+                long result = -(long)val;
+                return LONG2FIX(result);
+            }
+        }
+        else {
+            VALUE big = rb_uint2big(val);
+            BIGNUM_SET_SIGN(big, sign);
+            return bignorm(big);
+        }
     }
 
   bigparse:
     digits_start = str;
     if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	goto bad;
+        goto bad;
     if (endp) *endp = (char *)(str + len);
     if (ndigits) *ndigits += num_digits;
     digits_end = digits_start + len;
 
     if (POW2_P(base)) {
         z = str2big_poweroftwo(sign, digits_start, digits_end, num_digits,
-			       bit_length(base-1));
+                               bit_length(base-1));
     }
     else {
         int digits_per_bdigits_dbl;
@@ -4269,7 +4268,7 @@ static VALUE
 rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 {
     return rb_int_parse_cstr(str, len, endp, NULL, base,
-			     RB_INT_PARSE_DEFAULT);
+                             RB_INT_PARSE_DEFAULT);
 }
 
 VALUE
@@ -4318,14 +4317,14 @@ rb_str2big_poweroftwo(VALUE arg, int base, int badcheck)
     s = str = StringValueCStr(arg);
     len = RSTRING_LEN(arg);
     if (*str == '-') {
-	len--;
+        len--;
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
     if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+        invalid_integer(arg);
     digits_end = digits_start + len;
 
     z = str2big_poweroftwo(positive_p, digits_start, digits_end, num_digits,
@@ -4357,14 +4356,14 @@ rb_str2big_normal(VALUE arg, int base, int badcheck)
     s = str = StringValuePtr(arg);
     len = RSTRING_LEN(arg);
     if (len > 0 && *str == '-') {
-	len--;
+        len--;
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
     if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+        invalid_integer(arg);
     digits_end = digits_start + len;
 
     maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
@@ -4399,14 +4398,14 @@ rb_str2big_karatsuba(VALUE arg, int base, int badcheck)
     s = str = StringValuePtr(arg);
     len = RSTRING_LEN(arg);
     if (len > 0 && *str == '-') {
-	len--;
+        len--;
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
     if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+        invalid_integer(arg);
     digits_end = digits_start + len;
 
     maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
@@ -4442,14 +4441,14 @@ rb_str2big_gmp(VALUE arg, int base, int badcheck)
     s = str = StringValuePtr(arg);
     len = RSTRING_LEN(arg);
     if (len > 0 && *str == '-') {
-	len--;
+        len--;
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
     if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+        invalid_integer(arg);
     digits_end = digits_start + len;
 
     maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
@@ -4476,8 +4475,8 @@ rb_ull2big(unsigned LONG_LONG n)
     digits[0] = n;
 #else
     for (i = 0; i < bdigit_roomof(SIZEOF_LONG_LONG); i++) {
-	digits[i] = BIGLO(n);
-	n = BIGDN(n);
+        digits[i] = BIGLO(n);
+        n = BIGDN(n);
     }
 #endif
 
@@ -4496,14 +4495,14 @@ rb_ll2big(LONG_LONG n)
 
     if (n < 0) {
         u = 1 + (unsigned LONG_LONG)(-(n + 1)); /* u = -n avoiding overflow */
-	neg = 1;
+        neg = 1;
     }
     else {
         u = n;
     }
     big = rb_ull2big(u);
     if (neg) {
-	BIGNUM_SET_NEGATIVE_SIGN(big);
+        BIGNUM_SET_NEGATIVE_SIGN(big);
     }
     return big;
 }
@@ -4533,7 +4532,7 @@ rb_uint128t2big(uint128_t n)
     BDIGIT *digits = BDIGITS(big);
 
     for (i = 0; i < bdigit_roomof(SIZEOF_INT128_T); i++) {
-	digits[i] = BIGLO(RSHIFT(n ,BITSPERDIG*i));
+        digits[i] = BIGLO(RSHIFT(n ,BITSPERDIG*i));
     }
 
     i = bdigit_roomof(SIZEOF_INT128_T);
@@ -4551,14 +4550,14 @@ rb_int128t2big(int128_t n)
 
     if (n < 0) {
         u = 1 + (uint128_t)(-(n + 1)); /* u = -n avoiding overflow */
-	neg = 1;
+        neg = 1;
     }
     else {
         u = n;
     }
     big = rb_uint128t2big(u);
     if (neg) {
-	BIGNUM_SET_NEGATIVE_SIGN(big);
+        BIGNUM_SET_NEGATIVE_SIGN(big);
     }
     return big;
 }
@@ -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);
@@ -4721,7 +4723,7 @@ power_cache_get_power(int base, int power_level, size_t *numdigits_ret)
         rb_obj_hide(power);
         base36_power_cache[base - 2][power_level] = power;
         base36_numdigits_cache[base - 2][power_level] = numdigits;
-	rb_gc_register_mark_object(power);
+        rb_gc_register_mark_object(power);
     }
     if (numdigits_ret)
         *numdigits_ret = base36_numdigits_cache[base - 2][power_level];
@@ -4772,7 +4774,7 @@ big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t tail
         } while (num);
         len = sizeof(buf) - j;
         big2str_alloc(b2s, len + taillen);
-	MEMCPY(b2s->ptr, buf + j, char, len);
+        MEMCPY(b2s->ptr, buf + j, char, len);
     }
     else {
         p = b2s->ptr;
@@ -4789,7 +4791,7 @@ big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t tail
 
 static void
 big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
-		  int power_level, size_t taillen)
+                  int power_level, size_t taillen)
 {
     VALUE b;
     size_t half_numdigits, lower_numdigits;
@@ -4819,17 +4821,17 @@ big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
      */
 
     if (xn == 0 || bary_zero_p(xds, xn)) {
-	if (b2s->ptr) {
+        if (b2s->ptr) {
             /* When x is zero, power_cache_get_power(base, power_level) should be cached already. */
             power_cache_get_power(b2s->base, power_level, &len);
-	    memset(b2s->ptr, '0', len);
+            memset(b2s->ptr, '0', len);
             b2s->ptr += len;
-	}
+        }
         return;
     }
 
     if (power_level == 0) {
-	big2str_2bdigits(b2s, xds, xn, taillen);
+        big2str_2bdigits(b2s, xds, xn, taillen);
         return;
     }
 
@@ -4857,7 +4859,7 @@ big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
             memset(b2s->ptr, '0', len);
             b2s->ptr += len;
         }
-	big2str_2bdigits(b2s, xds, xn, taillen);
+        big2str_2bdigits(b2s, xds, xn, taillen);
     }
     else {
         BDIGIT *qds, *rds;
@@ -4961,11 +4963,11 @@ big2str_generic(VALUE x, int base)
     BARY_TRUNC(xds, xn);
 
     if (xn == 0) {
-	return rb_usascii_str_new2("0");
+        return rb_usascii_str_new2("0");
     }
 
     if (!valid_radix_p(base))
-	invalid_radix(base);
+        invalid_radix(base);
 
     if (xn >= LONG_MAX/BITSPERDIG) {
         rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
@@ -5002,7 +5004,7 @@ big2str_generic(VALUE x, int base)
     b2s_data.ptr = NULL;
 
     if (power_level == 0) {
-	big2str_2bdigits(&b2s_data, xds, xn, 0);
+        big2str_2bdigits(&b2s_data, xds, xn, 0);
     }
     else {
         VALUE tmpw = 0;
@@ -5011,7 +5013,7 @@ big2str_generic(VALUE x, int base)
         wn = power_level * BIGDIVREM_EXTRA_WORDS + BIGNUM_LEN(power);
         wds = ALLOCV_N(BDIGIT, tmpw, xn + wn);
         MEMCPY(wds, xds, BDIGIT, xn);
-	big2str_karatsuba(&b2s_data, wds, xn, wn, power_level, 0);
+        big2str_karatsuba(&b2s_data, wds, xn, wn, power_level, 0);
         if (tmpw)
             ALLOCV_END(tmpw);
     }
@@ -5077,7 +5079,7 @@ rb_big2str1(VALUE x, int base)
     size_t xn;
 
     if (FIXNUM_P(x)) {
-	return rb_fix2str(x, base);
+        return rb_fix2str(x, base);
     }
 
     bigtrunc(x);
@@ -5086,11 +5088,11 @@ rb_big2str1(VALUE x, int base)
     BARY_TRUNC(xds, xn);
 
     if (xn == 0) {
-	return rb_usascii_str_new2("0");
+        return rb_usascii_str_new2("0");
     }
 
     if (!valid_radix_p(base))
-	invalid_radix(base);
+        invalid_radix(base);
 
     if (xn >= LONG_MAX/BITSPERDIG) {
         rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
@@ -5137,7 +5139,7 @@ big2ulong(VALUE x, const char *type)
 #else
     num = 0;
     for (i = 0; i < len; i++) {
-	num <<= BITSPERDIG;
+        num <<= BITSPERDIG;
         num += (unsigned long)ds[len - i - 1]; /* overflow is already checked */
     }
 #endif
@@ -5190,13 +5192,13 @@ big2ull(VALUE x, const char *type)
     if (len == 0)
         return 0;
     if (BIGSIZE(x) > SIZEOF_LONG_LONG)
-	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+        rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
 #if SIZEOF_LONG_LONG <= SIZEOF_BDIGIT
     num = (unsigned LONG_LONG)ds[0];
 #else
     num = 0;
     for (i = 0; i < len; i++) {
-	num = BIGUP(num);
+        num = BIGUP(num);
         num += ds[len - i - 1];
     }
 #endif
@@ -5246,23 +5248,23 @@ dbl2big(double d)
     double u = (d < 0)?-d:d;
 
     if (isinf(d)) {
-	rb_raise(rb_eFloatDomainError, d < 0 ? "-Infinity" : "Infinity");
+        rb_raise(rb_eFloatDomainError, d < 0 ? "-Infinity" : "Infinity");
     }
     if (isnan(d)) {
-	rb_raise(rb_eFloatDomainError, "NaN");
+        rb_raise(rb_eFloatDomainError, "NaN");
     }
 
     while (1.0 <= u) {
-	u /= (double)(BIGRAD);
-	i++;
+        u /= (double)(BIGRAD);
+        i++;
     }
     z = bignew(i, d>=0);
     digits = BDIGITS(z);
     while (i--) {
-	u *= BIGRAD;
-	c = (BDIGIT)u;
-	u -= c;
-	digits[i] = c;
+        u *= BIGRAD;
+        c = (BDIGIT)u;
+        u -= c;
+        digits[i] = c;
     }
 
     return z;
@@ -5282,28 +5284,28 @@ big2dbl(VALUE x)
     BDIGIT *ds = BDIGITS(x), dl;
 
     if (i) {
-	bits = i * BITSPERDIG - nlz(ds[i-1]);
-	if (bits > DBL_MANT_DIG+DBL_MAX_EXP) {
-	    d = HUGE_VAL;
-	}
-	else {
-	    if (bits > DBL_MANT_DIG+1)
-		lo = (bits -= DBL_MANT_DIG+1) / BITSPERDIG;
-	    else
-		bits = 0;
-	    while (--i > lo) {
-		d = ds[i] + BIGRAD*d;
-	    }
-	    dl = ds[i];
-	    if (bits && (dl & ((BDIGIT)1 << (bits %= BITSPERDIG)))) {
-		int carry = (dl & ~(BDIGMAX << bits)) != 0;
-		if (!carry) {
-		    while (i-- > 0) {
-			carry = ds[i] != 0;
-			if (carry) break;
-		    }
-		}
-		if (carry) {
+        bits = i * BITSPERDIG - nlz(ds[i-1]);
+        if (bits > DBL_MANT_DIG+DBL_MAX_EXP) {
+            d = HUGE_VAL;
+        }
+        else {
+            if (bits > DBL_MANT_DIG+1)
+                lo = (bits -= DBL_MANT_DIG+1) / BITSPERDIG;
+            else
+                bits = 0;
+            while (--i > lo) {
+                d = ds[i] + BIGRAD*d;
+            }
+            dl = ds[i];
+            if (bits && (dl & ((BDIGIT)1 << (bits %= BITSPERDIG)))) {
+                int carry = (dl & ~(BDIGMAX << bits)) != 0;
+                if (!carry) {
+                    while (i-- > 0) {
+                        carry = ds[i] != 0;
+                        if (carry) break;
+                    }
+                }
+                if (carry) {
                     BDIGIT mask = BDIGMAX;
                     BDIGIT bit = 1;
                     mask <<= bits;
@@ -5311,19 +5313,19 @@ big2dbl(VALUE x)
                     dl &= mask;
                     dl += bit;
                     dl = BIGLO(dl);
-		    if (!dl) d += 1;
-		}
-	    }
-	    d = dl + BIGRAD*d;
-	    if (lo) {
-		if (lo > INT_MAX / BITSPERDIG)
-		    d = HUGE_VAL;
-		else if (lo < INT_MIN / BITSPERDIG)
-		    d = 0.0;
-		else
-		    d = ldexp(d, (int)(lo * BITSPERDIG));
-	    }
-	}
+                    if (!dl) d += 1;
+                }
+            }
+            d = dl + BIGRAD*d;
+            if (lo) {
+                if (lo > INT_MAX / BITSPERDIG)
+                    d = HUGE_VAL;
+                else if (lo < INT_MIN / BITSPERDIG)
+                    d = 0.0;
+                else
+                    d = ldexp(d, (int)(lo * BITSPERDIG));
+            }
+        }
     }
     if (BIGNUM_NEGATIVE_P(x)) d = -d;
     return d;
@@ -5335,11 +5337,11 @@ rb_big2dbl(VALUE x)
     double d = big2dbl(x);
 
     if (isinf(d)) {
-	rb_warning("Integer out of Float range");
-	if (d < 0.0)
-	    d = -HUGE_VAL;
-	else
-	    d = HUGE_VAL;
+        rb_warning("Integer out of Float range");
+        if (d < 0.0)
+            d = -HUGE_VAL;
+        else
+            d = HUGE_VAL;
     }
     return d;
 }
@@ -5436,26 +5438,26 @@ VALUE
 rb_big_cmp(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	x = bigfixize(x);
+        x = bigfixize(x);
         if (FIXNUM_P(x)) {
-	    /* SIGNED_VALUE and Fixnum have same sign-bits, same
-	     * order */
-	    SIGNED_VALUE sx = (SIGNED_VALUE)x, sy = (SIGNED_VALUE)y;
-	    if (sx < sy) return INT2FIX(-1);
-	    return INT2FIX(sx > sy);
+            /* SIGNED_VALUE and Fixnum have same sign-bits, same
+             * order */
+            SIGNED_VALUE sx = (SIGNED_VALUE)x, sy = (SIGNED_VALUE)y;
+            if (sx < sy) return INT2FIX(-1);
+            return INT2FIX(sx > sy);
         }
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	if (BIGNUM_SIGN(x) == BIGNUM_SIGN(y)) {
-	    int cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y));
-	    return INT2FIX(BIGNUM_SIGN(x) ? cmp : -cmp);
-	}
+        if (BIGNUM_SIGN(x) == BIGNUM_SIGN(y)) {
+            int cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y));
+            return INT2FIX(BIGNUM_SIGN(x) ? cmp : -cmp);
+        }
     }
     else if (RB_FLOAT_TYPE_P(y)) {
         return rb_integer_float_cmp(x, y);
     }
     else {
-	return rb_num_coerce_cmp(x, y, idCmp);
+        return rb_num_coerce_cmp(x, y, idCmp);
     }
     return INT2FIX(BIGNUM_SIGN(x) ? 1 : -1);
 }
@@ -5474,30 +5476,30 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
     int n;
 
     if (RB_INTEGER_TYPE_P(y)) {
-	rel = rb_big_cmp(x, y);
+        rel = rb_big_cmp(x, y);
     }
     else if (RB_FLOAT_TYPE_P(y)) {
         rel = rb_integer_float_cmp(x, y);
     }
     else {
-	ID id = 0;
-	switch (op) {
-	  case big_op_gt: id = '>'; break;
-	  case big_op_ge: id = idGE; break;
-	  case big_op_lt: id = '<'; break;
-	  case big_op_le: id = idLE; break;
-	}
-	return rb_num_coerce_relop(x, y, id);
+        ID id = 0;
+        switch (op) {
+          case big_op_gt: id = '>'; break;
+          case big_op_ge: id = idGE; break;
+          case big_op_lt: id = '<'; break;
+          case big_op_le: id = idLE; break;
+        }
+        return rb_num_coerce_relop(x, y, id);
     }
 
     if (NIL_P(rel)) return Qfalse;
     n = FIX2INT(rel);
 
     switch (op) {
-	case big_op_gt: return RBOOL(n >  0);
-	case big_op_ge: return RBOOL(n >= 0);
-	case big_op_lt: return RBOOL(n <  0);
-	case big_op_le: return RBOOL(n <= 0);
+        case big_op_gt: return RBOOL(n >  0);
+        case big_op_ge: return RBOOL(n >= 0);
+        case big_op_lt: return RBOOL(n <  0);
+        case big_op_le: return RBOOL(n <= 0);
     }
     return Qundef;
 }
@@ -5541,7 +5543,7 @@ VALUE
 rb_big_eq(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	return RBOOL(bignorm(x) == y);
+        return RBOOL(bignorm(x) == y);
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
     }
@@ -5549,7 +5551,7 @@ rb_big_eq(VALUE x, VALUE y)
         return rb_integer_float_eq(x, y);
     }
     else {
-	return rb_equal(y, x);
+        return rb_equal(y, x);
     }
     if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y)) return Qfalse;
     if (BIGNUM_LEN(x) != BIGNUM_LEN(y)) return Qfalse;
@@ -5656,10 +5658,10 @@ bigsub_int(VALUE x, long y0)
     assert(xn == zn);
     num = (BDIGIT_DBL_SIGNED)xds[0] - y;
     if (xn == 1 && num < 0) {
-	BIGNUM_NEGATE(z);
-	zds[0] = (BDIGIT)-num;
-	RB_GC_GUARD(x);
-	return bignorm(z);
+        BIGNUM_NEGATE(z);
+        zds[0] = (BDIGIT)-num;
+        RB_GC_GUARD(x);
+        return bignorm(z);
     }
     zds[0] = BIGLO(num);
     num = BIGDN(num);
@@ -5671,10 +5673,10 @@ bigsub_int(VALUE x, long y0)
     num = 0;
     for (i=0; i < xn; i++) {
         if (y == 0) goto y_is_zero_x;
-	num += (BDIGIT_DBL_SIGNED)xds[i] - BIGLO(y);
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
-	y = BIGDN(y);
+        num += (BDIGIT_DBL_SIGNED)xds[i] - BIGLO(y);
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
+        y = BIGDN(y);
     }
     for (; i < zn; i++) {
         if (y == 0) goto y_is_zero_z;
@@ -5689,9 +5691,9 @@ bigsub_int(VALUE x, long y0)
     for (; i < xn; i++) {
       y_is_zero_x:
         if (num == 0) goto num_is_zero_x;
-	num += xds[i];
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
+        num += xds[i];
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
     }
 #if SIZEOF_BDIGIT < SIZEOF_LONG
     for (; i < zn; i++) {
@@ -5705,7 +5707,7 @@ bigsub_int(VALUE x, long y0)
 
     for (; i < xn; i++) {
       num_is_zero_x:
-	zds[i] = xds[i];
+        zds[i] = xds[i];
     }
 #if SIZEOF_BDIGIT < SIZEOF_LONG
     for (; i < zn; i++) {
@@ -5719,7 +5721,7 @@ bigsub_int(VALUE x, long y0)
     assert(num == 0 || num == -1);
     if (num < 0) {
         get2comp(z);
-	BIGNUM_NEGATE(z);
+        BIGNUM_NEGATE(z);
     }
     RB_GC_GUARD(x);
     return bignorm(z);
@@ -5762,17 +5764,17 @@ bigadd_int(VALUE x, long y)
     num = 0;
     for (i=0; i < xn; i++) {
         if (y == 0) goto y_is_zero_x;
-	num += (BDIGIT_DBL)xds[i] + BIGLO(y);
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
-	y = BIGDN(y);
+        num += (BDIGIT_DBL)xds[i] + BIGLO(y);
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
+        y = BIGDN(y);
     }
     for (; i < zn; i++) {
         if (y == 0) goto y_is_zero_z;
-	num += BIGLO(y);
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
-	y = BIGDN(y);
+        num += BIGLO(y);
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
+        y = BIGDN(y);
     }
     goto finish;
 
@@ -5781,25 +5783,25 @@ bigadd_int(VALUE x, long y)
     for (;i < xn; i++) {
       y_is_zero_x:
         if (num == 0) goto num_is_zero_x;
-	num += (BDIGIT_DBL)xds[i];
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
+        num += (BDIGIT_DBL)xds[i];
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
     }
     for (; i < zn; i++) {
       y_is_zero_z:
         if (num == 0) goto num_is_zero_z;
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
     }
     goto finish;
 
     for (;i < xn; i++) {
       num_is_zero_x:
-	zds[i] = xds[i];
+        zds[i] = xds[i];
     }
     for (; i < zn; i++) {
       num_is_zero_z:
-	zds[i] = 0;
+        zds[i] = 0;
     }
     goto finish;
 
@@ -5816,15 +5818,15 @@ bigadd(VALUE x, VALUE y, int sign)
 
     sign = (sign == BIGNUM_SIGN(y));
     if (BIGNUM_SIGN(x) != sign) {
-	if (sign) return bigsub(y, x);
-	return bigsub(x, y);
+        if (sign) return bigsub(y, x);
+        return bigsub(x, y);
     }
 
     if (BIGNUM_LEN(x) > BIGNUM_LEN(y)) {
-	len = BIGNUM_LEN(x) + 1;
+        len = BIGNUM_LEN(x) + 1;
     }
     else {
-	len = BIGNUM_LEN(y) + 1;
+        len = BIGNUM_LEN(y) + 1;
     }
     z = bignew(len, sign);
 
@@ -5841,26 +5843,26 @@ rb_big_plus(VALUE x, VALUE y)
     long n;
 
     if (FIXNUM_P(y)) {
-	n = FIX2LONG(y);
-	if ((n > 0) != BIGNUM_SIGN(x)) {
-	    if (n < 0) {
-		n = -n;
-	    }
-	    return bigsub_int(x, n);
-	}
-	if (n < 0) {
-	    n = -n;
-	}
-	return bigadd_int(x, n);
+        n = FIX2LONG(y);
+        if ((n > 0) != BIGNUM_SIGN(x)) {
+            if (n < 0) {
+                n = -n;
+            }
+            return bigsub_int(x, n);
+        }
+        if (n < 0) {
+            n = -n;
+        }
+        return bigadd_int(x, n);
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	return bignorm(bigadd(x, y, 1));
+        return bignorm(bigadd(x, y, 1));
     }
     else if (RB_FLOAT_TYPE_P(y)) {
-	return DBL2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
+        return DBL2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
     }
     else {
-	return rb_num_coerce_bin(x, y, '+');
+        return rb_num_coerce_bin(x, y, '+');
     }
 }
 
@@ -5870,26 +5872,26 @@ rb_big_minus(VALUE x, VALUE y)
     long n;
 
     if (FIXNUM_P(y)) {
-	n = FIX2LONG(y);
-	if ((n > 0) != BIGNUM_SIGN(x)) {
-	    if (n < 0) {
-		n = -n;
-	    }
-	    return bigadd_int(x, n);
-	}
-	if (n < 0) {
-	    n = -n;
-	}
-	return bigsub_int(x, n);
+        n = FIX2LONG(y);
+        if ((n > 0) != BIGNUM_SIGN(x)) {
+            if (n < 0) {
+                n = -n;
+            }
+            return bigadd_int(x, n);
+        }
+        if (n < 0) {
+            n = -n;
+        }
+        return bigsub_int(x, n);
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	return bignorm(bigadd(x, y, 0));
+        return bignorm(bigadd(x, y, 0));
     }
     else if (RB_FLOAT_TYPE_P(y)) {
-	return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
+        return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
     }
     else {
-	return rb_num_coerce_bin(x, y, '-');
+        return rb_num_coerce_bin(x, y, '-');
     }
 }
 
@@ -5948,15 +5950,15 @@ VALUE
 rb_big_mul(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+        y = rb_int2big(FIX2LONG(y));
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
     }
     else if (RB_FLOAT_TYPE_P(y)) {
-	return DBL2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
+        return DBL2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
     }
     else {
-	return rb_num_coerce_bin(x, y, '*');
+        return rb_num_coerce_bin(x, y, '*');
     }
 
     return bignorm(bigmul0(x, y));
@@ -5983,21 +5985,21 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
     BARY_TRUNC(xds, xn);
 
     if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1])) {
-	if (divp) *divp = rb_int2big(0);
-	if (modp) *modp = x;
-	return Qnil;
+        if (divp) *divp = rb_int2big(0);
+        if (modp) *modp = x;
+        return Qnil;
     }
     if (yn == 1) {
-	dd = yds[0];
-	z = bignew(xn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
-	zds = BDIGITS(z);
+        dd = yds[0];
+        z = bignew(xn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+        zds = BDIGITS(z);
         dd = bigdivrem_single(zds, xds, xn, dd);
-	if (modp) {
-	    *modp = rb_uint2big((uintptr_t)dd);
-	    BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x));
-	}
-	if (divp) *divp = z;
-	return Qnil;
+        if (modp) {
+            *modp = rb_uint2big((uintptr_t)dd);
+            BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x));
+        }
+        if (divp) *divp = z;
+        return Qnil;
     }
     if (xn == 2 && yn == 2) {
         BDIGIT_DBL x0 = bary2bdigitdbl(xds, 2);
@@ -6062,11 +6064,11 @@ bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 
     bigdivrem(x, y, divp, &mod);
     if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y) && !BIGZEROP(mod)) {
-	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
-	if (modp) *modp = bigadd(mod, y, 1);
+        if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
+        if (modp) *modp = bigadd(mod, y, 1);
     }
     else if (modp) {
-	*modp = mod;
+        *modp = mod;
     }
 }
 
@@ -6077,25 +6079,25 @@ rb_big_divide(VALUE x, VALUE y, ID op)
     VALUE z;
 
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+        y = rb_int2big(FIX2LONG(y));
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
     }
     else if (RB_FLOAT_TYPE_P(y)) {
-	if (op == '/') {
+        if (op == '/') {
             double dx = rb_big2dbl(x);
             return rb_flo_div_flo(DBL2NUM(dx), y);
-	}
-	else {
+        }
+        else {
             VALUE v;
-	    double dy = RFLOAT_VALUE(y);
-	    if (dy == 0.0) rb_num_zerodiv();
+            double dy = RFLOAT_VALUE(y);
+            if (dy == 0.0) rb_num_zerodiv();
             v = rb_big_divide(x, y, '/');
             return rb_dbl2big(RFLOAT_VALUE(v));
-	}
+        }
     }
     else {
-	return rb_num_coerce_bin(x, y, op);
+        return rb_num_coerce_bin(x, y, op);
     }
     bigdivmod(x, y, &z, 0);
 
@@ -6120,10 +6122,10 @@ rb_big_modulo(VALUE x, VALUE y)
     VALUE z;
 
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+        y = rb_int2big(FIX2LONG(y));
     }
     else if (!RB_BIGNUM_TYPE_P(y)) {
-	return rb_num_coerce_bin(x, y, '%');
+        return rb_num_coerce_bin(x, y, '%');
     }
     bigdivmod(x, y, 0, &z);
 
@@ -6136,10 +6138,10 @@ rb_big_remainder(VALUE x, VALUE y)
     VALUE z;
 
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+        y = rb_int2big(FIX2LONG(y));
     }
     else if (!RB_BIGNUM_TYPE_P(y)) {
-	return rb_num_coerce_bin(x, y, rb_intern("remainder"));
+        return rb_num_coerce_bin(x, y, rb_intern("remainder"));
     }
     bigdivrem(x, y, 0, &z);
 
@@ -6152,7 +6154,7 @@ rb_big_divmod(VALUE x, VALUE y)
     VALUE div, mod;
 
     if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+        y = rb_int2big(FIX2LONG(y));
     }
     else if (!RB_BIGNUM_TYPE_P(y)) {
         return rb_num_coerce_bin(x, y, idDivmod);
@@ -6166,9 +6168,9 @@ static VALUE
 big_shift(VALUE x, long n)
 {
     if (n < 0)
-	return big_lshift(x, 1+(unsigned long)(-(n+1)));
+        return big_lshift(x, 1+(unsigned long)(-(n+1)));
     else if (n > 0)
-	return big_rshift(x, (unsigned long)n);
+        return big_rshift(x, (unsigned long)n);
     return x;
 }
 
@@ -6192,9 +6194,9 @@ big_fdiv(VALUE x, VALUE y, long ey)
     l = ex - ey;
 #if SIZEOF_LONG > SIZEOF_INT
     {
-	/* Visual C++ can't be here */
-	if (l > INT_MAX) return HUGE_VAL;
-	if (l < INT_MIN) return 0.0;
+        /* Visual C++ can't be here */
+        if (l > INT_MAX) return HUGE_VAL;
+        if (l < INT_MIN) return 0.0;
     }
 #endif
     return ldexp(big2dbl(z), (int)l);
@@ -6228,19 +6230,19 @@ rb_big_fdiv_double(VALUE x, VALUE y)
 
     dx = big2dbl(x);
     if (FIXNUM_P(y)) {
-	dy = (double)FIX2LONG(y);
-	if (isinf(dx))
-	    return big_fdiv_int(x, rb_int2big(FIX2LONG(y)));
+        dy = (double)FIX2LONG(y);
+        if (isinf(dx))
+            return big_fdiv_int(x, rb_int2big(FIX2LONG(y)));
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	return big_fdiv_int(x, y);
+        return big_fdiv_int(x, y);
     }
     else if (RB_FLOAT_TYPE_P(y)) {
-	dy = RFLOAT_VALUE(y);
-	if (isnan(dy))
-	    return dy;
-	if (isinf(dx))
-	    return big_fdiv_float(x, y);
+        dy = RFLOAT_VALUE(y);
+        if (isnan(dy))
+            return dy;
+        if (isinf(dx))
+            return big_fdiv_float(x, y);
     }
     else {
         return NUM2DBL(rb_num_coerce_bin(x, y, idFdiv));
@@ -6265,20 +6267,20 @@ rb_big_pow(VALUE x, VALUE y)
     if (y == INT2FIX(0)) return INT2FIX(1);
     if (y == INT2FIX(1)) return x;
     if (RB_FLOAT_TYPE_P(y)) {
-	d = RFLOAT_VALUE(y);
-	if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x))) {
+        d = RFLOAT_VALUE(y);
+        if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x))) {
             return rb_dbl_complex_new_polar_pi(pow(-rb_big2dbl(x), d), d);
-	}
+        }
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	y = bignorm(y);
-	if (FIXNUM_P(y))
-	    goto again;
-	rb_warn("in a**b, b may be too big");
-	d = rb_big2dbl(y);
+        y = bignorm(y);
+        if (FIXNUM_P(y))
+            goto again;
+        rb_warn("in a**b, b may be too big");
+        d = rb_big2dbl(y);
     }
     else if (FIXNUM_P(y)) {
-	yy = FIX2LONG(y);
+        yy = FIX2LONG(y);
 
         if (yy < 0) {
             x = rb_big_pow(x, LONG2NUM(-yy));
@@ -6287,31 +6289,31 @@ rb_big_pow(VALUE x, VALUE y)
             else
                 return DBL2NUM(1.0 / NUM2DBL(x));
         }
-	else {
-	    VALUE z = 0;
-	    SIGNED_VALUE mask;
+        else {
+            VALUE z = 0;
+            SIGNED_VALUE mask;
             const size_t xbits = rb_absint_numwords(x, 1, NULL);
-	    const size_t BIGLEN_LIMIT = 32*1024*1024;
+            const size_t BIGLEN_LIMIT = 32*1024*1024;
 
-	    if (xbits == (size_t)-1 ||
+            if (xbits == (size_t)-1 ||
                 (xbits > BIGLEN_LIMIT) ||
                 (xbits * yy > BIGLEN_LIMIT)) {
-		rb_warn("in a**b, b may be too big");
-		d = (double)yy;
-	    }
-	    else {
-		for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
-		    if (z) z = bigsq(z);
-		    if (yy & mask) {
-			z = z ? bigtrunc(bigmul0(z, x)) : x;
-		    }
-		}
-		return bignorm(z);
-	    }
-	}
+                rb_warn("in a**b, b may be too big");
+                d = (double)yy;
+            }
+            else {
+                for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
+                    if (z) z = bigsq(z);
+                    if (yy & mask) {
+                        z = z ? bigtrunc(bigmul0(z, x)) : x;
+                    }
+                }
+                return bignorm(z);
+            }
+        }
     }
     else {
-	return rb_num_coerce_bin(x, y, idPow);
+        return rb_num_coerce_bin(x, y, idPow);
     }
     return DBL2NUM(pow(rb_big2dbl(x), d));
 }
@@ -6331,8 +6333,8 @@ bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     xds = BDIGITS(x);
 #if SIZEOF_BDIGIT >= SIZEOF_LONG
     if (!hibitsy) {
-	y &= xds[0];
-	return LONG2NUM(y);
+        y &= xds[0];
+        return LONG2NUM(y);
     }
 #endif
 
@@ -6361,10 +6363,10 @@ bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     }
 #endif
     for (;i < xn; i++) {
-	zds[i] = xds[i] & hibitsy;
+        zds[i] = xds[i] & hibitsy;
     }
     for (;i < zn; i++) {
-	zds[i] = hibitsx & hibitsy;
+        zds[i] = hibitsx & hibitsy;
     }
     twocomp2abs_bang(z, hibitsx && hibitsy);
     RB_GC_GUARD(x);
@@ -6384,12 +6386,12 @@ rb_big_and(VALUE x, VALUE y)
     long tmpn;
 
     if (!RB_INTEGER_TYPE_P(y)) {
-	return rb_num_coerce_bit(x, y, '&');
+        return rb_num_coerce_bit(x, y, '&');
     }
 
     hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigand_int(x, xn, hibitsx, FIX2LONG(y));
+        return bigand_int(x, xn, hibitsx, FIX2LONG(y));
     }
     hibitsy = abs2twocomp(&y, &yn);
     if (xn > yn) {
@@ -6411,10 +6413,10 @@ rb_big_and(VALUE x, VALUE y)
     zds = BDIGITS(z);
 
     for (i=0; i<n1; i++) {
-	zds[i] = ds1[i] & ds2[i];
+        zds[i] = ds1[i] & ds2[i];
     }
     for (; i<n2; i++) {
-	zds[i] = hibits1 & ds2[i];
+        zds[i] = hibits1 & ds2[i];
     }
     twocomp2abs_bang(z, hibits1 && hibits2);
     RB_GC_GUARD(x);
@@ -6503,12 +6505,12 @@ rb_big_or(VALUE x, VALUE y)
     long tmpn;
 
     if (!RB_INTEGER_TYPE_P(y)) {
-	return rb_num_coerce_bit(x, y, '|');
+        return rb_num_coerce_bit(x, y, '|');
     }
 
     hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigor_int(x, xn, hibitsx, FIX2LONG(y));
+        return bigor_int(x, xn, hibitsx, FIX2LONG(y));
     }
     hibitsy = abs2twocomp(&y, &yn);
     if (xn > yn) {
@@ -6530,10 +6532,10 @@ rb_big_or(VALUE x, VALUE y)
     zds = BDIGITS(z);
 
     for (i=0; i<n1; i++) {
-	zds[i] = ds1[i] | ds2[i];
+        zds[i] = ds1[i] | ds2[i];
     }
     for (; i<n2; i++) {
-	zds[i] = hibits1 | ds2[i];
+        zds[i] = hibits1 | ds2[i];
     }
     twocomp2abs_bang(z, hibits1 || hibits2);
     RB_GC_GUARD(x);
@@ -6597,12 +6599,12 @@ rb_big_xor(VALUE x, VALUE y)
     long tmpn;
 
     if (!RB_INTEGER_TYPE_P(y)) {
-	return rb_num_coerce_bit(x, y, '^');
+        return rb_num_coerce_bit(x, y, '^');
     }
 
     hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigxor_int(x, xn, hibitsx, FIX2LONG(y));
+        return bigxor_int(x, xn, hibitsx, FIX2LONG(y));
     }
     hibitsy = abs2twocomp(&y, &yn);
     if (xn > yn) {
@@ -6621,10 +6623,10 @@ rb_big_xor(VALUE x, VALUE y)
     zds = BDIGITS(z);
 
     for (i=0; i<n1; i++) {
-	zds[i] = ds1[i] ^ ds2[i];
+        zds[i] = ds1[i] ^ ds2[i];
     }
     for (; i<n2; i++) {
-	zds[i] = hibitsx ^ ds2[i];
+        zds[i] = hibitsx ^ ds2[i];
     }
     twocomp2abs_bang(z, (hibits1 ^ hibits2) != 0);
     RB_GC_GUARD(x);
@@ -6640,25 +6642,25 @@ rb_big_lshift(VALUE x, VALUE y)
     int shift_numbits;
 
     for (;;) {
-	if (FIXNUM_P(y)) {
-	    long l = FIX2LONG(y);
+        if (FIXNUM_P(y)) {
+            long l = FIX2LONG(y);
             unsigned long shift;
-	    if (0 <= l) {
-		lshift_p = 1;
+            if (0 <= l) {
+                lshift_p = 1;
                 shift = l;
             }
             else {
-		lshift_p = 0;
-		shift = 1+(unsigned long)(-(l+1));
-	    }
+                lshift_p = 0;
+                shift = 1+(unsigned long)(-(l+1));
+            }
             shift_numbits = (int)(shift & (BITSPERDIG-1));
             shift_numdigits = shift >> bit_length(BITSPERDIG-1);
             return bignorm(big_shift3(x, lshift_p, shift_numdigits, shift_numbits));
-	}
-	else if (RB_BIGNUM_TYPE_P(y)) {
+        }
+        else if (RB_BIGNUM_TYPE_P(y)) {
             return bignorm(big_shift2(x, 1, y));
-	}
-	y = rb_to_int(y);
+        }
+        y = rb_to_int(y);
     }
 }
 
@@ -6670,8 +6672,8 @@ rb_big_rshift(VALUE x, VALUE y)
     int shift_numbits;
 
     for (;;) {
-	if (FIXNUM_P(y)) {
-	    long l = FIX2LONG(y);
+        if (FIXNUM_P(y)) {
+            long l = FIX2LONG(y);
             unsigned long shift;
             if (0 <= l) {
                 lshift_p = 0;
@@ -6679,16 +6681,16 @@ rb_big_rshift(VALUE x, VALUE y)
             }
             else {
                 lshift_p = 1;
-		shift = 1+(unsigned long)(-(l+1));
-	    }
+                shift = 1+(unsigned long)(-(l+1));
+            }
             shift_numbits = (int)(shift & (BITSPERDIG-1));
             shift_numdigits = shift >> bit_length(BITSPERDIG-1);
             return bignorm(big_shift3(x, lshift_p, shift_numdigits, shift_numbits));
-	}
-	else if (RB_BIGNUM_TYPE_P(y)) {
+        }
+        else if (RB_BIGNUM_TYPE_P(y)) {
             return bignorm(big_shift2(x, 0, y));
-	}
-	y = rb_to_int(y);
+        }
+        y = rb_to_int(y);
     }
 }
 
@@ -6702,22 +6704,22 @@ rb_big_aref(VALUE x, VALUE y)
     BDIGIT bit;
 
     if (RB_BIGNUM_TYPE_P(y)) {
-	if (BIGNUM_NEGATIVE_P(y))
-	    return INT2FIX(0);
-	bigtrunc(y);
-	if (BIGSIZE(y) > sizeof(size_t)) {
-	    return BIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
-	}
+        if (BIGNUM_NEGATIVE_P(y))
+            return INT2FIX(0);
+        bigtrunc(y);
+        if (BIGSIZE(y) > sizeof(size_t)) {
+            return BIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
+        }
 #if SIZEOF_SIZE_T <= SIZEOF_LONG
-	shift = big2ulong(y, "long");
+        shift = big2ulong(y, "long");
 #else
-	shift = big2ull(y, "long long");
+        shift = big2ull(y, "long long");
 #endif
     }
     else {
-	l = NUM2LONG(y);
-	if (l < 0) return INT2FIX(0);
-	shift = (size_t)l;
+        l = NUM2LONG(y);
+        if (l < 0) return INT2FIX(0);
+        shift = (size_t)l;
     }
     s1 = shift/BITSPERDIG;
     s2 = shift%BITSPERDIG;
@@ -6778,8 +6780,8 @@ VALUE
 rb_big_abs(VALUE x)
 {
     if (BIGNUM_NEGATIVE_P(x)) {
-	x = rb_big_clone(x);
-	BIGNUM_SET_POSITIVE_SIGN(x);
+        x = rb_big_clone(x);
+        BIGNUM_SET_POSITIVE_SIGN(x);
     }
     return x;
 }
@@ -6853,7 +6855,7 @@ VALUE
 rb_big_even_p(VALUE num)
 {
     if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
-	return Qfalse;
+        return Qfalse;
     }
     return Qtrue;
 }
@@ -6884,21 +6886,21 @@ estimate_initial_sqrt(VALUE *xp, const size_t xn, const BDIGIT *nds, size_t len)
     double f;
 
     if (rshift > 0) {
-	lowbits = (BDIGIT)d & ~(~(BDIGIT)1U << rshift);
-	d >>= rshift;
+        lowbits = (BDIGIT)d & ~(~(BDIGIT)1U << rshift);
+        d >>= rshift;
     }
     else if (rshift < 0) {
-	d <<= -rshift;
-	d |= nds[len-dbl_per_bdig-1] >> (BITSPERDIG+rshift);
+        d <<= -rshift;
+        d |= nds[len-dbl_per_bdig-1] >> (BITSPERDIG+rshift);
     }
     f = sqrt(BDIGIT_DBL_TO_DOUBLE(d));
     d = (BDIGIT_DBL)ceil(f);
     if (BDIGIT_DBL_TO_DOUBLE(d) == f) {
-	if (lowbits || (lowbits = !bary_zero_p(nds, len-dbl_per_bdig)))
-	    ++d;
+        if (lowbits || (lowbits = !bary_zero_p(nds, len-dbl_per_bdig)))
+            ++d;
     }
     else {
-	lowbits = 1;
+        lowbits = 1;
     }
     rshift /= 2;
     rshift += (2-(len&1))*BITSPERDIG/2;
@@ -6930,29 +6932,29 @@ rb_big_isqrt(VALUE n)
     BDIGIT *xds;
 
     if (len <= 2) {
-	BDIGIT sq = rb_bdigit_dbl_isqrt(bary2bdigitdbl(nds, len));
+        BDIGIT sq = rb_bdigit_dbl_isqrt(bary2bdigitdbl(nds, len));
 #if SIZEOF_BDIGIT > SIZEOF_LONG
-	return ULL2NUM(sq);
+        return ULL2NUM(sq);
 #else
-	return ULONG2NUM(sq);
+        return ULONG2NUM(sq);
 #endif
     }
     else if ((xds = estimate_initial_sqrt(&x, xn, nds, len)) != 0) {
-	size_t tn = xn + BIGDIVREM_EXTRA_WORDS;
-	VALUE t = bignew_1(0, tn, 1);
-	BDIGIT *tds = BDIGITS(t);
-	tn = BIGNUM_LEN(t);
-
-	/* t = n/x */
-	while (bary_divmod_branch(tds, tn, NULL, 0, nds, len, xds, xn),
-	       bary_cmp(tds, tn, xds, xn) < 0) {
-	    int carry;
-	    BARY_TRUNC(tds, tn);
-	    /* x = (x+t)/2 */
-	    carry = bary_add(xds, xn, xds, xn, tds, tn);
-	    bary_small_rshift(xds, xds, xn, 1, carry);
-	    tn = BIGNUM_LEN(t);
-	}
+        size_t tn = xn + BIGDIVREM_EXTRA_WORDS;
+        VALUE t = bignew_1(0, tn, 1);
+        BDIGIT *tds = BDIGITS(t);
+        tn = BIGNUM_LEN(t);
+
+        /* t = n/x */
+        while (bary_divmod_branch(tds, tn, NULL, 0, nds, len, xds, xn),
+               bary_cmp(tds, tn, xds, xn) < 0) {
+            int carry;
+            BARY_TRUNC(tds, tn);
+            /* x = (x+t)/2 */
+            carry = bary_add(xds, xn, xds, xn, tds, tn);
+            bary_small_rshift(xds, xds, xn, 1, carry);
+            tn = BIGNUM_LEN(t);
+        }
     }
     RBASIC_SET_CLASS_RAW(x, rb_cInteger);
     return x;
@@ -7160,7 +7162,7 @@ rb_int_powm(int const argc, VALUE * const argv, VALUE const num)
         }
         else {
             if (rb_bigzero_p(m)) rb_num_zerodiv();
-	    if (bignorm(m) == INT2FIX(1)) return INT2FIX(0);
+            if (bignorm(m) == INT2FIX(1)) return INT2FIX(0);
             return int_pow_tmp3(rb_int_modulo(a, m), b, m, nega_flg);
         }
     }
diff --git a/bin/gem b/bin/gem
index a4ec754abb..1c16ea7ddd 100755
--- a/bin/gem
+++ b/bin/gem
@@ -5,21 +5,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-
-required_version = Gem::Requirement.new ">= 1.8.7"
-
-unless required_version.satisfied_by? Gem.ruby_version then
-  abort "Expected Ruby Version #{required_version}, is #{Gem.ruby_version}"
-end
-
-args = ARGV.clone
-
-begin
-  Gem::GemRunner.new.run args
-rescue Gem::SystemExitException => e
-  exit e.exit_code
-end
+require "rubygems/gem_runner"
 
+Gem::GemRunner.new.run ARGV.clone
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 3d42390254..f9b3e919b8 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -61,7 +61,7 @@ if !Dir.respond_to?(:mktmpdir)
 end
 
 # Configuration
-BT = Struct.new(:ruby,
+bt = Struct.new(:ruby,
                 :verbose,
                 :color,
                 :tty,
@@ -73,9 +73,78 @@ BT = Struct.new(:ruby,
                 :failed,
                 :reset,
                 :columns,
+                :window_width,
                 :width,
+                :indent,
                 :platform,
-                ).new
+                )
+BT = Class.new(bt) do
+  def indent=(n)
+    super
+    if (self.columns ||= 0) < n
+      $stderr.print(' ' * (n - self.columns))
+    end
+    self.columns = indent
+  end
+
+  def putc(c)
+    unless self.quiet
+      if self.window_width == nil
+        unless w = ENV["COLUMNS"] and (w = w.to_i) > 0
+          w = 80
+        end
+        w -= 1
+        self.window_width = w
+      end
+      if self.window_width and self.columns >= self.window_width
+        $stderr.print "\n", " " * (self.indent ||= 0)
+        self.columns = indent
+      end
+      $stderr.print c
+      $stderr.flush
+      self.columns += 1
+    end
+  end
+
+  def wn=(wn)
+    unless wn == 1
+      if /(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:((?:\\.|\S)+))/ =~ ENV.delete("MAKEFLAGS")
+        begin
+          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
+          r.close_on_exec = true
+          w.close_on_exec = true
+          tokens = r.read_nonblock(wn > 0 ? wn : 1024, exception: false)
+          r.close
+          if String === tokens
+            tokens.freeze
+            auth = w
+            w = nil
+            at_exit {auth << tokens; auth.close}
+            wn = tokens.size + 1
+          else
+            w.close
+            wn = 1
+          end
+        end
+      end
+      if wn <= 0
+        require 'etc'
+        wn = [Etc.nprocessors / 2, 1].max
+      end
+    end
+    super wn
+  end
+end.new
 
 BT_STATE = Struct.new(:count, :error).new
 
@@ -87,7 +156,7 @@ def main
   BT.color = nil
   BT.tty = nil
   BT.quiet = false
-  BT.wn = 1
+  # BT.wn = 1
   dir = nil
   quiet = false
   tests = nil
@@ -122,12 +191,7 @@ def main
       BT.quiet = true
       true
     when /\A-j(\d+)?/
-      wn = $1.to_i
-      if wn <= 0
-        require 'etc'
-        wn = [Etc.nprocessors / 2, 1].max
-      end
-      BT.wn = wn
+      BT.wn = $1.to_i
       true
     when /\A(-v|--v(erbose))\z/
       BT.verbose = true
@@ -154,8 +218,7 @@ End
     end
   }
   if tests and not ARGV.empty?
-    $stderr.puts "--tests and arguments are exclusive"
-    exit false
+    abort "--sets and arguments are exclusive"
   end
   tests ||= ARGV
   tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
@@ -164,6 +227,7 @@ End
   BT.progress = %w[- \\ | /]
   BT.progress_bs = "\b" * BT.progress[0].size
   BT.tty = $stderr.tty? if BT.tty.nil?
+  BT.wn ||= /-j(\d+)?/ =~ (ENV["MAKEFLAGS"] || ENV["MFLAGS"]) ? $1.to_i : 1
 
   case BT.color
   when nil
@@ -241,7 +305,7 @@ def concurrent_exec_test
     end
   end
 
-  $stderr.print ' ' unless BT.quiet
+  BT.indent = 1
   aq.close
   i = 1
   term_wn = 0
@@ -253,7 +317,7 @@ def concurrent_exec_test
         when BT.tty
           $stderr.print "#{BT.progress_bs}#{BT.progress[(i+=1) % BT.progress.size]}"
         else
-          $stderr.print '.'
+          BT.putc '.'
         end
       else
         term_wn += 1
@@ -275,7 +339,7 @@ def exec_test(pathes)
 
   # execute tests
   if BT.wn > 1
-    concurrent_exec_test if BT.wn > 1
+    concurrent_exec_test
   else
     prev_basename = nil
     Assertion.all.each do |basename, assertions|
@@ -428,7 +492,7 @@ class Assertion < Struct.new(:src, :path, :lineno, :proc)
       elsif BT.verbose
         $stderr.printf(". %.3f\n", t)
       else
-        $stderr.print '.'
+        BT.putc '.'
       end
     else
       $stderr.print "#{BT.failed}F"
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_io.rb b/bootstraptest/test_io.rb
index 73deca8383..666e5a011b 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -1,3 +1,4 @@
+/freebsd/ =~ RUBY_PLATFORM or
 assert_finish 5, %q{
   r, w = IO.pipe
   t1 = Thread.new { r.sysread(1) }
@@ -30,6 +31,7 @@ assert_finish 10, %q{
   end
 }, '[ruby-dev:32566]'
 
+/freebsd/ =~ RUBY_PLATFORM or
 assert_finish 5, %q{
   r, w = IO.pipe
   Thread.new {
@@ -83,6 +85,7 @@ assert_normal_exit %q{
   ARGF.set_encoding "foo"
 }
 
+/freebsd/ =~ RUBY_PLATFORM or
 10.times do
   assert_normal_exit %q{
     at_exit { p :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 503af1ab80..5c655b8f25 100644
--- a/bootstraptest/test_yjit.rb
+++ b/bootstraptest/test_yjit.rb
@@ -1,3 +1,53 @@
+# 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)
+    victim = 5
+    five.define_singleton_method(:respond_to?) do |_, _|
+      victim = nil
+    end
+
+    # +1 makes YJIT track that victim is a number and
+    # defined? calls respond_to? from above indirectly
+    unless (victim + 1) && defined?(five.something)
+      # Would return wrong result if we still think `five` is a number
+      victim.nil?
+    end
+  end
+
+  local_setting_cmp(Object.new)
+  local_setting_cmp(Object.new)
+}
+
 assert_equal '18374962167983112447', %q{
   # regression test for incorrectly discarding 32 bits of a pointer when it
   # comes to default values.
@@ -14,7 +64,7 @@ assert_equal '18374962167983112447', %q{
 }
 
 assert_normal_exit %q{
-  # regression test for a leak caught by an asert on --yjit-call-threshold=2
+  # regression test for a leak caught by an assert on --yjit-call-threshold=2
   Foo = 1
 
   eval("def foo = [#{(['Foo,']*256).join}]")
@@ -25,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")
@@ -178,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
@@ -786,7 +861,7 @@ assert_equal "good", %q{
   foo
 
   begin
-    GC.verify_compaction_references(double_heap: true, toward: :empty)
+    GC.verify_compaction_references(expand_heap: true, toward: :empty)
   rescue NotImplementedError
     # in case compaction isn't supported
   end
@@ -1098,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
@@ -1204,6 +1311,19 @@ assert_equal '[1, 2, 42]', %q{
   [foo {1}, foo {2}, foo {42}]
 }
 
+# test calling without block param
+assert_equal '[1, false, 2, false]', %q{
+  def bar
+    block_given? && yield
+  end
+
+  def foo(&block)
+    bar(&block)
+  end
+
+  [foo { 1 }, foo, foo { 2 }, foo]
+}
+
 # test calling block param failing
 assert_equal '42', %q{
   def foo(&block)
@@ -1354,7 +1474,7 @@ assert_equal 'meh', %q{
   inval_method
 }
 
-# test that overriding to_s on a String subclass isn't over-optimised
+# test that overriding to_s on a String subclass works consistently
 assert_equal 'meh', %q{
   class MyString < String
     def to_s
@@ -1368,7 +1488,7 @@ assert_equal 'meh', %q{
 
   OBJ = MyString.new
 
-  # Should return 'meh' both times
+  # Should return '' both times
   test_to_s("")
   test_to_s("")
 
@@ -1393,6 +1513,149 @@ assert_equal 'foo', %q{
   make_str("foo")
 }
 
+# Test that String unary plus returns the same object ID for an unfrozen string.
+assert_equal 'true', %q{
+  def jittable_method
+    str = "bar"
+
+    old_obj_id = str.object_id
+    uplus_str = +str
+
+    uplus_str.object_id == old_obj_id
+  end
+  jittable_method
+}
+
+# Test that String unary plus returns a different unfrozen string when given a frozen string
+assert_equal 'false', %q{
+  # Logic needs to be inside an ISEQ, such as a method, for YJIT to compile it
+  def jittable_method
+    frozen_str = "foo".freeze
+
+    old_obj_id = frozen_str.object_id
+    uplus_str = +frozen_str
+
+    uplus_str.object_id == old_obj_id || uplus_str.frozen?
+  end
+
+  jittable_method
+}
+
+# String-subclass objects should behave as expected inside string-interpolation via concatstrings
+assert_equal 'monkeys / monkeys, yo!', %q{
+  class MyString < String
+    # This is a terrible idea in production code, but we'd like YJIT to match CRuby
+    def to_s
+      super + ", yo!"
+    end
+  end
+
+  def jittable_method
+    m = MyString.new('monkeys')
+    "#{m} / #{m.to_s}"
+  end
+
+  jittable_method
+}
+
+# String-subclass objects should behave as expected for string equality
+assert_equal 'false', %q{
+  class MyString < String
+    # This is a terrible idea in production code, but we'd like YJIT to match CRuby
+    def ==(b)
+      "#{self}_" == b
+    end
+  end
+
+  def jittable_method
+    ma = MyString.new("a")
+
+    # Check equality with string-subclass receiver
+    ma == "a" || ma != "a_" ||
+      # Check equality with string receiver
+      "a_" == ma || "a" != ma ||
+      # Check equality between string subclasses
+      ma != MyString.new("a_") ||
+      # Make sure "string always equals itself" check isn't used with overridden equality
+      ma == ma
+  end
+  jittable_method
+}
+
+# Test to_s duplicates a string subclass object but not a string
+assert_equal 'false', %q{
+  class MyString < String; end
+
+  def jittable_method
+    a = "a"
+    ma = MyString.new("a")
+
+    a.object_id != a.to_s.object_id ||
+      ma.object_id == ma.to_s.object_id
+  end
+  jittable_method
+}
+
+# Test freeze on string subclass
+assert_equal 'true', %q{
+  class MyString < String; end
+
+  def jittable_method
+    fma = MyString.new("a").freeze
+
+    # Freezing a string subclass should not duplicate it
+    fma.object_id == fma.freeze.object_id
+  end
+  jittable_method
+}
+
+# Test unary minus on string subclass
+assert_equal 'true', %q{
+  class MyString < String; end
+
+  def jittable_method
+    ma = MyString.new("a")
+    fma = MyString.new("a").freeze
+
+    # Unary minus on frozen string subclass should not duplicate it
+    fma.object_id == (-fma).object_id &&
+      # Unary minus on unfrozen string subclass should duplicate it
+      ma.object_id != (-ma).object_id
+  end
+  jittable_method
+}
+
+# Test unary plus on string subclass
+assert_equal 'true', %q{
+  class MyString < String; end
+
+  def jittable_method
+    fma = MyString.new("a").freeze
+
+    # Unary plus on frozen string subclass should not duplicate it
+    fma.object_id != (+fma).object_id
+  end
+  jittable_method
+}
+
+# Test << operator on string subclass
+assert_equal 'abab', %q{
+  class MyString < String; end
+
+  def jittable_method
+    a = -"a"
+    mb = MyString.new("b")
+
+    buf = String.new
+    mbuf = MyString.new
+
+    buf << a << mb
+    mbuf << a << mb
+
+    buf + mbuf
+  end
+  jittable_method
+}
 
 # test invokebuiltin as used in struct assignment
 assert_equal '123', %q{
@@ -1974,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{
@@ -2056,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{
@@ -2071,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
@@ -2725,11 +3008,20 @@ assert_equal 'new', %q{
     foo
   end
 
+  def bar
+    :bar
+  end
+
+
   test
   test
 
   RubyVM::YJIT.simulate_oom! if defined?(RubyVM::YJIT)
 
+  # Old simulat_omm! leaves one byte of space and this fills it up
+  bar
+  bar
+
   def foo
     :new
   end
@@ -2890,3 +3182,349 @@ assert_equal '10', %q{
 
   a.length
 }
+
+# checktype
+assert_equal 'false', %q{
+    def function()
+        [1, 2] in [Integer, String]
+    end
+    function()
+}
+
+# opt_send_without_block (VM_METHOD_TYPE_ATTRSET)
+assert_equal 'foo', %q{
+    class Foo
+      attr_writer :foo
+
+      def foo()
+        self.foo = "foo"
+      end
+    end
+    foo = Foo.new
+    foo.foo
+}
+
+# anytostring, intern
+assert_equal 'true', %q{
+    def foo()
+      :"#{true}"
+    end
+    foo()
+}
+
+# toregexp, objtostring
+assert_equal '/true/', %q{
+    def foo()
+      /#{true}/
+    end
+    foo().inspect
+}
+
+# concatstrings, objtostring
+assert_equal '9001', %q{
+    def foo()
+      "#{9001}"
+    end
+    foo()
+}
+
+# opt_send_without_block (VM_METHOD_TYPE_CFUNC)
+assert_equal 'nil', %q{
+    def foo
+      nil.inspect # argc: 0
+    end
+    foo
+}
+assert_equal '4', %q{
+    def foo
+      2.pow(2) # argc: 1
+    end
+    foo
+}
+assert_equal 'aba', %q{
+    def foo
+      "abc".tr("c", "a") # argc: 2
+    end
+    foo
+}
+assert_equal 'true', %q{
+    def foo
+      respond_to?(:inspect) # argc: -1
+    end
+    foo
+}
+assert_equal '["a", "b"]', %q{
+    def foo
+      "a\nb".lines(chomp: true) # kwargs
+    end
+    foo
+}
+
+# invokebuiltin
+assert_equal '123', %q{
+  def foo(obj)
+    obj.foo = 123
+  end
+
+  struct = Struct.new(:foo)
+  obj = struct.new
+  foo(obj)
+}
+
+# invokebuiltin_delegate
+assert_equal '.', %q{
+  def foo(path)
+    Dir.open(path).path
+  end
+  foo(".")
+}
+
+# opt_invokebuiltin_delegate_leave
+assert_equal '[0]', %q{"\x00".unpack("c")}
+
+# opt_send_without_block (VM_METHOD_TYPE_ISEQ)
+assert_equal '1', %q{
+  def foo = 1
+  def bar = foo
+  bar
+}
+assert_equal '[1, 2, 3]', %q{
+  def foo(a, b) = [1, a, b]
+  def bar = foo(2, 3)
+  bar
+}
+assert_equal '[1, 2, 3, 4, 5, 6]', %q{
+  def foo(a, b, c:, d:, e: 0, f: 6) = [a, b, c, d, e, f]
+  def bar = foo(1, 2, c: 3, d: 4, e: 5)
+  bar
+}
+assert_equal '[1, 2, 3, 4]', %q{
+  def foo(a, b = 2) = [a, b]
+  def bar = foo(1) + foo(3, 4)
+  bar
+}
+
+assert_equal '1', %q{
+  def foo(a) = a
+  def bar = foo(1) { 2 }
+  bar
+}
+assert_equal '[1, 2]', %q{
+  def foo(a, &block) = [a, block.call]
+  def bar = foo(1) { 2 }
+  bar
+}
+
+# opt_send_without_block (VM_METHOD_TYPE_IVAR)
+assert_equal 'foo', %q{
+  class Foo
+    attr_reader :foo
+
+    def initialize
+      @foo = "foo"
+    end
+  end
+  Foo.new.foo
+}
+
+# opt_send_without_block (VM_METHOD_TYPE_OPTIMIZED)
+assert_equal 'foo', %q{
+  Foo = Struct.new(:bar)
+  Foo.new("bar").bar = "foo"
+}
+assert_equal 'foo', %q{
+  Foo = Struct.new(:bar)
+  Foo.new("foo").bar
+}
+
+# getblockparamproxy
+assert_equal 'foo', %q{
+  def foo(&block)
+    block.call
+  end
+  foo { "foo" }
+}
+
+# getblockparam
+assert_equal 'foo', %q{
+  def foo(&block)
+    block
+  end
+  foo { "foo" }.call
+}
+
+assert_equal '[1, 2]', %q{
+  def foo
+    x = [2]
+    [1, *x]
+  end
+
+  foo
+  foo
+}
+
+# respond_to? with changing symbol
+assert_equal 'false', %q{
+  def foo(name)
+    :sym.respond_to?(name)
+  end
+  foo(:to_s)
+  foo(:to_s)
+  foo(:not_exist)
+}
+
+# respond_to? with method being defined
+assert_equal 'true', %q{
+  def foo
+    :sym.respond_to?(:not_yet_defined)
+  end
+  foo
+  foo
+  module Kernel
+    def not_yet_defined = true
+  end
+  foo
+}
+
+# respond_to? with undef method
+assert_equal 'false', %q{
+  module Kernel
+    def to_be_removed = true
+  end
+  def foo
+    :sym.respond_to?(:to_be_removed)
+  end
+  foo
+  foo
+  class Object
+    undef_method :to_be_removed
+  end
+  foo
+}
+
+# respond_to? with respond_to_missing?
+assert_equal 'true', %q{
+  class Foo
+  end
+  def foo(x)
+    x.respond_to?(:bar)
+  end
+  foo(Foo.new)
+  foo(Foo.new)
+  class Foo
+    def respond_to_missing?(*) = true
+  end
+  foo(Foo.new)
+}
+
+# bmethod
+assert_equal '[1, 2, 3]', %q{
+  one = 1
+  define_method(:foo) do
+    one
+  end
+
+  3.times.map { |i| foo + i }
+}
+
+# return inside bmethod
+assert_equal 'ok', %q{
+  define_method(:foo) do
+    1.tap { return :ok }
+  end
+
+  foo
+}
+
+# bmethod optional and keywords
+assert_equal '[[1, nil, 2]]', %q{
+  define_method(:opt_and_kwargs) do |a = {}, b: nil, c: nil|
+    [a, b, c]
+  end
+
+  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 96339afdb5..38ad5a1629 100644
--- a/builtin.h
+++ b/builtin.h
@@ -13,11 +13,11 @@ 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) {\
-  .name = #_name, \
+  .name = _i < 0 ? NULL : #_name, \
   .func_ptr = (void *)_fname, \
   .argc = _arity, \
   .index = _i, \
@@ -33,28 +33,65 @@ typedef struct rb_execution_context_struct rb_execution_context_t;
 
 /* The following code is generated by the following Ruby script:
 
+typedef = proc {|i, args|
+  "typedef VALUE (*rb_builtin_arity#{i}_function_type)(rb_execution_context_t *ec, VALUE self#{args});"
+}
+puts typedef[0, ""]
+(1..15).each {|i|
+  puts typedef[i, ",\n        " + (0...i).map{"VALUE"}.join(", ")]
+}
 16.times{|i|
-  args = (i > 0 ? ', ' : '') + (0...i).map{"VALUE"}.join(', ')
-  puts "static inline void rb_builtin_function_check_arity#{i}(VALUE (*f)(rb_execution_context_t *ec, VALUE self#{args})){}"
+  puts "static inline void rb_builtin_function_check_arity#{i}(rb_builtin_arity#{i}_function_type f){}"
 }
 */
 
-static inline void rb_builtin_function_check_arity0(VALUE (*f)(rb_execution_context_t *ec, VALUE self)){}
-static inline void rb_builtin_function_check_arity1(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE)){}
-static inline void rb_builtin_function_check_arity2(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity3(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity4(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity5(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity6(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity7(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity8(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity9(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity10(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity11(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity12(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity13(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity14(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
-static inline void rb_builtin_function_check_arity15(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+typedef VALUE (*rb_builtin_arity0_function_type)(rb_execution_context_t *ec, VALUE self);
+typedef VALUE (*rb_builtin_arity1_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE);
+typedef VALUE (*rb_builtin_arity2_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity3_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity4_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity5_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity6_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity7_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity8_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity9_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity10_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity11_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity12_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity13_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity14_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+typedef VALUE (*rb_builtin_arity15_function_type)(rb_execution_context_t *ec, VALUE self,
+        VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+static inline void rb_builtin_function_check_arity0(rb_builtin_arity0_function_type f){}
+static inline void rb_builtin_function_check_arity1(rb_builtin_arity1_function_type f){}
+static inline void rb_builtin_function_check_arity2(rb_builtin_arity2_function_type f){}
+static inline void rb_builtin_function_check_arity3(rb_builtin_arity3_function_type f){}
+static inline void rb_builtin_function_check_arity4(rb_builtin_arity4_function_type f){}
+static inline void rb_builtin_function_check_arity5(rb_builtin_arity5_function_type f){}
+static inline void rb_builtin_function_check_arity6(rb_builtin_arity6_function_type f){}
+static inline void rb_builtin_function_check_arity7(rb_builtin_arity7_function_type f){}
+static inline void rb_builtin_function_check_arity8(rb_builtin_arity8_function_type f){}
+static inline void rb_builtin_function_check_arity9(rb_builtin_arity9_function_type f){}
+static inline void rb_builtin_function_check_arity10(rb_builtin_arity10_function_type f){}
+static inline void rb_builtin_function_check_arity11(rb_builtin_arity11_function_type f){}
+static inline void rb_builtin_function_check_arity12(rb_builtin_arity12_function_type f){}
+static inline void rb_builtin_function_check_arity13(rb_builtin_arity13_function_type f){}
+static inline void rb_builtin_function_check_arity14(rb_builtin_arity14_function_type f){}
+static inline void rb_builtin_function_check_arity15(rb_builtin_arity15_function_type f){}
 
 PUREFUNC(VALUE rb_vm_lvar_exposed(rb_execution_context_t *ec, int index));
 VALUE rb_vm_lvar_exposed(rb_execution_context_t *ec, int index);
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 7b91f06229..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;
     }
@@ -106,7 +106,7 @@ rb_class_remove_from_super_subclasses(VALUE klass)
             next->prev = prev;
         }
 
-	xfree(entry);
+        xfree(entry);
     }
 
     RCLASS_SUBCLASS_ENTRY(klass) = NULL;
@@ -123,11 +123,11 @@ rb_class_remove_from_module_subclasses(VALUE klass)
         if (prev) {
             prev->next = next;
         }
-	if (next) {
+        if (next) {
             next->prev = prev;
-	}
+        }
 
-	xfree(entry);
+        xfree(entry);
     }
 
     RCLASS_MODULE_SUBCLASS_ENTRY(klass) = NULL;
@@ -148,11 +148,11 @@ rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE arg)
     /* do not be tempted to simplify this loop into a for loop, the order of
        operations is important here if `f` modifies the linked list */
     while (cur) {
-	VALUE curklass = cur->klass;
-	cur = cur->next;
+        VALUE curklass = cur->klass;
+        cur = cur->next;
         // do not trigger GC during f, otherwise the cur will become
         // a dangling pointer if the subclass is collected
-	f(curklass, arg);
+        f(curklass, arg);
     }
 }
 
@@ -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))
@@ -316,13 +311,13 @@ rb_check_inheritable(VALUE super)
 {
     if (!RB_TYPE_P(super, T_CLASS)) {
         rb_raise(rb_eTypeError, "superclass must be an instance of Class (given an instance of %"PRIsVALUE")",
-		 rb_obj_class(super));
+                 rb_obj_class(super));
     }
     if (RBASIC(super)->flags & FL_SINGLETON) {
-	rb_raise(rb_eTypeError, "can't make subclass of singleton class");
+        rb_raise(rb_eTypeError, "can't make subclass of singleton class");
     }
     if (super == rb_cClass) {
-	rb_raise(rb_eTypeError, "can't make subclass of Class");
+        rb_raise(rb_eTypeError, "can't make subclass of Class");
     }
 }
 
@@ -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
@@ -344,12 +345,12 @@ static void
 clone_method(VALUE old_klass, VALUE new_klass, ID mid, const rb_method_entry_t *me)
 {
     if (me->def->type == VM_METHOD_TYPE_ISEQ) {
-	rb_cref_t *new_cref;
-	rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass, &new_cref);
-	rb_add_method_iseq(new_klass, mid, me->def->body.iseq.iseqptr, new_cref, METHOD_ENTRY_VISI(me));
+        rb_cref_t *new_cref;
+        rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass, &new_cref);
+        rb_add_method_iseq(new_klass, mid, me->def->body.iseq.iseqptr, new_cref, METHOD_ENTRY_VISI(me));
     }
     else {
-	rb_method_entry_set(new_klass, mid, me, METHOD_ENTRY_VISI(me));
+        rb_method_entry_set(new_klass, mid, me, METHOD_ENTRY_VISI(me));
     }
 }
 
@@ -393,45 +394,74 @@ static void
 class_init_copy_check(VALUE clone, VALUE orig)
 {
     if (orig == rb_cBasicObject) {
-	rb_raise(rb_eTypeError, "can't copy the root class");
+        rb_raise(rb_eTypeError, "can't copy the root class");
     }
     if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
-	rb_raise(rb_eTypeError, "already initialized class");
+        rb_raise(rb_eTypeError, "already initialized class");
     }
     if (FL_TEST(orig, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't copy singleton class");
+        rb_raise(rb_eTypeError, "can't copy singleton class");
     }
 }
 
+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;
+        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)) {
-	st_data_t id;
+    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);
-	CONST_ID(id, "__classpath__");
-	st_delete(RCLASS_IV_TBL(clone), &id, 0);
-	CONST_ID(id, "__classid__");
-	st_delete(RCLASS_IV_TBL(clone), &id, 0);
+        rb_iv_tbl_copy(clone, orig);
+        CONST_ID(id, "__tmp_classpath__");
+        rb_attr_delete(clone, id);
+        CONST_ID(id, "__classpath__");
+        rb_attr_delete(clone, id);
     }
     if (RCLASS_CONST_TBL(orig)) {
-	struct clone_const_arg arg;
+        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(orig), clone_const_i, &arg);
+        arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
+        arg.klass = clone;
+        rb_id_table_foreach(RCLASS_CONST_TBL(orig), clone_const_i, &arg);
     }
 }
 
@@ -493,11 +523,11 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
     RCLASS_ALLOCATOR(clone) = RCLASS_ALLOCATOR(orig);
     copy_tables(clone, orig);
     if (RCLASS_M_TBL(orig)) {
-	struct clone_method_arg arg;
-	arg.old_klass = orig;
-	arg.new_klass = clone;
-	RCLASS_M_TBL_INIT(clone);
-	rb_id_table_foreach(RCLASS_M_TBL(orig), clone_method_i, &arg);
+        struct clone_method_arg arg;
+        arg.old_klass = orig;
+        arg.new_klass = clone;
+        RCLASS_M_TBL_INIT(clone);
+        rb_id_table_foreach(RCLASS_M_TBL(orig), clone_method_i, &arg);
     }
 
     if (RCLASS_ORIGIN(orig) == orig) {
@@ -507,7 +537,7 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
         VALUE p = RCLASS_SUPER(orig);
         VALUE orig_origin = RCLASS_ORIGIN(orig);
         VALUE prev_clone_p = clone;
-        VALUE origin_stack = rb_ary_tmp_new(2);
+        VALUE origin_stack = rb_ary_hidden_new(2);
         VALUE origin[2];
         VALUE clone_p = 0;
         long origin_len;
@@ -526,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);
@@ -595,49 +624,47 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
         return klass;
     }
     else {
-	/* copy singleton(unnamed) class */
+        /* copy singleton(unnamed) class */
         bool klass_of_clone_is_new;
-	VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
+        VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
 
-	if (BUILTIN_TYPE(obj) == T_CLASS) {
+        if (BUILTIN_TYPE(obj) == T_CLASS) {
             klass_of_clone_is_new = true;
-	    RBASIC_SET_CLASS(clone, clone);
-	}
-	else {
+            RBASIC_SET_CLASS(clone, clone);
+        }
+        else {
             VALUE klass_metaclass_clone = rb_singleton_class_clone(klass);
             // When `METACLASS_OF(klass) == klass_metaclass_clone`, it means the
             // recursive call did not clone `METACLASS_OF(klass)`.
             klass_of_clone_is_new = (METACLASS_OF(klass) != klass_metaclass_clone);
             RBASIC_SET_CLASS(clone, klass_metaclass_clone);
-	}
-
-	RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass));
-	RCLASS_ALLOCATOR(clone) = RCLASS_ALLOCATOR(klass);
-	if (RCLASS_IV_TBL(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) {
-	    rb_singleton_class_attached(clone, attach);
-	}
-	RCLASS_M_TBL_INIT(clone);
-	{
-	    struct clone_method_arg arg;
-	    arg.old_klass = klass;
-	    arg.new_klass = clone;
-	    rb_id_table_foreach(RCLASS_M_TBL(klass), clone_method_i, &arg);
-	}
+        }
+
+        RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass));
+        RCLASS_ALLOCATOR(clone) = RCLASS_ALLOCATOR(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 (!UNDEF_P(attach)) {
+            rb_singleton_class_attached(clone, attach);
+        }
+        RCLASS_M_TBL_INIT(clone);
+        {
+            struct clone_method_arg arg;
+            arg.old_klass = klass;
+            arg.new_klass = clone;
+            rb_id_table_foreach(RCLASS_M_TBL(klass), clone_method_i, &arg);
+        }
         if (klass_of_clone_is_new) {
             rb_singleton_class_attached(METACLASS_OF(clone), clone);
         }
-	FL_SET(clone, FL_SINGLETON);
+        FL_SET(clone, FL_SINGLETON);
 
-	return clone;
+        return clone;
     }
 }
 
@@ -645,7 +672,7 @@ void
 rb_singleton_class_attached(VALUE klass, VALUE obj)
 {
     if (FL_TEST(klass, FL_SINGLETON)) {
-	rb_class_ivar_set(klass, id_attached, obj);
+        rb_class_ivar_set(klass, id_attached, obj);
     }
 }
 
@@ -666,7 +693,7 @@ int
 rb_singleton_class_internal_p(VALUE sklass)
 {
     return (RB_TYPE_P(rb_attr_get(sklass, id_attached), T_CLASS) &&
-	    !rb_singleton_class_has_metaclass_p(sklass));
+            !rb_singleton_class_has_metaclass_p(sklass));
 }
 
 /*!
@@ -708,13 +735,13 @@ make_metaclass(VALUE klass)
     rb_singleton_class_attached(metaclass, klass);
 
     if (META_CLASS_OF_CLASS_CLASS_P(klass)) {
-	SET_METACLASS_OF(klass, metaclass);
-	SET_METACLASS_OF(metaclass, metaclass);
+        SET_METACLASS_OF(klass, metaclass);
+        SET_METACLASS_OF(metaclass, metaclass);
     }
     else {
-	VALUE tmp = METACLASS_OF(klass); /* for a meta^(n)-class klass, tmp is meta^(n)-class of Class class */
-	SET_METACLASS_OF(klass, metaclass);
-	SET_METACLASS_OF(metaclass, ENSURE_EIGENCLASS(tmp));
+        VALUE tmp = METACLASS_OF(klass); /* for a meta^(n)-class klass, tmp is meta^(n)-class of Class class */
+        SET_METACLASS_OF(klass, metaclass);
+        SET_METACLASS_OF(metaclass, ENSURE_EIGENCLASS(tmp));
     }
 
     super = RCLASS_SUPER(klass);
@@ -855,10 +882,10 @@ VALUE
 rb_make_metaclass(VALUE obj, VALUE unused)
 {
     if (BUILTIN_TYPE(obj) == T_CLASS) {
-	return make_metaclass(obj);
+        return make_metaclass(obj);
     }
     else {
-	return make_singleton_class(obj);
+        return make_singleton_class(obj);
     }
 }
 
@@ -900,21 +927,21 @@ rb_define_class(const char *name, VALUE super)
 
     id = rb_intern(name);
     if (rb_const_defined(rb_cObject, id)) {
-	klass = rb_const_get(rb_cObject, id);
-	if (!RB_TYPE_P(klass, T_CLASS)) {
-	    rb_raise(rb_eTypeError, "%s is not a class (%"PRIsVALUE")",
-		     name, rb_obj_class(klass));
-	}
-	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
-	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
-	}
+        klass = rb_const_get(rb_cObject, id);
+        if (!RB_TYPE_P(klass, T_CLASS)) {
+            rb_raise(rb_eTypeError, "%s is not a class (%"PRIsVALUE")",
+                     name, rb_obj_class(klass));
+        }
+        if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+            rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
+        }
 
         /* Class may have been defined in Ruby and not pin-rooted */
         rb_vm_add_root_module(klass);
-	return klass;
+        return klass;
     }
     if (!super) {
-	rb_raise(rb_eArgError, "no super class for `%s'", name);
+        rb_raise(rb_eArgError, "no super class for `%s'", name);
     }
     klass = rb_define_class_id(id, super);
     rb_vm_add_root_module(klass);
@@ -931,42 +958,47 @@ 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;
 
     if (rb_const_defined_at(outer, id)) {
-	klass = rb_const_get_at(outer, id);
-	if (!RB_TYPE_P(klass, T_CLASS)) {
-	    rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a class"
-		     " (%"PRIsVALUE")",
-		     outer, rb_id2str(id), rb_obj_class(klass));
-	}
-	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
-	    rb_raise(rb_eTypeError, "superclass mismatch for class "
-		     "%"PRIsVALUE"::%"PRIsVALUE""
-		     " (%"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);
+        klass = rb_const_get_at(outer, id);
+        if (!RB_TYPE_P(klass, T_CLASS)) {
+            rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a class"
+                     " (%"PRIsVALUE")",
+                     outer, rb_id2str(id), rb_obj_class(klass));
+        }
+        if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+            rb_raise(rb_eTypeError, "superclass mismatch for class "
+                     "%"PRIsVALUE"::%"PRIsVALUE""
+                     " (%"PRIsVALUE" is given but was %"PRIsVALUE")",
+                     outer, rb_id2str(id), RCLASS_SUPER(klass), super);
+        }
 
-	return klass;
+        return klass;
     }
     if (!super) {
-	rb_raise(rb_eArgError, "no super class for `%"PRIsVALUE"::%"PRIsVALUE"'",
-		 rb_class_path(outer), rb_id2str(id));
+        rb_raise(rb_eArgError, "no super class for `%"PRIsVALUE"::%"PRIsVALUE"'",
+                 rb_class_path(outer), rb_id2str(id));
     }
     klass = rb_define_class_id(id, 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);
@@ -1010,14 +1042,14 @@ rb_define_module(const char *name)
 
     id = rb_intern(name);
     if (rb_const_defined(rb_cObject, id)) {
-	module = rb_const_get(rb_cObject, id);
-	if (!RB_TYPE_P(module, T_MODULE)) {
-	    rb_raise(rb_eTypeError, "%s is not a module (%"PRIsVALUE")",
-		     name, rb_obj_class(module));
-	}
+        module = rb_const_get(rb_cObject, id);
+        if (!RB_TYPE_P(module, T_MODULE)) {
+            rb_raise(rb_eTypeError, "%s is not a module (%"PRIsVALUE")",
+                     name, rb_obj_class(module));
+        }
         /* Module may have been defined in Ruby and not pin-rooted */
         rb_vm_add_root_module(module);
-	return module;
+        return module;
     }
     module = rb_module_new();
     rb_vm_add_root_module(module);
@@ -1038,15 +1070,15 @@ rb_define_module_id_under(VALUE outer, ID id)
     VALUE module;
 
     if (rb_const_defined_at(outer, id)) {
-	module = rb_const_get_at(outer, id);
-	if (!RB_TYPE_P(module, T_MODULE)) {
-	    rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a module"
-		     " (%"PRIsVALUE")",
-		     outer, rb_id2str(id), rb_obj_class(module));
-	}
+        module = rb_const_get_at(outer, id);
+        if (!RB_TYPE_P(module, T_MODULE)) {
+            rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a module"
+                     " (%"PRIsVALUE")",
+                     outer, rb_id2str(id), rb_obj_class(module));
+        }
         /* Module may have been defined in Ruby and not pin-rooted */
         rb_gc_register_mark_object(module);
-	return module;
+        return module;
     }
     module = rb_module_new();
     rb_const_set(outer, id, module);
@@ -1065,16 +1097,13 @@ rb_include_class_new(VALUE module, VALUE super)
 
     RCLASS_SET_ORIGIN(klass, klass);
     if (BUILTIN_TYPE(module) == T_ICLASS) {
-	module = METACLASS_OF(module);
+        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_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);
 
@@ -1093,7 +1122,7 @@ ensure_includable(VALUE klass, VALUE module)
     Check_Type(module, T_MODULE);
     rb_module_set_initialized(module);
     if (!NIL_P(rb_refinement_module_get_refined_class(module))) {
-	rb_raise(rb_eArgError, "refinement module is not allowed");
+        rb_raise(rb_eArgError, "refinement module is not allowed");
     }
 }
 
@@ -1106,7 +1135,7 @@ rb_include_module(VALUE klass, VALUE module)
 
     changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module, TRUE);
     if (changed < 0)
-	rb_raise(rb_eArgError, "cyclic include detected");
+        rb_raise(rb_eArgError, "cyclic include detected");
 
     if (RB_TYPE_P(klass, T_MODULE)) {
         rb_subclass_entry_t *iclass = RCLASS_SUBCLASSES(klass);
@@ -1116,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. */
@@ -1184,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;
@@ -1194,8 +1223,8 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super
 
     while (module) {
         int c_seen = FALSE;
-	int superclass_seen = FALSE;
-	struct rb_id_table *tbl;
+        int superclass_seen = FALSE;
+        struct rb_id_table *tbl;
 
         if (klass == c) {
             c_seen = TRUE;
@@ -1245,12 +1274,11 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super
         }
 
         // setup T_ICLASS for the include/prepend module
-	iclass = rb_include_class_new(module, super_class);
-	c = RCLASS_SET_SUPER(c, iclass);
+        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_tmp_new(2);
+            if (!origin_stack) origin_stack = rb_ary_hidden_new(2);
             VALUE origin[2] = {iclass, RCLASS_ORIGIN(module)};
             rb_ary_cat(origin_stack, origin, 2);
         }
@@ -1259,28 +1287,25 @@ 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 =
-		rb_refinement_module_get_refined_class(klass);
+        if (BUILTIN_TYPE(klass) == T_MODULE && FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
+            VALUE refined_class =
+                rb_refinement_module_get_refined_class(klass);
 
             rb_id_table_foreach(RCLASS_M_TBL(module), add_refined_method_entry_i, (void *)refined_class);
             RUBY_ASSERT(BUILTIN_TYPE(c) == T_MODULE);
-	}
+        }
 
         tbl = RCLASS_CONST_TBL(module);
-	if (tbl && rb_id_table_size(tbl))
-	    rb_id_table_foreach(tbl, clear_constant_cache_i, NULL);
+        if (tbl && rb_id_table_size(tbl))
+            rb_id_table_foreach(tbl, clear_constant_cache_i, NULL);
       skip:
-	module = RCLASS_SUPER(module);
+        module = RCLASS_SUPER(module);
     }
 
     return method_changed;
@@ -1302,20 +1327,20 @@ move_refined_method(ID key, VALUE value, void *data)
         struct rb_id_table *tbl = RCLASS_M_TBL(klass);
 
         if (me->def->body.refined.orig_me) {
-	    const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me;
-	    RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL);
-	    new_me = rb_method_entry_clone(me);
+            const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me;
+            RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL);
+            new_me = rb_method_entry_clone(me);
             rb_method_table_insert(klass, tbl, key, new_me);
-	    rb_method_entry_copy(me, orig_me);
-	    return ID_TABLE_CONTINUE;
-	}
-	else {
+            rb_method_entry_copy(me, orig_me);
+            return ID_TABLE_CONTINUE;
+        }
+        else {
             rb_method_table_insert(klass, tbl, key, me);
-	    return ID_TABLE_DELETE;
-	}
+            return ID_TABLE_DELETE;
+        }
     }
     else {
-	return ID_TABLE_CONTINUE;
+        return ID_TABLE_CONTINUE;
     }
 }
 
@@ -1339,14 +1364,14 @@ ensure_origin(VALUE klass)
 {
     VALUE origin = RCLASS_ORIGIN(klass);
     if (origin == klass) {
-	origin = class_alloc(T_ICLASS, klass);
-	RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
-	RCLASS_SET_SUPER(klass, origin);
-	RCLASS_SET_ORIGIN(klass, origin);
-	RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
-	RCLASS_M_TBL_INIT(klass);
+        origin = class_alloc(T_ICLASS, klass);
+        RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
+        RCLASS_SET_SUPER(klass, origin);
+        RCLASS_SET_ORIGIN(klass, origin);
+        RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
+        RCLASS_M_TBL_INIT(klass);
         rb_id_table_foreach(RCLASS_M_TBL(origin), cache_clear_refined_method, (void *)klass);
-	rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
+        rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
         return true;
     }
     return false;
@@ -1366,7 +1391,7 @@ rb_prepend_module(VALUE klass, VALUE module)
     changed = do_include_modules_at(klass, klass, module, FALSE, false);
     RUBY_ASSERT(changed >= 0); // already checked for cyclic prepend above
     if (changed) {
-	rb_vm_check_redefinition_by_prepend(klass);
+        rb_vm_check_redefinition_by_prepend(klass);
     }
     if (RB_TYPE_P(klass, T_MODULE)) {
         rb_subclass_entry_t *iclass = RCLASS_SUBCLASSES(klass);
@@ -1433,10 +1458,10 @@ rb_mod_included_modules(VALUE mod)
 
     for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
         if (p != origin && RCLASS_ORIGIN(p) == p && BUILTIN_TYPE(p) == T_ICLASS) {
-	    VALUE m = METACLASS_OF(p);
-	    if (RB_TYPE_P(m, T_MODULE))
-		rb_ary_push(ary, m);
-	}
+            VALUE m = METACLASS_OF(p);
+            if (RB_TYPE_P(m, T_MODULE))
+                rb_ary_push(ary, m);
+        }
     }
     return ary;
 }
@@ -1468,8 +1493,8 @@ rb_mod_include_p(VALUE mod, VALUE mod2)
     Check_Type(mod2, T_MODULE);
     for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
         if (BUILTIN_TYPE(p) == T_ICLASS && !FL_TEST(p, RICLASS_IS_ORIGIN)) {
-	    if (METACLASS_OF(p) == mod2) return Qtrue;
-	}
+            if (METACLASS_OF(p) == mod2) return Qtrue;
+        }
     }
     return Qfalse;
 }
@@ -1504,12 +1529,12 @@ rb_mod_ancestors(VALUE mod)
     for (p = mod; p; p = RCLASS_SUPER(p)) {
         if (p == refined_class) break;
         if (p != RCLASS_ORIGIN(p)) continue;
-	if (BUILTIN_TYPE(p) == T_ICLASS) {
-	    rb_ary_push(ary, METACLASS_OF(p));
-	}
+        if (BUILTIN_TYPE(p) == T_ICLASS) {
+            rb_ary_push(ary, METACLASS_OF(p));
+        }
         else {
-	    rb_ary_push(ary, p);
-	}
+            rb_ary_push(ary, p);
+        }
     }
     return ary;
 }
@@ -1583,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
@@ -1591,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)
 {
@@ -1603,10 +1676,10 @@ ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
     switch ((rb_method_visibility_t)type) {
       case METHOD_VISI_UNDEF:
       case METHOD_VISI_PRIVATE:
-	break;
+        break;
       default: /* everything but private */
-	ins_methods_push(name, ary);
-	break;
+        ins_methods_push(name, ary);
+        break;
     }
     return ST_CONTINUE;
 }
@@ -1615,7 +1688,7 @@ static int
 ins_methods_type_i(st_data_t name, st_data_t type, st_data_t ary, rb_method_visibility_t visi)
 {
     if ((rb_method_visibility_t)type == visi) {
-	ins_methods_push(name, ary);
+        ins_methods_push(name, ary);
     }
     return ST_CONTINUE;
 }
@@ -1638,6 +1711,12 @@ ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
     return ins_methods_type_i(name, type, ary, METHOD_VISI_PUBLIC);
 }
 
+static int
+ins_methods_undef_i(st_data_t name, st_data_t type, st_data_t ary)
+{
+    return ins_methods_type_i(name, type, ary, METHOD_VISI_UNDEF);
+}
+
 struct method_entry_arg {
     st_table *list;
     int recur;
@@ -1651,20 +1730,20 @@ method_entry_i(ID key, VALUE value, void *data)
     rb_method_visibility_t type;
 
     if (me->def->type == VM_METHOD_TYPE_REFINED) {
-	VALUE owner = me->owner;
-	me = rb_resolve_refined_method(Qnil, me);
-	if (!me) return ID_TABLE_CONTINUE;
-	if (!arg->recur && me->owner != owner) return ID_TABLE_CONTINUE;
+        VALUE owner = me->owner;
+        me = rb_resolve_refined_method(Qnil, me);
+        if (!me) return ID_TABLE_CONTINUE;
+        if (!arg->recur && me->owner != owner) return ID_TABLE_CONTINUE;
     }
     if (!st_is_member(arg->list, key)) {
-	if (UNDEFINED_METHOD_ENTRY_P(me)) {
-	    type = METHOD_VISI_UNDEF; /* none */
-	}
-	else {
-	    type = METHOD_ENTRY_VISI(me);
-	    RUBY_ASSERT(type != METHOD_VISI_UNDEF);
-	}
-	st_add_direct(arg->list, key, (st_data_t)type);
+        if (UNDEFINED_METHOD_ENTRY_P(me)) {
+            type = METHOD_VISI_UNDEF; /* none */
+        }
+        else {
+            type = METHOD_ENTRY_VISI(me);
+            RUBY_ASSERT(type != METHOD_VISI_UNDEF);
+        }
+        st_add_direct(arg->list, key, (st_data_t)type);
     }
     return ID_TABLE_CONTINUE;
 }
@@ -1705,14 +1784,14 @@ class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int
     }
 
     if (!recur && RCLASS_ORIGIN(mod) != mod) {
-	mod = RCLASS_ORIGIN(mod);
-	prepended = 1;
+        mod = RCLASS_ORIGIN(mod);
+        prepended = 1;
     }
 
     for (; mod; mod = RCLASS_SUPER(mod)) {
         add_instance_method_list(mod, &me_arg);
-	if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
-	if (!recur) break;
+        if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
+        if (!recur) break;
     }
     ary = rb_ary_new2(me_arg.list->num_entries);
     st_foreach(me_arg.list, func, ary);
@@ -1746,6 +1825,15 @@ class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int
  *     B.instance_methods(true).include?(:method1) #=> true
  *     C.instance_methods(false)                   #=> [:method3]
  *     C.instance_methods.include?(:method2)       #=> true
+ *
+ *  Note that method visibility changes in the current class, as well as aliases,
+ *  are considered as methods of the current class by this method:
+ *
+ *     class C < B
+ *       alias method4 method2
+ *       protected :method2
+ *     end
+ *     C.instance_methods(false).sort               #=> [:method2, :method3, :method4]
  */
 
 VALUE
@@ -1809,6 +1897,21 @@ rb_class_public_instance_methods(int argc, const VALUE *argv, VALUE mod)
 
 /*
  *  call-seq:
+ *     mod.undefined_instance_methods   -> array
+ *
+ *  Returns a list of the undefined instance methods defined in <i>mod</i>.
+ *  The undefined methods of any ancestors are not included.
+ */
+
+VALUE
+rb_class_undefined_instance_methods(VALUE mod)
+{
+    VALUE include_super = Qfalse;
+    return class_instance_method_list(1, &include_super, mod, 0, ins_methods_undef_i);
+}
+
+/*
+ *  call-seq:
  *     obj.methods(regular=true)    -> array
  *
  *  Returns a list of the names of public and protected methods of
@@ -1842,7 +1945,7 @@ rb_obj_methods(int argc, const VALUE *argv, VALUE obj)
 {
     rb_check_arity(argc, 0, 1);
     if (argc > 0 && !RTEST(argv[0])) {
-	return rb_obj_singleton_methods(argc, argv, obj);
+        return rb_obj_singleton_methods(argc, argv, obj);
     }
     return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_i);
 }
@@ -1942,14 +2045,14 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
     me_arg.list = st_init_numtable();
     me_arg.recur = recur;
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
-	if ((mtbl = RCLASS_M_TBL(origin)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
-	klass = RCLASS_SUPER(klass);
+        if ((mtbl = RCLASS_M_TBL(origin)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
+        klass = RCLASS_SUPER(klass);
     }
     if (recur) {
-	while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
-	    if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
-	    klass = RCLASS_SUPER(klass);
-	}
+        while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
+            if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
+            klass = RCLASS_SUPER(klass);
+        }
     }
     ary = rb_ary_new2(me_arg.list->num_entries);
     st_foreach(me_arg.list, ins_methods_i, ary);
@@ -2021,7 +2124,7 @@ rb_undef_methods_from(VALUE klass, VALUE super)
 {
     struct rb_id_table *mtbl = RCLASS_M_TBL(super);
     if (mtbl) {
-	rb_id_table_foreach(mtbl, undef_method_i, (void *)klass);
+        rb_id_table_foreach(mtbl, undef_method_i, (void *)klass);
     }
 }
 
@@ -2069,15 +2172,15 @@ singleton_class_of(VALUE obj)
       case T_BIGNUM:
       case T_FLOAT:
       case T_SYMBOL:
-	rb_raise(rb_eTypeError, "can't define singleton");
+        rb_raise(rb_eTypeError, "can't define singleton");
 
       case T_FALSE:
       case T_TRUE:
       case T_NIL:
-	klass = special_singleton_class_of(obj);
-	if (NIL_P(klass))
-	    rb_bug("unknown immediate %p", (void *)obj);
-	return klass;
+        klass = special_singleton_class_of(obj);
+        if (NIL_P(klass))
+            rb_bug("unknown immediate %p", (void *)obj);
+        return klass;
 
       case T_STRING:
         if (FL_TEST_RAW(obj, RSTRING_FSTR)) {
@@ -2088,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;
+        klass = rb_make_metaclass(obj, klass);
     }
 
     RB_FL_SET_RAW(klass, RB_OBJ_FROZEN_RAW(obj));
@@ -2103,11 +2204,11 @@ 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 &&
-	    FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
-	    OBJ_FREEZE_RAW(klass);
-	}
+        VALUE klass = RBASIC_CLASS(x);
+        if (klass && // no class when hidden from ObjectSpace
+            FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
+            OBJ_FREEZE_RAW(klass);
+        }
     }
 }
 
@@ -2124,7 +2225,7 @@ rb_singleton_class_get(VALUE obj)
     VALUE klass;
 
     if (SPECIAL_CONST_P(obj)) {
-	return rb_special_singleton_class(obj);
+        return rb_special_singleton_class(obj);
     }
     klass = METACLASS_OF(obj);
     if (!FL_TEST(klass, FL_SINGLETON)) return Qnil;
@@ -2199,13 +2300,13 @@ rb_keyword_error_new(const char *error, VALUE keys)
     VALUE error_message = rb_sprintf("%s keyword%.*s", error, len > 1, "s");
 
     if (len > 0) {
-	rb_str_cat_cstr(error_message, ": ");
-	while (1) {
+        rb_str_cat_cstr(error_message, ": ");
+        while (1) {
             const VALUE k = RARRAY_AREF(keys, i);
-	    rb_str_append(error_message, rb_inspect(k));
-	    if (++i >= len) break;
-	    rb_str_cat_cstr(error_message, ", ");
-	}
+            rb_str_append(error_message, rb_inspect(k));
+            if (++i >= len) break;
+            rb_str_cat_cstr(error_message, ", ");
+        }
     }
 
     return rb_exc_new_str(rb_eArgError, error_message);
@@ -2224,7 +2325,7 @@ unknown_keyword_error(VALUE hash, const ID *table, int keywords)
 {
     int i;
     for (i = 0; i < keywords; i++) {
-	st_data_t key = ID2SYM(table[i]);
+        st_data_t key = ID2SYM(table[i]);
         rb_hash_stlike_delete(hash, &key, NULL);
     }
     rb_keyword_error("unknown", rb_hash_keys(hash));
@@ -2248,8 +2349,8 @@ rb_extract_keywords(VALUE *orighash)
     VALUE hash = *orighash;
 
     if (RHASH_EMPTY_P(hash)) {
-	*orighash = 0;
-	return hash;
+        *orighash = 0;
+        return hash;
     }
     rb_hash_foreach(hash, separate_symbol, (st_data_t)&parthash);
     *orighash = parthash[1];
@@ -2275,36 +2376,36 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V
     if (NIL_P(keyword_hash)) keyword_hash = 0;
 
     if (optional < 0) {
-	rest = 1;
-	optional = -1-optional;
+        rest = 1;
+        optional = -1-optional;
     }
     if (required) {
-	for (; i < required; i++) {
-	    VALUE keyword = ID2SYM(table[i]);
-	    if (keyword_hash) {
+        for (; i < required; i++) {
+            VALUE keyword = ID2SYM(table[i]);
+            if (keyword_hash) {
                 if (extract_kwarg(keyword, values[i])) {
-		    continue;
-		}
-	    }
-	    if (NIL_P(missing)) missing = rb_ary_tmp_new(1);
-	    rb_ary_push(missing, keyword);
-	}
-	if (!NIL_P(missing)) {
-	    rb_keyword_error("missing", missing);
-	}
+                    continue;
+                }
+            }
+            if (NIL_P(missing)) missing = rb_ary_hidden_new(1);
+            rb_ary_push(missing, keyword);
+        }
+        if (!NIL_P(missing)) {
+            rb_keyword_error("missing", missing);
+        }
     }
     j = i;
     if (optional && keyword_hash) {
-	for (i = 0; i < optional; i++) {
+        for (i = 0; i < optional; i++) {
             if (extract_kwarg(ID2SYM(table[required+i]), values[required+i])) {
-		j++;
-	    }
-	}
+                j++;
+            }
+        }
     }
     if (!rest && keyword_hash) {
-	if (RHASH_SIZE(keyword_hash) > (unsigned int)(values ? 0 : j)) {
-	    unknown_keyword_error(keyword_hash, table, required+optional);
-	}
+        if (RHASH_SIZE(keyword_hash) > (unsigned int)(values ? 0 : j)) {
+            unknown_keyword_error(keyword_hash, table, required+optional);
+        }
     }
     if (values && !keyword_hash) {
         for (i = 0; i < required + optional; i++) {
@@ -2335,30 +2436,30 @@ rb_scan_args_parse(int kw_flag, const char *fmt, struct rb_scan_args_t *arg)
 
     if (ISDIGIT(*p)) {
         arg->n_lead = *p - '0';
-	p++;
-	if (ISDIGIT(*p)) {
+        p++;
+        if (ISDIGIT(*p)) {
             arg->n_opt = *p - '0';
-	    p++;
-	}
+            p++;
+        }
     }
     if (*p == '*') {
         arg->f_var = 1;
-	p++;
+        p++;
     }
     if (ISDIGIT(*p)) {
         arg->n_trail = *p - '0';
-	p++;
+        p++;
     }
     if (*p == ':') {
         arg->f_hash = 1;
-	p++;
+        p++;
     }
     if (*p == '&') {
         arg->f_block = 1;
-	p++;
+        p++;
     }
     if (*p != '\0') {
-	rb_fatal("bad scan arg format: %s", fmt);
+        rb_fatal("bad scan arg format: %s", fmt);
     }
 }
 
@@ -2394,37 +2495,37 @@ rb_scan_args_assign(const struct rb_scan_args_t *arg, int argc, const VALUE *con
     for (i = 0; i < n_lead; i++) {
         var = rb_scan_args_next_param();
         if (var) *var = argv[argi];
-	argi++;
+        argi++;
     }
     /* capture optional arguments */
     for (i = 0; i < n_opt; i++) {
         var = rb_scan_args_next_param();
         if (argi < argc - n_trail) {
             if (var) *var = argv[argi];
-	    argi++;
-	}
-	else {
-	    if (var) *var = Qnil;
-	}
+            argi++;
+        }
+        else {
+            if (var) *var = Qnil;
+        }
     }
     /* capture variable length arguments */
     if (f_var) {
         int n_var = argc - argi - n_trail;
 
         var = rb_scan_args_next_param();
-	if (0 < n_var) {
+        if (0 < n_var) {
             if (var) *var = rb_ary_new_from_values(n_var, &argv[argi]);
-	    argi += n_var;
-	}
-	else {
-	    if (var) *var = rb_ary_new();
-	}
+            argi += n_var;
+        }
+        else {
+            if (var) *var = rb_ary_new();
+        }
     }
     /* capture trailing mandatory arguments */
     for (i = 0; i < n_trail; i++) {
         var = rb_scan_args_next_param();
         if (var) *var = argv[argi];
-	argi++;
+        argi++;
     }
     /* capture an option hash - phase 2: assignment */
     if (f_hash) {
@@ -2434,12 +2535,12 @@ rb_scan_args_assign(const struct rb_scan_args_t *arg, int argc, const VALUE *con
     /* capture iterator block */
     if (f_block) {
         var = rb_scan_args_next_param();
-	if (rb_block_given_p()) {
-	    *var = rb_block_proc();
-	}
-	else {
-	    *var = Qnil;
-	}
+        if (rb_block_given_p()) {
+            *var = rb_block_proc();
+        }
+        else {
+            *var = Qnil;
+        }
     }
 
     if (argi == argc) {
diff --git a/common.mk b/common.mk
index 2bf4a887ba..126053c9c8 100644
--- a/common.mk
+++ b/common.mk
@@ -18,8 +18,10 @@ mflags = $(MFLAGS)
 gnumake_recursive =
 enable_shared = $(ENABLE_SHARED:no=)
 
-UNICODE_VERSION = 14.0.0
-UNICODE_EMOJI_VERSION = 14.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:///=)
 UNICODE_BETA = NO
 
 ### set the following environment variable or uncomment the line if
@@ -41,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.17
+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
@@ -82,7 +84,7 @@ EXTSOLIBS     =
 MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT)
 ENC_MK        = enc.mk
 MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
-		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(mflags)
+		RUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BOOTSTRAPRUBY)" $(mflags)
 
 COMMONOBJS    = array.$(OBJEXT) \
 		ast.$(OBJEXT) \
@@ -113,7 +115,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		math.$(OBJEXT) \
 		memory_view.$(OBJEXT) \
 		mjit.$(OBJEXT) \
-		mjit_compile.$(OBJEXT) \
+		mjit_c.$(OBJEXT) \
 		node.$(OBJEXT) \
 		numeric.$(OBJEXT) \
 		object.$(OBJEXT) \
@@ -134,6 +136,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		regsyntax.$(OBJEXT) \
 		ruby.$(OBJEXT) \
 		scheduler.$(OBJEXT) \
+		shape.$(OBJEXT) \
 		signal.$(OBJEXT) \
 		sprintf.$(OBJEXT) \
 		st.$(OBJEXT) \
@@ -195,6 +198,7 @@ INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 INSTALL_PROG_MODE = 0755
 INSTALL_DATA_MODE = 0644
 
+BOOTSTRAPRUBY_COMMAND = $(BOOTSTRAPRUBY) $(BOOTSTRAPRUBY_OPT)
 TESTSDIR      = $(srcdir)/test
 TOOL_TESTSDIR = $(tooldir)/test
 TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
@@ -216,12 +220,27 @@ MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
 	  -e "noraise {ln(src, dest)} or" \
 	  -e "cp(src, dest)"
 
+# For release builds
+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/' \
+	$(top_srcdir)/yjit/src/lib.rs
 
 all: $(SHOWFLAGS) main docs
 
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
+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) $@
+
 mjit-headers: $(MJIT_SUPPORT)-mjit-headers
 no-mjit-headers: PHONY
 yes-mjit-headers: mjit_config.h PHONY
@@ -229,6 +248,9 @@ yes-mjit-headers: mjit_config.h PHONY
 mjit.$(OBJEXT): mjit_config.h
 mjit_config.h: Makefile
 
+.PHONY: mjit-bindgen
+mjit-bindgen:
+	$(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.
@@ -270,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)
 
@@ -610,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)
@@ -687,18 +712,18 @@ realclean-platform: distclean-platform
 realclean-spec: distclean-spec
 realclean-rubyspec: realclean-spec
 
-clean-ext:: ext/clean gems/clean timestamp/clean
-distclean-ext:: ext/distclean gems/distclean timestamp/distclean
-realclean-ext:: ext/realclean gems/realclean timestamp/realclean
+clean-ext:: ext/clean .bundle/clean timestamp/clean
+distclean-ext:: ext/distclean .bundle/distclean timestamp/distclean
+realclean-ext:: ext/realclean .bundle/realclean timestamp/realclean
 
 ext/clean.mk ext/distclean.mk ext/realclean.mk::
 ext/clean:: ext/clean.mk
 ext/distclean:: ext/distclean.mk
 ext/realclean:: ext/realclean.mk
 
-timestamp/clean:: ext/clean gems/clean
-timestamp/distclean:: ext/distclean gems/distclean
-timestamp/realclean:: ext/realclean gems/realclean
+timestamp/clean:: ext/clean .bundle/clean
+timestamp/distclean:: ext/distclean .bundle/distclean
+timestamp/realclean:: ext/realclean .bundle/realclean
 
 timestamp/clean timestamp/distclean timestamp/realclean::
 	$(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/$(arch)/.time
@@ -741,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)" && \
@@ -755,26 +780,34 @@ fake: $(CROSS_COMPILING)-fake
 yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
 no-fake -fake: PHONY
 
-# really doesn't depend on .o, just ensure newer than headers which
-# version.o depends on.
-$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb version.$(OBJEXT) miniruby$(EXEEXT)
+$(HAVE_BASERUBY:no=)$(arch)-fake.rb: miniruby$(EXEEXT)
+
+# actually depending on other headers more.
+$(arch:noarch=ignore)-fake.rb: $(top_srcdir)/revision.h $(top_srcdir)/version.h $(srcdir)/version.c
+$(arch:noarch=ignore)-fake.rb: {$(VPATH)}id.h {$(VPATH)}vm_opts.h
+
+$(arch:noarch=ignore)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb
 	$(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
+	$(Q) exit > $@
 
 btest: $(TEST_RUNNABLE)-btest
 no-btest: PHONY
 yes-btest: yes-fake miniruby$(EXEEXT) PHONY
 	$(ACTIONS_GROUP)
-	$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS)
+	$(Q)$(gnumake_recursive)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS)
 	$(ACTIONS_ENDGROUP)
 
 btest-ruby: $(TEST_RUNNABLE)-btest-ruby
 no-btest-ruby: PHONY
 yes-btest-ruby: prog PHONY
 	$(ACTIONS_GROUP)
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) $(BTESTS)
+	$(Q)$(gnumake_recursive)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS)
 	$(ACTIONS_ENDGROUP)
 
 rtest: yes-fake miniruby$(EXEEXT) PHONY
@@ -812,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
@@ -839,7 +872,10 @@ extconf: $(PREP)
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
+rbconfig.rb: $(RBCONFIG)
+
+$(HAVE_BASERUBY:no=)$(RBCONFIG)$(HAVE_BASERUBY:no=): $(PREP)
+$(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?}' \
@@ -857,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
@@ -867,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)
@@ -885,9 +923,10 @@ libtrans trans: {$(VPATH)}transdb.h
 ENC_HEADERS = $(srcdir)/enc/jis/props.h
 # Use MINIRUBY which loads fake.rb for cross compiling
 $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
-	   $(srcdir)/enc/encinit.c.erb $(ENC_HEADERS) $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake
+	   $(srcdir)/enc/encinit.c.erb $(ENC_HEADERS) $(srcdir)/lib/mkmf.rb $(RBCONFIG) $(HAVE_BASERUBY)-fake
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $(ENCS) $@
+	$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/enc/make_encmake.rb \
+	  --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $(ENCS) $@
 
 .PRECIOUS: $(MKFILES)
 
@@ -909,9 +948,7 @@ PHONY:
 
 {$(srcdir)}.y.c:
 	$(ECHO) generating $@
-	$(Q)$(BASERUBY) $(tooldir)/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
-	$(Q)$(BASERUBY) $(tooldir)/pure_parser.rb parse.tmp.y $(YACC)
-	$(Q)$(RM) parse.tmp.y.bak
+	$(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) > parse.tmp.y
 	$(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
@@ -923,11 +960,11 @@ $(PLATFORM_D):
 	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
 	@$(NULLCMD) > $@
 
-exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH)}config.h
+exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time $(PREP) {$(VPATH)}config.h
 	$(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c
 	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS)
 	$(Q) $(POSTLINK)
-	$(Q) ./miniruby$(EXEEXT) \
+	$(Q) $(BOOTSTRAPRUBY) \
 	    -e 'prog, dest, inst = ARGV; dest += "/ruby"' \
 	    -e 'exit unless prog==inst' \
 	    -e 'unless prog=="ruby"' \
@@ -1041,11 +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.inc: $(tooldir)/ruby_vm/views/mjit_compile.inc.erb $(inc_common_headers) \
-  $(tooldir)/ruby_vm/views/_mjit_compile_insn.erb $(tooldir)/ruby_vm/views/_mjit_compile_send.erb \
-  $(tooldir)/ruby_vm/views/_mjit_compile_ivar.erb \
-  $(tooldir)/ruby_vm/views/_mjit_compile_insn_body.erb $(tooldir)/ruby_vm/views/_mjit_compile_pc_and_sp.erb \
-  $(tooldir)/ruby_vm/views/_mjit_compile_invokebuiltin.erb $(tooldir)/ruby_vm/views/_mjit_compile_getinlinecache.erb
+$(srcs_vpath)mjit_sp_inc.inc: $(tooldir)/ruby_vm/views/mjit_sp_inc.inc.erb
 
 BUILTIN_RB_SRCS = \
 		$(srcdir)/ast.rb \
@@ -1054,13 +1087,17 @@ BUILTIN_RB_SRCS = \
 		$(srcdir)/numeric.rb \
 		$(srcdir)/io.rb \
 		$(srcdir)/marshal.rb \
+		$(srcdir)/mjit.rb \
+		$(srcdir)/mjit_c.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 \
 		$(srcdir)/prelude.rb \
 		$(srcdir)/gem_prelude.rb \
@@ -1070,7 +1107,7 @@ BUILTIN_RB_INCS = $(BUILTIN_RB_SRCS:.rb=.rbinc)
 
 common-srcs: $(srcs_vpath)parse.c $(srcs_vpath)lex.c $(srcs_vpath)enc/trans/newline.c $(srcs_vpath)id.c \
 	     $(BUILTIN_RB_INCS) \
-	     srcs-lib srcs-ext incs
+	     srcs-lib srcs-ext incs preludes
 
 missing-srcs: $(srcdir)/missing/des_tables.c
 
@@ -1126,13 +1163,13 @@ node_name.inc: $(tooldir)/node_name.rb $(srcdir)/node.h
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -n $(tooldir)/node_name.rb < $(srcdir)/node.h > $@
 
-encdb.h: $(PREP) $(tooldir)/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
+encdb.h: $(RBCONFIG) $(tooldir)/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
+	$(Q) $(BOOTSTRAPRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
 
-transdb.h: $(PREP) srcs-enc $(tooldir)/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
+transdb.h: $(RBCONFIG) srcs-enc $(tooldir)/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
+	$(Q) $(BOOTSTRAPRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
 
 enc/encinit.c: $(ENC_MK) $(srcdir)/enc/encinit.c.erb
 
@@ -1182,25 +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:
-$(srcdir)/revision.h$(gnumake:yes=-nongnumake):
-	$(Q)$(RM) $(@F)
-	$(Q)$(NULLCMD) > $@ || $(NULLCMD) > $(@F)
+$(srcdir)/revision.h$(no_baseruby:no=~disabled~): $(REVISION_H)
 
-revision.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)" > $@
+$(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 > $@
 
-$(REVISION_H): revision.tmp
-	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
-
-$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h $(srcdir)/ext/ripper/depend
+$(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
@@ -1217,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)
 
@@ -1225,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)"
 
@@ -1309,7 +1340,7 @@ lldb-ruby: $(PROGRAM) PHONY
 DISTPKGS = gzip,zip,all
 PKGSDIR = tmp
 dist:
-	$(BASERUBY) $(tooldir)/make-snapshot \
+	$(BASERUBY) $(V0:1=-v) $(tooldir)/make-snapshot \
 	-srcdir=$(srcdir) -packages=$(DISTPKGS) \
 	-unicode-version=$(UNICODE_VERSION) \
 	$(DISTOPTS) $(PKGSDIR) $(RELNAME)
@@ -1322,10 +1353,15 @@ up::
 yes::
 no::
 
+after-update:: common-srcs
 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
@@ -1340,8 +1376,9 @@ 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=-nongnumake): PHONY
+update-gems$(gnumake:yes=-sequential): PHONY
 	$(ECHO) Downloading bundled gem files...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
 	    -I./tool -rdownloader -answ \
@@ -1355,26 +1392,32 @@ update-gems$(gnumake:yes=-nongnumake): PHONY
 	    -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})' \
 	    gems/bundled_gems
 
-extract-gems$(gnumake:yes=-nongnumake): PHONY
+extract-gems$(gnumake:yes=-sequential): PHONY
 	$(ECHO) Extracting bundled gem files...
-	$(Q) $(RUNRUBY) -C "$(srcdir)" \
-	    -Itool -rfileutils -rgem-unpack -answ \
-	    -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \
-	    -e 'BEGIN {FileUtils.mkdir_p(s = ".bundle/specifications")}' \
-	    -e 'gem, ver = *$$F' \
+	$(Q) $(BASERUBY) -C "$(srcdir)" \
+	    -Itool/lib -rfileutils -rbundled_gem -answ \
+	    -e 'BEGIN {d = ".bundle/gems"}' \
+	    -e 'gem, ver, _, rev = *$$F' \
 	    -e 'next if !ver or /^#/=~gem' \
 	    -e 'g = "#{gem}-#{ver}"' \
-	    -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d, s)' \
-	    -e 'FileUtils.rm_rf("#{d}/#{g}/.github")' \
+	    -e 'if File.directory?("#{d}/#{g}")' \
+	    -e 'elsif rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \
+	    -e   'BundledGem.copy(gs, ".bundle")' \
+	    -e 'else' \
+	    -e   'BundledGem.unpack("gems/#{g}.gem", ".bundle")' \
+	    -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 \
 	     "$(srcdir)/gems/bundled_gems" | \
 	$(IFCHANGE) "$(srcdir)/gems/bundled_gems" -
-	git -C "$(srcdir)" diff --no-ext-diff --ignore-submodules --exit-code || \
-	git -C "$(srcdir)" commit -m "Update bundled_gems" gems/bundled_gems
+	$(GIT) -C "$(srcdir)" diff --no-ext-diff --ignore-submodules --exit-code || \
+	$(GIT) -C "$(srcdir)" commit -m "Update bundled_gems" gems/bundled_gems
 
 PRECHECK_BUNDLED_GEMS = test-bundled-gems-precheck
 test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck
@@ -1382,7 +1425,7 @@ yes-test-bundled-gems-precheck: main
 no-test-bundled-gems-precheck:
 
 test-bundled-gems-fetch: yes-test-bundled-gems-fetch
-yes-test-bundled-gems-fetch: $(PREP)
+yes-test-bundled-gems-fetch:
 	$(ACTIONS_GROUP)
 	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
 	$(ACTIONS_ENDGROUP)
@@ -1394,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
@@ -1407,11 +1450,34 @@ no-test-bundled-gems:
 
 BUNDLED_GEMS =
 test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
-	$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb $(BUNDLED_GEMS)
+	$(gnumake_recursive)$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb $(BUNDLED_GEMS)
+
+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)
+	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
+		--install-dir .bundle --conservative "bundler" "rake" "rspec:~> 3" #"ruby-prof"
+	$(ACTIONS_ENDGROUP)
+
+RSPECOPTS =
+SYNTAX_SUGGEST_SPECS =
+PREPARE_SYNTAX_SUGGEST = test-syntax-suggest-prepare
+test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest
+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
+yes-test-bundler-precheck: main $(arch)-fake.rb
 
 no-test-bundler-prepare: no-test-bundler-precheck
 yes-test-bundler-prepare: yes-test-bundler-precheck
@@ -1428,14 +1494,18 @@ RSPECOPTS =
 BUNDLER_SPECS =
 test-bundler: $(TEST_RUNNABLE)-test-bundler
 yes-test-bundler: yes-test-bundler-prepare
-	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
+	$(gnumake_recursive)$(XRUBY) \
+		-r./$(arch)-fake \
+		-e "exec(*ARGV)" -- \
+		$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
 		--require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
 no-test-bundler:
 
 PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
 test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
 yes-test-bundler-parallel: yes-test-bundler-prepare
-	$(XRUBY) \
+	$(gnumake_recursive)$(XRUBY) \
+		-r./$(arch)-fake \
 		-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
 		-e "exec(*ARGV)" -- \
 		$(XRUBY) -I$(srcdir)/spec/bundler \
@@ -1447,10 +1517,11 @@ yes-test-bundler-parallel: yes-test-bundler-prepare
 		$(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS)
 no-test-bundler-parallel:
 
-test-annocheck: $(target_os)-test-annocheck
-linux-test-annocheck: $(PROGRAM)
+# The annocheck supports ELF format binaries compiled for any OS and for any
+# architecture. It is designed to be independent of the host OS and the
+# architecture. The test-annocheck.sh requires docker or podman.
+test-annocheck: $(PROGRAM)
 	$(tooldir)/test-annocheck.sh $(PROGRAM)
-$(target_os)-test-annocheck: PHONY
 
 GEM = up
 sync-default-gems:
@@ -1493,60 +1564,54 @@ update-unicode: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES) \
 		$(UNICODE_AUXILIARY_FILES) $(UNICODE_UCD_EMOJI_FILES) $(UNICODE_EMOJI_FILES)
 
 CACHE_DIR = $(srcdir)/.downloaded-cache
-UNICODE_DOWNLOAD = \
+UNICODE_DOWNLOADER_ALWAYS_UPDATE = $(ALWAYS_UPDATE_UNICODE:yes=--always)
+UNICODE_DOWNLOADER = \
 	$(BASERUBY) $(tooldir)/downloader.rb \
 	    --cache-dir=$(CACHE_DIR) \
-	    --unicode-beta $(UNICODE_BETA) \
+	    --exist $(UNICODE_DOWNLOADER_ALWAYS_UPDATE:no=) \
+	    unicode --unicode-beta=$(UNICODE_BETA)
+UNICODE_DOWNLOAD = \
+	$(UNICODE_DOWNLOADER) \
 	    -d $(UNICODE_SRC_DATA_DIR) \
-	    -p $(UNICODE_VERSION)/ucd \
-	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+	    -p $(UNICODE_VERSION)/ucd
 UNICODE_AUXILIARY_DOWNLOAD = \
-	$(BASERUBY) $(tooldir)/downloader.rb \
-	    --cache-dir=$(CACHE_DIR) \
-	    --unicode-beta $(UNICODE_BETA) \
+	$(UNICODE_DOWNLOADER) \
 	    -d $(UNICODE_SRC_DATA_DIR)/auxiliary \
-	    -p $(UNICODE_VERSION)/ucd/auxiliary \
-	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+	    -p $(UNICODE_VERSION)/ucd/auxiliary
 UNICODE_UCD_EMOJI_DOWNLOAD = \
-	$(BASERUBY) $(tooldir)/downloader.rb \
-	    --cache-dir=$(CACHE_DIR) \
-	    --unicode-beta $(UNICODE_BETA) \
+	$(UNICODE_DOWNLOADER) \
 	    -d $(UNICODE_SRC_DATA_DIR)/emoji \
-	    -p $(UNICODE_VERSION)/ucd/emoji \
-	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+	    -p $(UNICODE_VERSION)/ucd/emoji
 UNICODE_EMOJI_DOWNLOAD = \
-	$(BASERUBY) $(tooldir)/downloader.rb \
-	    --cache-dir=$(CACHE_DIR) \
-	    --unicode-beta $(UNICODE_BETA) \
+	$(UNICODE_DOWNLOADER) \
 	    -d $(UNICODE_SRC_EMOJI_DATA_DIR) \
-	    -p emoji/$(UNICODE_EMOJI_VERSION) \
-	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+	    -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): \
@@ -1555,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 \
@@ -1587,19 +1664,19 @@ $(UNICODE_HDR_DIR)/name2ctype.h:
 	$(MV) $@.new $@
 
 # the next non-comment line was:
-# $(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
+# $(UNICODE_HDR_DIR)/casefold.h: $(tooldir)/enc-case-folding.rb \
 # but was changed to make sure CI works on systems that don't have gperf
 unicode-up: $(UNICODE_DATA_HEADERS)
 
 $(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=casefold.h): \
-		$(srcdir)/enc/unicode/case-folding.rb \
+		$(tooldir)/enc-case-folding.rb \
 		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
 		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
 
 $(UNICODE_HDR_DIR)/casefold.h:
 	$(MAKEDIRS) $(@D)
-	$(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \
+	$(Q) $(BASERUBY) $(tooldir)/enc-case-folding.rb \
 		--output-file=$@ \
 		--mapping-data-directory=$(UNICODE_SRC_DATA_DIR)
 
@@ -1659,41 +1736,45 @@ help: PHONY
 	"                Makefile of Ruby" \
 	"" \
 	"targets:" \
-	"  all (default):       builds all of below" \
-	"  miniruby:            builds only miniruby" \
-	"  encs:                builds encodings" \
-	"  exts:                builds extensions" \
-	"  main:                builds encodings, extensions and ruby" \
-	"  docs:                builds documents" \
-	"  install-capi:        builds C API documents" \
-	"  run:                 runs test.rb by miniruby" \
-	"  runruby:             runs test.rb by ruby you just built" \
-	"  gdb:                 runs test.rb by miniruby under gdb" \
-	"  gdb-ruby:            runs test.rb by ruby under gdb" \
-	"  check:               equals make test test-tool test-all test-spec" \
-	"  test:                ruby core tests [BTESTS=<bootstraptest files>]" \
-	"  test-all:            all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \
-	"  test-spec:           run the Ruby spec suite [SPECOPTS=<specs, opts>]" \
-	"  test-bundler:        run the Bundler spec" \
-	"  test-bundled-gems:   run the test suite of bundled gems" \
-	"  test-tool:           tests under the tool/test" \
-	"  update-gems:         download files of the bundled gems" \
-	"  update-bundled_gems: update the latest version of bundled gems" \
-	"  sync-default-gems:   sync default gems from upstream [GEM=<gem_name git_ref>]" \
-	"  up:                  update local copy and autogenerated files" \
-	"  benchmark:           benchmark this ruby and COMPARE_RUBY." \
-	"  gcbench:             gc benchmark [GCBENCH_ITEM=<item_name>]" \
-	"  install:             install all ruby distributions" \
-	"  install-nodoc:       install without rdoc" \
-	"  install-cross:       install cross compiling stuff" \
-	"  clean:               clean for tarball" \
-	"  distclean:           clean for repository" \
-	"  golf:                build goruby for golfers" \
+	"  all (default):         builds all of below" \
+	"  miniruby:              builds only miniruby" \
+	"  encs:                  builds encodings" \
+	"  exts:                  builds extensions" \
+	"  main:                  builds encodings, extensions and ruby" \
+	"  docs:                  builds documents" \
+	"  install-capi:          builds C API documents" \
+	"  run:                   runs test.rb by miniruby" \
+	"  runruby:               runs test.rb by ruby you just built" \
+	"  gdb:                   runs test.rb by miniruby under gdb" \
+	"  gdb-ruby:              runs test.rb by ruby under gdb" \
+	"  check:                 equals make test test-tool test-all test-spec" \
+	"  test:                  ruby core tests [BTESTS=<bootstraptest files>]" \
+	"  test-all:              all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \
+	"  test-spec:             run the Ruby spec suite [SPECOPTS=<specs, opts>]" \
+	"  test-bundler:          run the Bundler spec" \
+	"  test-bundler-parallel: run the Bundler spec with parallel" \
+	"  test-bundled-gems:     run the test suite of bundled gems" \
+	"  test-tool:             tests under the tool/test" \
+	"  update-gems:           download files of the bundled gems" \
+	"  update-bundled_gems:   update the latest version of bundled gems" \
+	"  sync-default-gems:     sync default gems from upstream [GEM=<gem_name git_ref>]" \
+	"  up:                    update local copy and autogenerated files" \
+	"  benchmark:             benchmark this ruby and COMPARE_RUBY." \
+	"  gcbench:               gc benchmark [GCBENCH_ITEM=<item_name>]" \
+	"  install:               install all ruby distributions" \
+	"  install-nodoc:         install without rdoc" \
+	"  install-cross:         install cross compiling stuff" \
+	"  clean:                 clean for tarball" \
+	"  distclean:             clean for repository" \
+	"  golf:                  build goruby for golfers" \
 	$(HELP_EXTRA_TASKS) \
 	"see DeveloperHowto for more detail: " \
 	"  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \
 	$(MESSAGE_END)
 
+$(CROSS_COMPILING:yes=)builtin.$(OBJEXT): {$(VPATH)}mini_builtin.c
+$(CROSS_COMPILING:yes=)builtin.$(OBJEXT): {$(VPATH)}miniprelude.c
+
 # AUTOGENERATED DEPENDENCIES START
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.h
@@ -1751,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
@@ -1766,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
@@ -1782,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
@@ -1944,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
@@ -1955,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
@@ -1962,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
@@ -1979,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
@@ -2141,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
@@ -2324,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
@@ -2334,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
@@ -2356,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
@@ -2506,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
@@ -2518,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
@@ -2708,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
@@ -2715,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
@@ -2899,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
@@ -3111,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
@@ -3120,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
@@ -3129,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
@@ -3149,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
@@ -3294,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
@@ -3305,13 +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)
@@ -3327,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
@@ -3407,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
@@ -3477,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
@@ -3492,6 +3630,7 @@ 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
@@ -3499,12 +3638,15 @@ 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
 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
@@ -3519,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
@@ -3689,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
@@ -3873,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
@@ -3887,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
@@ -4049,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
@@ -5366,6 +5513,7 @@ encoding.$(OBJEXT): $(top_srcdir)/internal/class.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/enc.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/error.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/gc.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/inits.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/load.h
@@ -5373,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
@@ -5386,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
@@ -5548,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
@@ -5555,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
@@ -5572,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
@@ -5585,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
@@ -5745,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
@@ -5770,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
@@ -5784,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
@@ -5935,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
@@ -6144,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
@@ -6158,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
@@ -6365,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
@@ -6373,7 +6549,6 @@ eval.$(OBJEXT): {$(VPATH)}vm.h
 eval.$(OBJEXT): {$(VPATH)}vm_core.h
 eval.$(OBJEXT): {$(VPATH)}vm_debug.h
 eval.$(OBJEXT): {$(VPATH)}vm_opts.h
-eval.$(OBJEXT): {$(VPATH)}yjit.h
 explicit_bzero.$(OBJEXT): {$(VPATH)}config.h
 explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c
 explicit_bzero.$(OBJEXT): {$(VPATH)}internal/attr/format.h
@@ -6406,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
@@ -6419,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
@@ -6581,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
@@ -6592,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
@@ -6640,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
@@ -6797,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
@@ -6813,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
@@ -6826,7 +7006,6 @@ gc.$(OBJEXT): {$(VPATH)}vm_core.h
 gc.$(OBJEXT): {$(VPATH)}vm_debug.h
 gc.$(OBJEXT): {$(VPATH)}vm_opts.h
 gc.$(OBJEXT): {$(VPATH)}vm_sync.h
-gc.$(OBJEXT): {$(VPATH)}yjit.h
 goruby.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 goruby.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 goruby.$(OBJEXT): $(CCAN_DIR)/list/list.h
@@ -6834,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
@@ -6854,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
@@ -6898,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
@@ -7008,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
@@ -7015,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
@@ -7025,16 +7214,20 @@ 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
 hash.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 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
@@ -7045,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
@@ -7202,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
@@ -7387,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
@@ -7593,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
@@ -7602,11 +7806,18 @@ io.$(OBJEXT): {$(VPATH)}util.h
 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
@@ -7787,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
@@ -7993,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
@@ -8008,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
@@ -8205,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
@@ -8703,15 +8918,24 @@ 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
 marshal.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 marshal.$(OBJEXT): $(top_srcdir)/internal/encoding.h
 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
 marshal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
@@ -8719,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
@@ -8733,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
@@ -8776,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
@@ -8891,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
@@ -8907,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
@@ -8920,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
@@ -9066,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
@@ -9230,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
@@ -9240,12 +9486,15 @@ miniinit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 miniinit.$(OBJEXT): $(CCAN_DIR)/list/list.h
 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
@@ -9263,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
@@ -9308,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
@@ -9429,6 +9681,8 @@ miniinit.$(OBJEXT): {$(VPATH)}mini_builtin.c
 miniinit.$(OBJEXT): {$(VPATH)}miniinit.c
 miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c
 miniinit.$(OBJEXT): {$(VPATH)}missing.h
+miniinit.$(OBJEXT): {$(VPATH)}mjit.rb
+miniinit.$(OBJEXT): {$(VPATH)}mjit_c.rb
 miniinit.$(OBJEXT): {$(VPATH)}nilclass.rb
 miniinit.$(OBJEXT): {$(VPATH)}node.h
 miniinit.$(OBJEXT): {$(VPATH)}numeric.rb
@@ -9439,10 +9693,13 @@ 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
 miniinit.$(OBJEXT): {$(VPATH)}timev.rb
 miniinit.$(OBJEXT): {$(VPATH)}trace_point.rb
 miniinit.$(OBJEXT): {$(VPATH)}vm_core.h
@@ -9457,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
@@ -9466,8 +9724,10 @@ mjit.$(OBJEXT): $(top_srcdir)/internal/file.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/gc.h
 mjit.$(OBJEXT): $(top_srcdir)/internal/hash.h
 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
@@ -9651,13 +9911,17 @@ mjit.$(OBJEXT): {$(VPATH)}method.h
 mjit.$(OBJEXT): {$(VPATH)}missing.h
 mjit.$(OBJEXT): {$(VPATH)}mjit.c
 mjit.$(OBJEXT): {$(VPATH)}mjit.h
+mjit.$(OBJEXT): {$(VPATH)}mjit.rbinc
+mjit.$(OBJEXT): {$(VPATH)}mjit_c.h
 mjit.$(OBJEXT): {$(VPATH)}mjit_config.h
-mjit.$(OBJEXT): {$(VPATH)}mjit_worker.c
 mjit.$(OBJEXT): {$(VPATH)}node.h
 mjit.$(OBJEXT): {$(VPATH)}onigmo.h
 mjit.$(OBJEXT): {$(VPATH)}oniguruma.h
+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
@@ -9670,213 +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_compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-mjit_compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-mjit_compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
-mjit_compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
-mjit_compile.$(OBJEXT): $(hdrdir)/ruby.h
-mjit_compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/array.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/class.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/compile.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/compilers.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/gc.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/hash.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/imemo.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/object.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/serial.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/variable.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/vm.h
-mjit_compile.$(OBJEXT): $(top_srcdir)/internal/warnings.h
-mjit_compile.$(OBJEXT): {$(VPATH)}assert.h
-mjit_compile.$(OBJEXT): {$(VPATH)}atomic.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/assume.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/bool.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/limits.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
-mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
-mjit_compile.$(OBJEXT): {$(VPATH)}builtin.h
-mjit_compile.$(OBJEXT): {$(VPATH)}config.h
-mjit_compile.$(OBJEXT): {$(VPATH)}constant.h
-mjit_compile.$(OBJEXT): {$(VPATH)}debug_counter.h
-mjit_compile.$(OBJEXT): {$(VPATH)}defines.h
-mjit_compile.$(OBJEXT): {$(VPATH)}id.h
-mjit_compile.$(OBJEXT): {$(VPATH)}id_table.h
-mjit_compile.$(OBJEXT): {$(VPATH)}insns.def
-mjit_compile.$(OBJEXT): {$(VPATH)}insns.inc
-mjit_compile.$(OBJEXT): {$(VPATH)}insns_info.inc
-mjit_compile.$(OBJEXT): {$(VPATH)}intern.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/abi.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/anyargs.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/assume.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/const.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/error.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/format.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/cast.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/config.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/constant_p.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/robject.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/ctype.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/dllexport.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/dosish.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/error.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/eval.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/event.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/fl_type.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/gc.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/glob.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/globals.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/extension.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/feature.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/warning.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/array.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/class.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/error.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/file.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/io.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/load.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/object.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/process.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/random.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/range.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/re.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/select.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/string.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/time.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/interpreter.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/iterator.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/memory.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/method.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/module.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/newobj.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/rgengc.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/scan_args.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/special_consts.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/static_assert.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/stdalign.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/stdbool.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/symbol.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/value.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/value_type.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/variable.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/warning_push.h
-mjit_compile.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
-mjit_compile.$(OBJEXT): {$(VPATH)}iseq.h
-mjit_compile.$(OBJEXT): {$(VPATH)}method.h
-mjit_compile.$(OBJEXT): {$(VPATH)}missing.h
-mjit_compile.$(OBJEXT): {$(VPATH)}mjit.h
-mjit_compile.$(OBJEXT): {$(VPATH)}mjit_compile.c
-mjit_compile.$(OBJEXT): {$(VPATH)}mjit_compile.inc
-mjit_compile.$(OBJEXT): {$(VPATH)}node.h
-mjit_compile.$(OBJEXT): {$(VPATH)}ruby_assert.h
-mjit_compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-mjit_compile.$(OBJEXT): {$(VPATH)}st.h
-mjit_compile.$(OBJEXT): {$(VPATH)}subst.h
-mjit_compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-mjit_compile.$(OBJEXT): {$(VPATH)}thread_native.h
-mjit_compile.$(OBJEXT): {$(VPATH)}vm_callinfo.h
-mjit_compile.$(OBJEXT): {$(VPATH)}vm_core.h
-mjit_compile.$(OBJEXT): {$(VPATH)}vm_exec.h
-mjit_compile.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
-mjit_compile.$(OBJEXT): {$(VPATH)}vm_opts.h
-mjit_compile.$(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
@@ -10050,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
@@ -10247,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
@@ -10265,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
@@ -10277,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
@@ -10444,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
@@ -10637,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
@@ -10648,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
@@ -10849,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
@@ -10859,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
@@ -10871,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
@@ -10885,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
@@ -11051,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
@@ -11065,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
@@ -11270,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
@@ -11278,13 +11577,14 @@ process.$(OBJEXT): {$(VPATH)}thread_native.h
 process.$(OBJEXT): {$(VPATH)}util.h
 process.$(OBJEXT): {$(VPATH)}vm_core.h
 process.$(OBJEXT): {$(VPATH)}vm_opts.h
-process.$(OBJEXT): {$(VPATH)}yjit.h
 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
@@ -11301,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
@@ -11316,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
@@ -11475,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
@@ -11503,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
@@ -11674,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
@@ -11866,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
@@ -11882,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
@@ -11895,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
@@ -12043,18 +12352,23 @@ 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
 re.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 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
+re.$(OBJEXT): $(top_srcdir)/internal/object.h
 re.$(OBJEXT): $(top_srcdir)/internal/ractor.h
 re.$(OBJEXT): $(top_srcdir)/internal/re.h
+re.$(OBJEXT): $(top_srcdir)/internal/serial.h
 re.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 re.$(OBJEXT): $(top_srcdir)/internal/string.h
 re.$(OBJEXT): $(top_srcdir)/internal/time.h
@@ -12237,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
@@ -12887,10 +13202,14 @@ regexec.$(OBJEXT): {$(VPATH)}st.h
 regexec.$(OBJEXT): {$(VPATH)}subst.h
 regparse.$(OBJEXT): $(hdrdir)/ruby.h
 regparse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regparse.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+regparse.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+regparse.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 regparse.$(OBJEXT): {$(VPATH)}assert.h
 regparse.$(OBJEXT): {$(VPATH)}backward/2/assume.h
 regparse.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
 regparse.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
 regparse.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
 regparse.$(OBJEXT): {$(VPATH)}backward/2/limits.h
 regparse.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
@@ -13228,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
@@ -13421,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
@@ -13430,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
@@ -13445,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
@@ -13465,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
@@ -13630,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
@@ -13795,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
@@ -13811,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
@@ -13825,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
@@ -13870,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
@@ -13991,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
@@ -14015,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
@@ -14028,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
@@ -14189,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
@@ -14356,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
@@ -14539,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
@@ -14557,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
@@ -14571,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
@@ -14617,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
@@ -14738,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
@@ -14781,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
@@ -14794,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
@@ -14809,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
@@ -14971,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
@@ -14990,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
@@ -15002,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
@@ -15050,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
@@ -15168,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
@@ -15181,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
@@ -15198,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
@@ -15211,7 +15773,9 @@ thread.$(OBJEXT): {$(VPATH)}backward/2/limits.h
 thread.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
 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
@@ -15385,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
@@ -15393,20 +15958,22 @@ 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.rbinc
 thread.$(OBJEXT): {$(VPATH)}timev.h
 thread.$(OBJEXT): {$(VPATH)}vm_core.h
 thread.$(OBJEXT): {$(VPATH)}vm_debug.h
 thread.$(OBJEXT): {$(VPATH)}vm_opts.h
 thread.$(OBJEXT): {$(VPATH)}vm_sync.h
-thread.$(OBJEXT): {$(VPATH)}yjit.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
@@ -15588,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
@@ -15604,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
@@ -15616,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
@@ -15774,11 +16344,13 @@ 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
 transcode.$(OBJEXT): {$(VPATH)}transcode_data.h
 transient_heap.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/array.h
 transient_heap.$(OBJEXT): $(top_srcdir)/internal/compilers.h
 transient_heap.$(OBJEXT): $(top_srcdir)/internal/gc.h
 transient_heap.$(OBJEXT): $(top_srcdir)/internal/hash.h
@@ -15948,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
@@ -16127,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
@@ -16322,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
@@ -16342,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
@@ -16363,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
@@ -16512,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
@@ -16529,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
@@ -16749,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
@@ -16778,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
@@ -16785,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
@@ -16799,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
@@ -16963,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
@@ -16976,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
@@ -17153,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
@@ -17167,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
@@ -17186,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
@@ -17340,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
@@ -17356,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
@@ -17363,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
@@ -17378,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
@@ -17545,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
@@ -17560,19 +18159,19 @@ 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
 yjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
-yjit.$(OBJEXT): $(top_srcdir)/internal/object.h
-yjit.$(OBJEXT): $(top_srcdir)/internal/re.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/serial.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/string.h
-yjit.$(OBJEXT): $(top_srcdir)/internal/struct.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/variable.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/vm.h
 yjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
@@ -17590,6 +18189,7 @@ yjit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 yjit.$(OBJEXT): {$(VPATH)}builtin.h
 yjit.$(OBJEXT): {$(VPATH)}config.h
 yjit.$(OBJEXT): {$(VPATH)}constant.h
+yjit.$(OBJEXT): {$(VPATH)}debug.h
 yjit.$(OBJEXT): {$(VPATH)}debug_counter.h
 yjit.$(OBJEXT): {$(VPATH)}defines.h
 yjit.$(OBJEXT): {$(VPATH)}encoding.h
@@ -17761,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
@@ -17768,10 +18369,10 @@ yjit.$(OBJEXT): {$(VPATH)}thread_native.h
 yjit.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 yjit.$(OBJEXT): {$(VPATH)}vm_core.h
 yjit.$(OBJEXT): {$(VPATH)}vm_debug.h
+yjit.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
 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 9f47a3fa62..040f77975e 100644
--- a/compar.c
+++ b/compar.c
@@ -30,13 +30,13 @@ rb_cmperr(VALUE x, VALUE y)
     VALUE classname;
 
     if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
-	classname = rb_inspect(y);
+        classname = rb_inspect(y);
     }
     else {
-	classname = rb_obj_class(y);
+        classname = rb_obj_class(y);
     }
     rb_raise(rb_eArgError, "comparison of %"PRIsVALUE" with %"PRIsVALUE" failed",
-	     rb_obj_class(x), classname);
+             rb_obj_class(x), classname);
 }
 
 static VALUE
@@ -50,12 +50,12 @@ VALUE
 rb_invcmp(VALUE x, VALUE y)
 {
     VALUE invcmp = rb_exec_recursive(invcmp_recursive, x, y);
-    if (invcmp == Qundef || NIL_P(invcmp)) {
-	return Qnil;
+    if (NIL_OR_UNDEF_P(invcmp)) {
+        return Qnil;
     }
     else {
-	int result = -rb_cmpint(invcmp, x, y);
-	return INT2FIX(result);
+        int result = -rb_cmpint(invcmp, x, y);
+        return INT2FIX(result);
     }
 }
 
@@ -167,9 +167,7 @@ cmp_le(VALUE x, VALUE y)
 static VALUE
 cmp_between(VALUE x, VALUE min, VALUE max)
 {
-    if (cmpint(x, min) < 0) return Qfalse;
-    if (cmpint(x, max) > 0) return Qfalse;
-    return Qtrue;
+    return RBOOL((cmpint(x, min) >= 0 && cmpint(x, max) <= 0));
 }
 
 /*
@@ -231,7 +229,7 @@ cmp_clamp(int argc, VALUE *argv, VALUE x)
         }
     }
     if (!NIL_P(min) && !NIL_P(max) && cmpint(min, max) > 0) {
-	rb_raise(rb_eArgError, "min argument must be smaller than max argument");
+        rb_raise(rb_eArgError, "min argument must be smaller than max argument");
     }
 
     if (!NIL_P(min)) {
diff --git a/compile.c b/compile.c
index 67641fcfb6..0452305923 100644
--- a/compile.c
+++ b/compile.c
@@ -52,10 +52,10 @@
 
 typedef struct iseq_link_element {
     enum {
-	ISEQ_ELEMENT_ANCHOR,
-	ISEQ_ELEMENT_LABEL,
-	ISEQ_ELEMENT_INSN,
-	ISEQ_ELEMENT_ADJUST,
+        ISEQ_ELEMENT_ANCHOR,
+        ISEQ_ELEMENT_LABEL,
+        ISEQ_ELEMENT_INSN,
+        ISEQ_ELEMENT_ADJUST,
         ISEQ_ELEMENT_TRACE,
     } type;
     struct iseq_link_element *next;
@@ -93,9 +93,9 @@ typedef struct iseq_insn_data {
     int sc_state;
     VALUE *operands;
     struct {
-	int line_no;
+        int line_no;
         int node_id;
-	rb_event_flag_t events;
+        rb_event_flag_t events;
     } insn_info;
 } INSN;
 
@@ -307,13 +307,13 @@ static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NOD
     ((label) ? (LABEL_REF(label), (label)->unremovable=1) : 0)
 #define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc) do {				\
     VALUE _e = rb_ary_new3(5, (type),						\
-			   (VALUE)(ls) | 1, (VALUE)(le) | 1,			\
-			   (VALUE)(iseqv), (VALUE)(lc) | 1);			\
+                           (VALUE)(ls) | 1, (VALUE)(le) | 1,			\
+                           (VALUE)(iseqv), (VALUE)(lc) | 1);			\
     LABEL_UNREMOVABLE(ls);							\
     LABEL_REF(le);								\
     LABEL_REF(lc);								\
     if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) \
-        RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, rb_ary_tmp_new(3)); \
+        RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, rb_ary_hidden_new(3)); \
     rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e));	\
 } while (0)
 
@@ -368,11 +368,11 @@ append_compile_error(const rb_iseq_t *iseq, int line, const char *fmt, ...)
     err = rb_syntax_error_append(err, file, line, -1, NULL, fmt, args);
     va_end(args);
     if (NIL_P(err_info)) {
-	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, err);
-	rb_set_errinfo(err);
+        RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, err);
+        rb_set_errinfo(err);
     }
     else if (!err_info) {
-	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, Qtrue);
+        RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, Qtrue);
     }
     if (compile_debug) {
         if (SPECIAL_CONST_P(err)) err = rb_eSyntaxError;
@@ -402,17 +402,17 @@ do { \
     const NODE *error_node = (node); \
     enum node_type error_type = nd_type(error_node); \
     if (error_type != (ndtype)) { \
-	COMPILE_ERROR(ERROR_ARGS_AT(error_node) \
-		      prefix ": " #ndtype " is expected, but %s", \
-		      ruby_node_name(error_type)); \
-	return errval; \
+        COMPILE_ERROR(ERROR_ARGS_AT(error_node) \
+                      prefix ": " #ndtype " is expected, but %s", \
+                      ruby_node_name(error_type)); \
+        return errval; \
     } \
 } while (0)
 
 #define EXPECT_NODE_NONULL(prefix, parent, ndtype, errval) \
 do { \
     COMPILE_ERROR(ERROR_ARGS_AT(parent) \
-		  prefix ": must be " #ndtype ", but 0"); \
+                  prefix ": must be " #ndtype ", but 0"); \
     return errval; \
 } while (0)
 
@@ -420,7 +420,7 @@ do { \
 do { \
     const NODE *error_node = (node); \
     COMPILE_ERROR(ERROR_ARGS_AT(error_node) prefix ": unknown node (%s)", \
-		  ruby_node_name(nd_type(error_node))); \
+                  ruby_node_name(nd_type(error_node))); \
     return errval; \
 } while (0)
 
@@ -510,19 +510,19 @@ verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *const anchor)
     list = anchor->anchor.next;
     plist = &anchor->anchor;
     while (list) {
-	if (plist != list->prev) {
-	    flag += 1;
-	}
-	plist = list;
-	list = list->next;
+        if (plist != list->prev) {
+            flag += 1;
+        }
+        plist = list;
+        list = list->next;
     }
 
     if (anchor->last != plist && anchor->last != 0) {
-	flag |= 0x70000;
+        flag |= 0x70000;
     }
 
     if (flag != 0) {
-	rb_bug("list verify error: %08x (%s)", flag, info);
+        rb_bug("list verify error: %08x (%s)", flag, info);
     }
 #endif
 }
@@ -627,7 +627,7 @@ decl_branch_base(rb_iseq_t *iseq, const NODE *node, const char *type)
     VALUE branches;
 
     if (NIL_P(branch_base)) {
-        branch_base = rb_ary_tmp_new(6);
+        branch_base = rb_ary_hidden_new(6);
         rb_hash_aset(structure, key, branch_base);
         rb_ary_push(branch_base, ID2SYM(rb_intern(type)));
         rb_ary_push(branch_base, INT2FIX(first_lineno));
@@ -675,7 +675,7 @@ add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *n
     long counter_idx;
 
     if (NIL_P(branch)) {
-        branch = rb_ary_tmp_new(6);
+        branch = rb_ary_hidden_new(6);
         rb_hash_aset(branches, key, branch);
         rb_ary_push(branch, ID2SYM(rb_intern(type)));
         rb_ary_push(branch, INT2FIX(first_lineno));
@@ -705,11 +705,11 @@ validate_label(st_data_t name, st_data_t label, st_data_t arg)
     rb_iseq_t *iseq = (rb_iseq_t *)arg;
     LABEL *lobj = (LABEL *)label;
     if (!lobj->link.next) {
-	do {
-	    COMPILE_ERROR(iseq, lobj->position,
-			  "%"PRIsVALUE": undefined label",
-			  rb_sym2str((VALUE)name));
-	} while (0);
+        do {
+            COMPILE_ERROR(iseq, lobj->position,
+                          "%"PRIsVALUE": undefined label",
+                          rb_sym2str((VALUE)name));
+        } while (0);
     }
     return ST_CONTINUE;
 }
@@ -748,108 +748,108 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
 
     if (node == 0) {
         NO_CHECK(COMPILE(ret, "nil", node));
-	iseq_set_local_table(iseq, 0);
+        iseq_set_local_table(iseq, 0);
     }
     /* assume node is T_NODE */
     else if (nd_type_p(node, NODE_SCOPE)) {
-	/* iseq type of top, method, class, block */
-	iseq_set_local_table(iseq, node->nd_tbl);
-	iseq_set_arguments(iseq, ret, node->nd_args);
+        /* iseq type of top, method, class, block */
+        iseq_set_local_table(iseq, node->nd_tbl);
+        iseq_set_arguments(iseq, ret, node->nd_args);
 
         switch (ISEQ_BODY(iseq)->type) {
-	  case ISEQ_TYPE_BLOCK:
-	    {
-		LABEL *start = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(0);
-		LABEL *end = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(0);
-
-		start->rescued = LABEL_RESCUE_BEG;
-		end->rescued = LABEL_RESCUE_END;
-
-		ADD_TRACE(ret, RUBY_EVENT_B_CALL);
-                NODE dummy_line_node = generate_dummy_line_node(FIX2INT(ISEQ_BODY(iseq)->location.first_lineno), -1);
-		ADD_INSN (ret, &dummy_line_node, nop);
-		ADD_LABEL(ret, start);
-		CHECK(COMPILE(ret, "block body", node->nd_body));
-		ADD_LABEL(ret, end);
-		ADD_TRACE(ret, RUBY_EVENT_B_RETURN);
+          case ISEQ_TYPE_BLOCK:
+            {
+                LABEL *start = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(0);
+                LABEL *end = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(0);
+
+                start->rescued = LABEL_RESCUE_BEG;
+                end->rescued = LABEL_RESCUE_END;
+
+                ADD_TRACE(ret, RUBY_EVENT_B_CALL);
+                NODE dummy_line_node = generate_dummy_line_node(ISEQ_BODY(iseq)->location.first_lineno, -1);
+                ADD_INSN (ret, &dummy_line_node, nop);
+                ADD_LABEL(ret, start);
+                CHECK(COMPILE(ret, "block body", node->nd_body));
+                ADD_LABEL(ret, end);
+                ADD_TRACE(ret, RUBY_EVENT_B_RETURN);
                 ISEQ_COMPILE_DATA(iseq)->last_line = ISEQ_BODY(iseq)->location.code_location.end_pos.lineno;
 
-		/* wide range catch handler must put at last */
-		ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, NULL, start);
-		ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, NULL, end);
-		break;
-	    }
-	  case ISEQ_TYPE_CLASS:
-	    {
-		ADD_TRACE(ret, RUBY_EVENT_CLASS);
-		CHECK(COMPILE(ret, "scoped node", node->nd_body));
-		ADD_TRACE(ret, RUBY_EVENT_END);
-		ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
-		break;
-	    }
-	  case ISEQ_TYPE_METHOD:
-	    {
+                /* wide range catch handler must put at last */
+                ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, NULL, start);
+                ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, NULL, end);
+                break;
+            }
+          case ISEQ_TYPE_CLASS:
+            {
+                ADD_TRACE(ret, RUBY_EVENT_CLASS);
+                CHECK(COMPILE(ret, "scoped node", node->nd_body));
+                ADD_TRACE(ret, RUBY_EVENT_END);
+                ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
+                break;
+            }
+          case ISEQ_TYPE_METHOD:
+            {
                 ISEQ_COMPILE_DATA(iseq)->root_node = node->nd_body;
-		ADD_TRACE(ret, RUBY_EVENT_CALL);
-		CHECK(COMPILE(ret, "scoped node", node->nd_body));
+                ADD_TRACE(ret, RUBY_EVENT_CALL);
+                CHECK(COMPILE(ret, "scoped node", node->nd_body));
                 ISEQ_COMPILE_DATA(iseq)->root_node = node->nd_body;
-		ADD_TRACE(ret, RUBY_EVENT_RETURN);
-		ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
-		break;
-	    }
-	  default: {
-	    CHECK(COMPILE(ret, "scoped node", node->nd_body));
-	    break;
-	  }
-	}
+                ADD_TRACE(ret, RUBY_EVENT_RETURN);
+                ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
+                break;
+            }
+          default: {
+            CHECK(COMPILE(ret, "scoped node", node->nd_body));
+            break;
+          }
+        }
     }
     else {
-	const char *m;
+        const char *m;
 #define INVALID_ISEQ_TYPE(type) \
-	ISEQ_TYPE_##type: m = #type; goto invalid_iseq_type
+        ISEQ_TYPE_##type: m = #type; goto invalid_iseq_type
         switch (ISEQ_BODY(iseq)->type) {
-	  case INVALID_ISEQ_TYPE(METHOD);
-	  case INVALID_ISEQ_TYPE(CLASS);
-	  case INVALID_ISEQ_TYPE(BLOCK);
-	  case INVALID_ISEQ_TYPE(EVAL);
-	  case INVALID_ISEQ_TYPE(MAIN);
-	  case INVALID_ISEQ_TYPE(TOP);
+          case INVALID_ISEQ_TYPE(METHOD);
+          case INVALID_ISEQ_TYPE(CLASS);
+          case INVALID_ISEQ_TYPE(BLOCK);
+          case INVALID_ISEQ_TYPE(EVAL);
+          case INVALID_ISEQ_TYPE(MAIN);
+          case INVALID_ISEQ_TYPE(TOP);
 #undef INVALID_ISEQ_TYPE /* invalid iseq types end */
-	  case ISEQ_TYPE_RESCUE:
-	    iseq_set_exception_local_table(iseq);
-	    CHECK(COMPILE(ret, "rescue", node));
-	    break;
-	  case ISEQ_TYPE_ENSURE:
-	    iseq_set_exception_local_table(iseq);
-	    CHECK(COMPILE_POPPED(ret, "ensure", node));
-	    break;
-	  case ISEQ_TYPE_PLAIN:
-	    CHECK(COMPILE(ret, "ensure", node));
-	    break;
-	  default:
+          case ISEQ_TYPE_RESCUE:
+            iseq_set_exception_local_table(iseq);
+            CHECK(COMPILE(ret, "rescue", node));
+            break;
+          case ISEQ_TYPE_ENSURE:
+            iseq_set_exception_local_table(iseq);
+            CHECK(COMPILE_POPPED(ret, "ensure", node));
+            break;
+          case ISEQ_TYPE_PLAIN:
+            CHECK(COMPILE(ret, "ensure", node));
+            break;
+          default:
             COMPILE_ERROR(ERROR_ARGS "unknown scope: %d", ISEQ_BODY(iseq)->type);
-	    return COMPILE_NG;
-	  invalid_iseq_type:
-	    COMPILE_ERROR(ERROR_ARGS "compile/ISEQ_TYPE_%s should not be reached", m);
-	    return COMPILE_NG;
-	}
+            return COMPILE_NG;
+          invalid_iseq_type:
+            COMPILE_ERROR(ERROR_ARGS "compile/ISEQ_TYPE_%s should not be reached", m);
+            return COMPILE_NG;
+        }
     }
 
     if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_RESCUE || ISEQ_BODY(iseq)->type == ISEQ_TYPE_ENSURE) {
         NODE dummy_line_node = generate_dummy_line_node(0, -1);
-	ADD_GETLOCAL(ret, &dummy_line_node, LVAR_ERRINFO, 0);
-	ADD_INSN1(ret, &dummy_line_node, throw, INT2FIX(0) /* continue throw */ );
+        ADD_GETLOCAL(ret, &dummy_line_node, LVAR_ERRINFO, 0);
+        ADD_INSN1(ret, &dummy_line_node, throw, INT2FIX(0) /* continue throw */ );
     }
     else {
         NODE dummy_line_node = generate_dummy_line_node(ISEQ_COMPILE_DATA(iseq)->last_line, -1);
-	ADD_INSN(ret, &dummy_line_node, leave);
+        ADD_INSN(ret, &dummy_line_node, leave);
     }
 
 #if OPT_SUPPORT_JOKE
     if (ISEQ_COMPILE_DATA(iseq)->labels_table) {
-	st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
-	ISEQ_COMPILE_DATA(iseq)->labels_table = 0;
-	validate_labels(iseq, labels_table);
+        st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
+        ISEQ_COMPILE_DATA(iseq)->labels_table = 0;
+        validate_labels(iseq, labels_table);
     }
 #endif
     CHECK(iseq_setup_insn(iseq, ret));
@@ -866,9 +866,9 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
 
     for (i = 0; i < ISEQ_BODY(iseq)->iseq_size; /* */ ) {
         int insn = (int)ISEQ_BODY(iseq)->iseq_encoded[i];
-	int len = insn_len(insn);
-	encoded[i] = (VALUE)table[insn];
-	i += len;
+        int len = insn_len(insn);
+        encoded[i] = (VALUE)table[insn];
+        i += len;
     }
     FL_SET((VALUE)iseq, ISEQ_TRANSLATED);
 #endif
@@ -886,15 +886,15 @@ rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */
 
 #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
     {
-	unsigned int i;
+        unsigned int i;
 
         for (i = 0; i < ISEQ_BODY(iseq)->iseq_size; /* */ ) {
-	    const void *addr = (const void *)original_code[i];
-	    const int insn = rb_vm_insn_addr2insn(addr);
+            const void *addr = (const void *)original_code[i];
+            const int insn = rb_vm_insn_addr2insn(addr);
 
-	    original_code[i] = insn;
-	    i += insn_len(insn);
-	}
+            original_code[i] = insn;
+            i += insn_len(insn);
+        }
     }
 #endif
     return original_code;
@@ -976,18 +976,18 @@ compile_data_alloc_with_arena(struct iseq_compile_data_storage **arena, size_t s
 
     if (size >= INT_MAX - padding) rb_memerror();
     if (storage->pos + size + padding > storage->size) {
-	unsigned int alloc_size = storage->size;
-
-	while (alloc_size < size + PADDING_SIZE_MAX) {
-	    if (alloc_size >= INT_MAX / 2) rb_memerror();
-	    alloc_size *= 2;
-	}
-	storage->next = (void *)ALLOC_N(char, alloc_size +
-					offsetof(struct iseq_compile_data_storage, buff));
-	storage = *arena = storage->next;
-	storage->next = 0;
-	storage->pos = 0;
-	storage->size = alloc_size;
+        unsigned int alloc_size = storage->size;
+
+        while (alloc_size < size + PADDING_SIZE_MAX) {
+            if (alloc_size >= INT_MAX / 2) rb_memerror();
+            alloc_size *= 2;
+        }
+        storage->next = (void *)ALLOC_N(char, alloc_size +
+                                        offsetof(struct iseq_compile_data_storage, buff));
+        storage = *arena = storage->next;
+        storage->next = 0;
+        storage->pos = 0;
+        storage->size = alloc_size;
 #ifdef STRICT_ALIGNMENT
         padding = calc_padding((void *)&storage->buff[storage->pos], size);
 #endif /* STRICT_ALIGNMENT */
@@ -1060,7 +1060,7 @@ ELEM_INSERT_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
     elem2->prev = elem1;
     elem1->next = elem2;
     if (elem2->next) {
-	elem2->next->prev = elem2;
+        elem2->next->prev = elem2;
     }
 }
 
@@ -1074,7 +1074,7 @@ ELEM_INSERT_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
     elem2->next = elem1;
     elem1->prev = elem2;
     if (elem2->prev) {
-	elem2->prev->next = elem2;
+        elem2->prev->next = elem2;
     }
 }
 
@@ -1087,10 +1087,10 @@ ELEM_REPLACE(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
     elem2->prev = elem1->prev;
     elem2->next = elem1->next;
     if (elem1->prev) {
-	elem1->prev->next = elem2;
+        elem1->prev->next = elem2;
     }
     if (elem1->next) {
-	elem1->next->prev = elem2;
+        elem1->next->prev = elem2;
     }
 }
 
@@ -1099,7 +1099,7 @@ ELEM_REMOVE(LINK_ELEMENT *elem)
 {
     elem->prev->next = elem->next;
     if (elem->next) {
-	elem->next->prev = elem->prev;
+        elem->next->prev = elem->prev;
     }
 }
 
@@ -1119,13 +1119,13 @@ static LINK_ELEMENT *
 ELEM_FIRST_INSN(LINK_ELEMENT *elem)
 {
     while (elem) {
-	switch (elem->type) {
-	  case ISEQ_ELEMENT_INSN:
-	  case ISEQ_ELEMENT_ADJUST:
-	    return elem;
-	  default:
-	    elem = elem->next;
-	}
+        switch (elem->type) {
+          case ISEQ_ELEMENT_INSN:
+          case ISEQ_ELEMENT_ADJUST:
+            return elem;
+          default:
+            elem = elem->next;
+        }
     }
     return NULL;
 }
@@ -1135,11 +1135,11 @@ LIST_INSN_SIZE_ONE(const LINK_ANCHOR *const anchor)
 {
     LINK_ELEMENT *first_insn = ELEM_FIRST_INSN(FIRST_ELEMENT(anchor));
     if (first_insn != NULL &&
-	ELEM_FIRST_INSN(first_insn->next) == NULL) {
-	return TRUE;
+        ELEM_FIRST_INSN(first_insn->next) == NULL) {
+        return TRUE;
     }
     else {
-	return FALSE;
+        return FALSE;
     }
 }
 
@@ -1147,10 +1147,10 @@ static int
 LIST_INSN_SIZE_ZERO(const LINK_ANCHOR *const anchor)
 {
     if (ELEM_FIRST_INSN(FIRST_ELEMENT(anchor)) == NULL) {
-	return TRUE;
+        return TRUE;
     }
     else {
-	return FALSE;
+        return FALSE;
     }
 }
 
@@ -1165,9 +1165,9 @@ static void
 APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
 {
     if (anc2->anchor.next) {
-	anc1->last->next = anc2->anchor.next;
-	anc2->anchor.next->prev = anc1->last;
-	anc1->last = anc2->last;
+        anc1->last->next = anc2->anchor.next;
+        anc2->anchor.next->prev = anc1->last;
+        anc1->last = anc2->last;
     }
     verify_list("append", anc1);
 }
@@ -1182,11 +1182,11 @@ debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *cur)
     LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
     printf("----\n");
     printf("anch: %p, frst: %p, last: %p\n", (void *)&anchor->anchor,
-	   (void *)anchor->anchor.next, (void *)anchor->last);
+           (void *)anchor->anchor.next, (void *)anchor->last);
     while (list) {
-	printf("curr: %p, next: %p, prev: %p, type: %d\n", (void *)list, (void *)list->next,
-	       (void *)list->prev, (int)list->type);
-	list = list->next;
+        printf("curr: %p, next: %p, prev: %p, type: %d\n", (void *)list, (void *)list->next,
+               (void *)list->prev, (int)list->type);
+        list = list->next;
     }
     printf("----\n");
 
@@ -1243,9 +1243,35 @@ 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)
+              int insn_id, int argc, VALUE *argv)
 {
     INSN *iobj = compile_data_alloc_insn(iseq);
 
@@ -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;
 }
 
@@ -1269,14 +1298,14 @@ new_insn_body(rb_iseq_t *iseq, const NODE *const line_node, enum ruby_vminsn_typ
     VALUE *operands = 0;
     va_list argv;
     if (argc > 0) {
-	int i;
+        int i;
         va_start(argv, argc);
         operands = compile_data_alloc2(iseq, sizeof(VALUE), argc);
-	for (i = 0; i < argc; i++) {
-	    VALUE v = va_arg(argv, VALUE);
-	    operands[i] = v;
-	}
-	va_end(argv);
+        for (i = 0; i < argc; i++) {
+            VALUE v = va_arg(argv, VALUE);
+            operands[i] = v;
+        }
+        va_end(argv);
     }
     return new_insn_core(iseq, line_node, insn_id, argc, operands);
 }
@@ -1320,7 +1349,7 @@ new_insn_send(rb_iseq_t *iseq, const NODE *const line_node, ID id, VALUE argc, c
 
 static rb_iseq_t *
 new_child_iseq(rb_iseq_t *iseq, const NODE *const node,
-	       VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
+               VALUE name, const rb_iseq_t *parent, enum rb_iseq_type type, int line_no)
 {
     rb_iseq_t *ret_iseq;
     rb_ast_body_t ast;
@@ -1332,8 +1361,8 @@ new_child_iseq(rb_iseq_t *iseq, const NODE *const node,
     debugs("[new_child_iseq]> ---------------------------------------\n");
     int isolated_depth = ISEQ_COMPILE_DATA(iseq)->isolated_depth;
     ret_iseq = rb_iseq_new_with_opt(&ast, name,
-				    rb_iseq_path(iseq), rb_iseq_realpath(iseq),
-                                    INT2FIX(line_no), parent,
+                                    rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+                                    line_no, parent,
                                     isolated_depth ? isolated_depth + 1 : 0,
                                     type, ISEQ_COMPILE_DATA(iseq)->option);
     debugs("[new_child_iseq]< ---------------------------------------\n");
@@ -1342,14 +1371,14 @@ new_child_iseq(rb_iseq_t *iseq, const NODE *const node,
 
 static rb_iseq_t *
 new_child_iseq_with_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func *ifunc,
-		     VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
+                     VALUE name, const rb_iseq_t *parent, enum rb_iseq_type type, int line_no)
 {
     rb_iseq_t *ret_iseq;
 
     debugs("[new_child_iseq_with_callback]> ---------------------------------------\n");
     ret_iseq = rb_iseq_new_with_callback(ifunc, name,
-				 rb_iseq_path(iseq), rb_iseq_realpath(iseq),
-				 INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option);
+                                 rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+                                 line_no, parent, type, ISEQ_COMPILE_DATA(iseq)->option);
     debugs("[new_child_iseq_with_callback]< ---------------------------------------\n");
     return ret_iseq;
 }
@@ -1357,18 +1386,18 @@ new_child_iseq_with_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_call
 static void
 set_catch_except_p(struct rb_iseq_constant_body *body)
 {
-    body->catch_except_p = TRUE;
+    body->catch_except_p = true;
     if (body->parent_iseq != NULL) {
         set_catch_except_p(ISEQ_BODY(body->parent_iseq));
     }
 }
 
-/* Set body->catch_except_p to TRUE if the ISeq may catch an exception. If it is FALSE,
-   JIT-ed code may be optimized.  If we are extremely conservative, we should set TRUE
+/* Set body->catch_except_p to true if the ISeq may catch an exception. If it is false,
+   JIT-ed code may be optimized.  If we are extremely conservative, we should set true
    if catch table exists.  But we want to optimize while loop, which always has catch
    table entries for break/next/redo.
 
-   So this function sets TRUE for limited ISeqs with break/next/redo catch table entries
+   So this function sets true for limited ISeqs with break/next/redo catch table entries
    whose child ISeq would really raise an exception. */
 static void
 update_catch_except_flags(struct rb_iseq_constant_body *body)
@@ -1399,7 +1428,7 @@ update_catch_except_flags(struct rb_iseq_constant_body *body)
         if (entry->type != CATCH_TYPE_BREAK
             && entry->type != CATCH_TYPE_NEXT
             && entry->type != CATCH_TYPE_REDO) {
-            body->catch_except_p = TRUE;
+            body->catch_except_p = true;
             break;
         }
     }
@@ -1418,7 +1447,7 @@ iseq_insert_nop_between_end_and_cont(rb_iseq_t *iseq)
         LINK_ELEMENT *cont = (LINK_ELEMENT *)(ptr[4] & ~1);
         LINK_ELEMENT *e;
 
-        enum catch_type ct = (enum catch_type)(ptr[0] & 0xffff);
+        enum rb_catch_type ct = (enum rb_catch_type)(ptr[0] & 0xffff);
 
         if (ct != CATCH_TYPE_BREAK
             && ct != CATCH_TYPE_NEXT
@@ -1440,31 +1469,31 @@ static int
 iseq_setup_insn(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
     if (RTEST(ISEQ_COMPILE_DATA(iseq)->err_info))
-	return COMPILE_NG;
+        return COMPILE_NG;
 
     /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
 
     if (compile_debug > 5)
-	dump_disasm_list(FIRST_ELEMENT(anchor));
+        dump_disasm_list(FIRST_ELEMENT(anchor));
 
     debugs("[compile step 3.1 (iseq_optimize)]\n");
     iseq_optimize(iseq, anchor);
 
     if (compile_debug > 5)
-	dump_disasm_list(FIRST_ELEMENT(anchor));
+        dump_disasm_list(FIRST_ELEMENT(anchor));
 
     if (ISEQ_COMPILE_DATA(iseq)->option->instructions_unification) {
-	debugs("[compile step 3.2 (iseq_insns_unification)]\n");
-	iseq_insns_unification(iseq, anchor);
-	if (compile_debug > 5)
-	    dump_disasm_list(FIRST_ELEMENT(anchor));
+        debugs("[compile step 3.2 (iseq_insns_unification)]\n");
+        iseq_insns_unification(iseq, anchor);
+        if (compile_debug > 5)
+            dump_disasm_list(FIRST_ELEMENT(anchor));
     }
 
     if (ISEQ_COMPILE_DATA(iseq)->option->stack_caching) {
-	debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n");
-	iseq_set_sequence_stackcaching(iseq, anchor);
-	if (compile_debug > 5)
-	    dump_disasm_list(FIRST_ELEMENT(anchor));
+        debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n");
+        iseq_set_sequence_stackcaching(iseq, anchor);
+        if (compile_debug > 5)
+            dump_disasm_list(FIRST_ELEMENT(anchor));
     }
 
     debugs("[compile step 3.4 (iseq_insert_nop_between_end_and_cont)]\n");
@@ -1484,7 +1513,7 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     debugs("[compile step 4.1 (iseq_set_sequence)]\n");
     if (!iseq_set_sequence(iseq, anchor)) return COMPILE_NG;
     if (compile_debug > 5)
-	dump_disasm_list(FIRST_ELEMENT(anchor));
+        dump_disasm_list(FIRST_ELEMENT(anchor));
 
     debugs("[compile step 4.2 (iseq_set_exception_table)]\n");
     if (!iseq_set_exception_table(iseq)) return COMPILE_NG;
@@ -1512,8 +1541,8 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 #endif
 
     if (compile_debug > 1) {
-	VALUE str = rb_iseq_disasm(iseq);
-	printf("%s\n", StringValueCStr(str));
+        VALUE str = rb_iseq_disasm(iseq);
+        printf("%s\n", StringValueCStr(str));
     }
     verify_call_cache(iseq);
     debugs("[compile step: finish]\n");
@@ -1534,7 +1563,7 @@ get_lvar_level(const rb_iseq_t *iseq)
 {
     int lev = 0;
     while (iseq != ISEQ_BODY(iseq)->local_iseq) {
-	lev++;
+        lev++;
         iseq = ISEQ_BODY(iseq)->parent_iseq;
     }
     return lev;
@@ -1547,8 +1576,8 @@ get_dyna_var_idx_at_raw(const rb_iseq_t *iseq, ID id)
 
     for (i = 0; i < ISEQ_BODY(iseq)->local_table_size; i++) {
         if (ISEQ_BODY(iseq)->local_table[i] == id) {
-	    return (int)i;
-	}
+            return (int)i;
+        }
     }
     return -1;
 }
@@ -1573,12 +1602,12 @@ get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
     const rb_iseq_t *const topmost_iseq = iseq;
 
     while (iseq) {
-	idx = get_dyna_var_idx_at_raw(iseq, id);
-	if (idx >= 0) {
-	    break;
-	}
+        idx = get_dyna_var_idx_at_raw(iseq, id);
+        if (idx >= 0) {
+            break;
+        }
         iseq = ISEQ_BODY(iseq)->parent_iseq;
-	lv++;
+        lv++;
     }
 
     if (idx < 0) {
@@ -1597,16 +1626,16 @@ iseq_local_block_param_p(const rb_iseq_t *iseq, unsigned int idx, unsigned int l
     const struct rb_iseq_constant_body *body;
     while (level > 0) {
         iseq = ISEQ_BODY(iseq)->parent_iseq;
-	level--;
+        level--;
     }
     body = ISEQ_BODY(iseq);
     if (body->local_iseq == iseq && /* local variables */
-	body->param.flags.has_block &&
-	body->local_table_size - body->param.block_start == idx) {
-	return TRUE;
+        body->param.flags.has_block &&
+        body->local_table_size - body->param.block_start == idx) {
+        return TRUE;
     }
     else {
-	return FALSE;
+        return FALSE;
     }
 }
 
@@ -1616,12 +1645,12 @@ iseq_block_param_id_p(const rb_iseq_t *iseq, ID id, int *pidx, int *plevel)
     int level, ls;
     int idx = get_dyna_var_idx(iseq, id, &level, &ls);
     if (iseq_local_block_param_p(iseq, ls - idx, level)) {
-	*pidx = ls - idx;
-	*plevel = level;
-	return TRUE;
+        *pidx = ls - idx;
+        *plevel = level;
+        return TRUE;
     }
     else {
-	return FALSE;
+        return FALSE;
     }
 }
 
@@ -1676,10 +1705,10 @@ static void
 iseq_add_getlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *const line_node, int idx, int level)
 {
     if (iseq_local_block_param_p(iseq, idx, level)) {
-	ADD_INSN2(seq, line_node, getblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+        ADD_INSN2(seq, line_node, getblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
     }
     else {
-	ADD_INSN2(seq, line_node, getlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+        ADD_INSN2(seq, line_node, getlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
     }
     if (level > 0) access_outer_variables(iseq, level, iseq_lvar_id(iseq, idx, level), Qfalse);
 }
@@ -1688,10 +1717,10 @@ static void
 iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *const line_node, int idx, int level)
 {
     if (iseq_local_block_param_p(iseq, idx, level)) {
-	ADD_INSN2(seq, line_node, setblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+        ADD_INSN2(seq, line_node, setblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
     }
     else {
-	ADD_INSN2(seq, line_node, setlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+        ADD_INSN2(seq, line_node, setlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
     }
     if (level > 0) access_outer_variables(iseq, level, iseq_lvar_id(iseq, idx, level), Qtrue);
 }
@@ -1703,47 +1732,47 @@ iseq_calc_param_size(rb_iseq_t *iseq)
 {
     struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
     if (body->param.flags.has_opt ||
-	body->param.flags.has_post ||
-	body->param.flags.has_rest ||
-	body->param.flags.has_block ||
-	body->param.flags.has_kw ||
-	body->param.flags.has_kwrest) {
-
-	if (body->param.flags.has_block) {
-	    body->param.size = body->param.block_start + 1;
-	}
-	else if (body->param.flags.has_kwrest) {
-	    body->param.size = body->param.keyword->rest_start + 1;
-	}
-	else if (body->param.flags.has_kw) {
-	    body->param.size = body->param.keyword->bits_start + 1;
-	}
-	else if (body->param.flags.has_post) {
-	    body->param.size = body->param.post_start + body->param.post_num;
-	}
-	else if (body->param.flags.has_rest) {
-	    body->param.size = body->param.rest_start + 1;
-	}
-	else if (body->param.flags.has_opt) {
-	    body->param.size = body->param.lead_num + body->param.opt_num;
-	}
-	else {
+        body->param.flags.has_post ||
+        body->param.flags.has_rest ||
+        body->param.flags.has_block ||
+        body->param.flags.has_kw ||
+        body->param.flags.has_kwrest) {
+
+        if (body->param.flags.has_block) {
+            body->param.size = body->param.block_start + 1;
+        }
+        else if (body->param.flags.has_kwrest) {
+            body->param.size = body->param.keyword->rest_start + 1;
+        }
+        else if (body->param.flags.has_kw) {
+            body->param.size = body->param.keyword->bits_start + 1;
+        }
+        else if (body->param.flags.has_post) {
+            body->param.size = body->param.post_start + body->param.post_num;
+        }
+        else if (body->param.flags.has_rest) {
+            body->param.size = body->param.rest_start + 1;
+        }
+        else if (body->param.flags.has_opt) {
+            body->param.size = body->param.lead_num + body->param.opt_num;
+        }
+        else {
             UNREACHABLE;
-	}
+        }
     }
     else {
-	body->param.size = body->param.lead_num;
+        body->param.size = body->param.lead_num;
     }
 }
 
 static int
 iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
-			    const struct rb_args_info *args, int arg_size)
+                            const struct rb_args_info *args, int arg_size)
 {
     const NODE *node = args->kw_args;
     struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
     struct rb_iseq_param_keyword *keyword;
-    const VALUE default_values = rb_ary_tmp_new(1);
+    const VALUE default_values = rb_ary_hidden_new(1);
     const VALUE complex_mark = rb_str_tmp_new(0);
     int kw = 0, rkw = 0, di = 0, i;
 
@@ -1751,68 +1780,68 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
     body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
 
     while (node) {
-	kw++;
-	node = node->nd_next;
+        kw++;
+        node = node->nd_next;
     }
     arg_size += kw;
     keyword->bits_start = arg_size++;
 
     node = args->kw_args;
     while (node) {
-	const NODE *val_node = node->nd_body->nd_value;
-	VALUE dv;
+        const NODE *val_node = node->nd_body->nd_value;
+        VALUE dv;
 
         if (val_node == NODE_SPECIAL_REQUIRED_KEYWORD) {
-	    ++rkw;
-	}
-	else {
-	    switch (nd_type(val_node)) {
-	      case NODE_LIT:
-		dv = val_node->nd_lit;
-		break;
-	      case NODE_NIL:
-		dv = Qnil;
-		break;
-	      case NODE_TRUE:
-		dv = Qtrue;
-		break;
-	      case NODE_FALSE:
-		dv = Qfalse;
-		break;
-	      default:
+            ++rkw;
+        }
+        else {
+            switch (nd_type(val_node)) {
+              case NODE_LIT:
+                dv = val_node->nd_lit;
+                break;
+              case NODE_NIL:
+                dv = Qnil;
+                break;
+              case NODE_TRUE:
+                dv = Qtrue;
+                break;
+              case NODE_FALSE:
+                dv = Qfalse;
+                break;
+              default:
                 NO_CHECK(COMPILE_POPPED(optargs, "kwarg", node)); /* nd_type_p(node, NODE_KW_ARG) */
-		dv = complex_mark;
-	    }
+                dv = complex_mark;
+            }
 
-	    keyword->num = ++di;
-	    rb_ary_push(default_values, dv);
-	}
+            keyword->num = ++di;
+            rb_ary_push(default_values, dv);
+        }
 
-	node = node->nd_next;
+        node = node->nd_next;
     }
 
     keyword->num = kw;
 
     if (args->kw_rest_arg->nd_vid != 0) {
-	keyword->rest_start = arg_size++;
-	body->param.flags.has_kwrest = TRUE;
+        keyword->rest_start = arg_size++;
+        body->param.flags.has_kwrest = TRUE;
     }
     keyword->required_num = rkw;
     keyword->table = &body->local_table[keyword->bits_start - keyword->num];
 
     {
-	VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
+        VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
 
-	for (i = 0; i < RARRAY_LEN(default_values); i++) {
-	    VALUE dv = RARRAY_AREF(default_values, i);
-	    if (dv == complex_mark) dv = Qundef;
-	    if (!SPECIAL_CONST_P(dv)) {
-		RB_OBJ_WRITTEN(iseq, Qundef, dv);
-	    }
-	    dvs[i] = dv;
-	}
+        for (i = 0; i < RARRAY_LEN(default_values); i++) {
+            VALUE dv = RARRAY_AREF(default_values, i);
+            if (dv == complex_mark) dv = Qundef;
+            if (!SPECIAL_CONST_P(dv)) {
+                RB_OBJ_WRITTEN(iseq, Qundef, dv);
+            }
+            dvs[i] = dv;
+        }
 
-	keyword->default_values = dvs;
+        keyword->default_values = dvs;
     }
     return arg_size;
 }
@@ -1824,119 +1853,119 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
 
     if (node_args) {
         struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
-	struct rb_args_info *args = node_args->nd_ainfo;
-	ID rest_id = 0;
-	int last_comma = 0;
-	ID block_id = 0;
-	int arg_size;
+        struct rb_args_info *args = node_args->nd_ainfo;
+        ID rest_id = 0;
+        int last_comma = 0;
+        ID block_id = 0;
+        int arg_size;
 
-	EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS, COMPILE_NG);
+        EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS, COMPILE_NG);
 
         body->param.flags.ruby2_keywords = args->ruby2_keywords;
-	body->param.lead_num = arg_size = (int)args->pre_args_num;
-	if (body->param.lead_num > 0) body->param.flags.has_lead = TRUE;
-	debugs("  - argc: %d\n", body->param.lead_num);
+        body->param.lead_num = arg_size = (int)args->pre_args_num;
+        if (body->param.lead_num > 0) body->param.flags.has_lead = TRUE;
+        debugs("  - argc: %d\n", body->param.lead_num);
 
-	rest_id = args->rest_arg;
+        rest_id = args->rest_arg;
         if (rest_id == NODE_SPECIAL_EXCESSIVE_COMMA) {
-	    last_comma = 1;
-	    rest_id = 0;
-	}
-	block_id = args->block_arg;
-
-	if (args->opt_args) {
-	    const NODE *node = args->opt_args;
-	    LABEL *label;
-	    VALUE labels = rb_ary_tmp_new(1);
-	    VALUE *opt_table;
-	    int i = 0, j;
-
-	    while (node) {
-		label = NEW_LABEL(nd_line(node));
-		rb_ary_push(labels, (VALUE)label | 1);
-		ADD_LABEL(optargs, label);
+            last_comma = 1;
+            rest_id = 0;
+        }
+        block_id = args->block_arg;
+
+        if (args->opt_args) {
+            const NODE *node = args->opt_args;
+            LABEL *label;
+            VALUE labels = rb_ary_hidden_new(1);
+            VALUE *opt_table;
+            int i = 0, j;
+
+            while (node) {
+                label = NEW_LABEL(nd_line(node));
+                rb_ary_push(labels, (VALUE)label | 1);
+                ADD_LABEL(optargs, label);
                 NO_CHECK(COMPILE_POPPED(optargs, "optarg", node->nd_body));
-		node = node->nd_next;
-		i += 1;
-	    }
+                node = node->nd_next;
+                i += 1;
+            }
 
-	    /* last label */
-	    label = NEW_LABEL(nd_line(node_args));
-	    rb_ary_push(labels, (VALUE)label | 1);
-	    ADD_LABEL(optargs, label);
+            /* last label */
+            label = NEW_LABEL(nd_line(node_args));
+            rb_ary_push(labels, (VALUE)label | 1);
+            ADD_LABEL(optargs, label);
 
-	    opt_table = ALLOC_N(VALUE, i+1);
+            opt_table = ALLOC_N(VALUE, i+1);
 
             MEMCPY(opt_table, RARRAY_CONST_PTR_TRANSIENT(labels), VALUE, i+1);
-	    for (j = 0; j < i+1; j++) {
-		opt_table[j] &= ~1;
-	    }
-	    rb_ary_clear(labels);
-
-	    body->param.flags.has_opt = TRUE;
-	    body->param.opt_num = i;
-	    body->param.opt_table = opt_table;
-	    arg_size += i;
-	}
-
-	if (rest_id) {
-	    body->param.rest_start = arg_size++;
-	    body->param.flags.has_rest = TRUE;
-	    assert(body->param.rest_start != -1);
-	}
-
-	if (args->first_post_arg) {
-	    body->param.post_start = arg_size;
-	    body->param.post_num = args->post_args_num;
-	    body->param.flags.has_post = TRUE;
-	    arg_size += args->post_args_num;
-
-	    if (body->param.flags.has_rest) { /* TODO: why that? */
-		body->param.post_start = body->param.rest_start + 1;
-	    }
-	}
-
-	if (args->kw_args) {
-	    arg_size = iseq_set_arguments_keywords(iseq, optargs, args, arg_size);
-	}
-	else if (args->kw_rest_arg) {
-	    struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
-	    keyword->rest_start = arg_size++;
-	    body->param.keyword = keyword;
-	    body->param.flags.has_kwrest = TRUE;
-	}
-	else if (args->no_kwarg) {
-	    body->param.flags.accepts_no_kwarg = TRUE;
-	}
-
-	if (block_id) {
-	    body->param.block_start = arg_size++;
-	    body->param.flags.has_block = TRUE;
-	}
-
-	iseq_calc_param_size(iseq);
-	body->param.size = arg_size;
-
-	if (args->pre_init) { /* m_init */
+            for (j = 0; j < i+1; j++) {
+                opt_table[j] &= ~1;
+            }
+            rb_ary_clear(labels);
+
+            body->param.flags.has_opt = TRUE;
+            body->param.opt_num = i;
+            body->param.opt_table = opt_table;
+            arg_size += i;
+        }
+
+        if (rest_id) {
+            body->param.rest_start = arg_size++;
+            body->param.flags.has_rest = TRUE;
+            assert(body->param.rest_start != -1);
+        }
+
+        if (args->first_post_arg) {
+            body->param.post_start = arg_size;
+            body->param.post_num = args->post_args_num;
+            body->param.flags.has_post = TRUE;
+            arg_size += args->post_args_num;
+
+            if (body->param.flags.has_rest) { /* TODO: why that? */
+                body->param.post_start = body->param.rest_start + 1;
+            }
+        }
+
+        if (args->kw_args) {
+            arg_size = iseq_set_arguments_keywords(iseq, optargs, args, arg_size);
+        }
+        else if (args->kw_rest_arg) {
+            struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+            keyword->rest_start = arg_size++;
+            body->param.keyword = keyword;
+            body->param.flags.has_kwrest = TRUE;
+        }
+        else if (args->no_kwarg) {
+            body->param.flags.accepts_no_kwarg = TRUE;
+        }
+
+        if (block_id) {
+            body->param.block_start = arg_size++;
+            body->param.flags.has_block = TRUE;
+        }
+
+        iseq_calc_param_size(iseq);
+        body->param.size = arg_size;
+
+        if (args->pre_init) { /* m_init */
             NO_CHECK(COMPILE_POPPED(optargs, "init arguments (m)", args->pre_init));
-	}
-	if (args->post_init) { /* p_init */
+        }
+        if (args->post_init) { /* p_init */
             NO_CHECK(COMPILE_POPPED(optargs, "init arguments (p)", args->post_init));
-	}
+        }
 
-	if (body->type == ISEQ_TYPE_BLOCK) {
-	    if (body->param.flags.has_opt    == FALSE &&
-		body->param.flags.has_post   == FALSE &&
-		body->param.flags.has_rest   == FALSE &&
-		body->param.flags.has_kw     == FALSE &&
-		body->param.flags.has_kwrest == FALSE) {
+        if (body->type == ISEQ_TYPE_BLOCK) {
+            if (body->param.flags.has_opt    == FALSE &&
+                body->param.flags.has_post   == FALSE &&
+                body->param.flags.has_rest   == FALSE &&
+                body->param.flags.has_kw     == FALSE &&
+                body->param.flags.has_kwrest == FALSE) {
 
-		if (body->param.lead_num == 1 && last_comma == 0) {
-		    /* {|a|} */
-		    body->param.flags.ambiguous_param0 = TRUE;
-		}
-	    }
-	}
+                if (body->param.lead_num == 1 && last_comma == 0) {
+                    /* {|a|} */
+                    body->param.flags.ambiguous_param0 = TRUE;
+                }
+            }
+        }
     }
 
     return COMPILE_OK;
@@ -1948,8 +1977,8 @@ iseq_set_local_table(rb_iseq_t *iseq, const rb_ast_id_table_t *tbl)
     unsigned int size = tbl ? tbl->size : 0;
 
     if (size > 0) {
-	ID *ids = (ID *)ALLOC_N(ID, size);
-	MEMCPY(ids, tbl->ids, ID, size);
+        ID *ids = (ID *)ALLOC_N(ID, size);
+        MEMCPY(ids, tbl->ids, ID, size);
         ISEQ_BODY(iseq)->local_table = ids;
     }
     ISEQ_BODY(iseq)->local_table_size = size;
@@ -2058,18 +2087,24 @@ cdhash_set_label_i(VALUE key, VALUE val, VALUE ptr)
 static inline VALUE
 get_ivar_ic_value(rb_iseq_t *iseq,ID id)
 {
+    return INT2FIX(ISEQ_BODY(iseq)->ivc_size++);
+}
+
+static inline VALUE
+get_cvar_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;
-	}
+        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;
+        tbl = rb_id_table_create(1);
+        ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = tbl;
     }
-    val = INT2FIX(ISEQ_BODY(iseq)->is_size++);
+    val = INT2FIX(ISEQ_BODY(iseq)->icvarc_size++);
     rb_id_table_insert(tbl,id,val);
     return val;
 }
@@ -2090,113 +2125,113 @@ fix_sp_depth(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     LINK_ELEMENT *list;
 
     for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
-	if (IS_LABEL(list)) {
-	    LABEL *lobj = (LABEL *)list;
-	    lobj->set = TRUE;
-	}
+        if (IS_LABEL(list)) {
+            LABEL *lobj = (LABEL *)list;
+            lobj->set = TRUE;
+        }
     }
 
     for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		int j, len, insn;
-		const char *types;
-		VALUE *operands;
-		INSN *iobj = (INSN *)list;
-
-		/* update sp */
-		sp = calc_sp_depth(sp, iobj);
-		if (sp < 0) {
-		    BADINSN_DUMP(anchor, list, NULL);
-		    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
-				  "argument stack underflow (%d)", sp);
-		    return -1;
-		}
-		if (sp > stack_max) {
-		    stack_max = sp;
-		}
-
-		line = iobj->insn_info.line_no;
-		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
-		operands = iobj->operands;
-		insn = iobj->insn_id;
-		types = insn_op_types(insn);
-		len = insn_len(insn);
-
-		/* operand check */
-		if (iobj->operand_size != len - 1) {
-		    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
-		    BADINSN_DUMP(anchor, list, NULL);
-		    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
-				  "operand size miss! (%d for %d)",
-				  iobj->operand_size, len - 1);
-		    return -1;
-		}
-
-		for (j = 0; types[j]; j++) {
-		    if (types[j] == TS_OFFSET) {
-			/* label(destination position) */
-			LABEL *lobj = (LABEL *)operands[j];
-			if (!lobj->set) {
-			    BADINSN_DUMP(anchor, list, NULL);
-			    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
-					  "unknown label: "LABEL_FORMAT, lobj->label_no);
-			    return -1;
-			}
-			if (lobj->sp == -1) {
-			    lobj->sp = sp;
+        switch (list->type) {
+          case ISEQ_ELEMENT_INSN:
+            {
+                int j, len, insn;
+                const char *types;
+                VALUE *operands;
+                INSN *iobj = (INSN *)list;
+
+                /* update sp */
+                sp = calc_sp_depth(sp, iobj);
+                if (sp < 0) {
+                    BADINSN_DUMP(anchor, list, NULL);
+                    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                                  "argument stack underflow (%d)", sp);
+                    return -1;
+                }
+                if (sp > stack_max) {
+                    stack_max = sp;
+                }
+
+                line = iobj->insn_info.line_no;
+                /* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
+                operands = iobj->operands;
+                insn = iobj->insn_id;
+                types = insn_op_types(insn);
+                len = insn_len(insn);
+
+                /* operand check */
+                if (iobj->operand_size != len - 1) {
+                    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
+                    BADINSN_DUMP(anchor, list, NULL);
+                    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                                  "operand size miss! (%d for %d)",
+                                  iobj->operand_size, len - 1);
+                    return -1;
+                }
+
+                for (j = 0; types[j]; j++) {
+                    if (types[j] == TS_OFFSET) {
+                        /* label(destination position) */
+                        LABEL *lobj = (LABEL *)operands[j];
+                        if (!lobj->set) {
+                            BADINSN_DUMP(anchor, list, NULL);
+                            COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                                          "unknown label: "LABEL_FORMAT, lobj->label_no);
+                            return -1;
+                        }
+                        if (lobj->sp == -1) {
+                            lobj->sp = sp;
                         }
                         else if (lobj->sp != sp) {
                             debugs("%s:%d: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
                                    RSTRING_PTR(rb_iseq_path(iseq)), line,
                                    lobj->label_no, lobj->sp, sp);
                         }
-		    }
-		}
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		LABEL *lobj = (LABEL *)list;
-		if (lobj->sp == -1) {
-		    lobj->sp = sp;
-		}
-		else {
+                    }
+                }
+                break;
+            }
+          case ISEQ_ELEMENT_LABEL:
+            {
+                LABEL *lobj = (LABEL *)list;
+                if (lobj->sp == -1) {
+                    lobj->sp = sp;
+                }
+                else {
                     if (lobj->sp != sp) {
                         debugs("%s:%d: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
                                 RSTRING_PTR(rb_iseq_path(iseq)), line,
                                 lobj->label_no, lobj->sp, sp);
                     }
-		    sp = lobj->sp;
-		}
-		break;
-	    }
-	  case ISEQ_ELEMENT_TRACE:
-	    {
-		/* ignore */
-		break;
-	    }
-	  case ISEQ_ELEMENT_ADJUST:
-	    {
-		ADJUST *adjust = (ADJUST *)list;
-		int orig_sp = sp;
-
-		sp = adjust->label ? adjust->label->sp : 0;
-		if (adjust->line_no != -1 && orig_sp - sp < 0) {
-		    BADINSN_DUMP(anchor, list, NULL);
-		    COMPILE_ERROR(iseq, adjust->line_no,
-				  "iseq_set_sequence: adjust bug %d < %d",
-				  orig_sp, sp);
-		    return -1;
-		}
-		break;
-	    }
-	  default:
-	    BADINSN_DUMP(anchor, list, NULL);
-	    COMPILE_ERROR(iseq, line, "unknown list type: %d", list->type);
-	    return -1;
-	}
+                    sp = lobj->sp;
+                }
+                break;
+            }
+          case ISEQ_ELEMENT_TRACE:
+            {
+                /* ignore */
+                break;
+            }
+          case ISEQ_ELEMENT_ADJUST:
+            {
+                ADJUST *adjust = (ADJUST *)list;
+                int orig_sp = sp;
+
+                sp = adjust->label ? adjust->label->sp : 0;
+                if (adjust->line_no != -1 && orig_sp - sp < 0) {
+                    BADINSN_DUMP(anchor, list, NULL);
+                    COMPILE_ERROR(iseq, adjust->line_no,
+                                  "iseq_set_sequence: adjust bug %d < %d",
+                                  orig_sp, sp);
+                    return -1;
+                }
+                break;
+            }
+          default:
+            BADINSN_DUMP(anchor, list, NULL);
+            COMPILE_ERROR(iseq, line, "unknown list type: %d", list->type);
+            return -1;
+        }
     }
     return stack_max;
 }
@@ -2226,14 +2261,34 @@ static int
 add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions,
                 int insns_info_index, int code_index, const ADJUST *adjust)
 {
-    if (insns_info_index > 0 ||
-        insns_info[insns_info_index-1].line_no != adjust->line_no) {
-        insns_info[insns_info_index].line_no    = adjust->line_no;
-        insns_info[insns_info_index].events     = 0;
-        positions[insns_info_index]             = code_index;
-        return TRUE;
+    insns_info[insns_info_index].line_no    = adjust->line_no;
+    insns_info[insns_info_index].events     = 0;
+    positions[insns_info_index]             = code_index;
+    return TRUE;
+}
+
+static ID *
+array_to_idlist(VALUE arr)
+{
+    RUBY_ASSERT(RB_TYPE_P(arr, T_ARRAY));
+    long size = RARRAY_LEN(arr);
+    ID *ids = (ID *)ALLOC_N(ID, size + 1);
+    for (int i = 0; i < size; i++) {
+        VALUE sym = RARRAY_AREF(arr, i);
+        ids[i] = SYM2ID(sym);
     }
-    return FALSE;
+    ids[size] = 0;
+    return ids;
+}
+
+static VALUE
+idlist_to_array(const ID *ids)
+{
+    VALUE arr = rb_ary_new();
+    while (*ids) {
+        rb_ary_push(arr, ID2SYM(*ids++));
+    }
+    return arr;
 }
 
 /**
@@ -2242,7 +2297,6 @@ add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions
 static int
 iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
-    VALUE iseqv = (VALUE)iseq;
     struct iseq_insn_info_entry *insns_info;
     struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
     unsigned int *positions;
@@ -2259,20 +2313,20 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     /* fix label position */
     insn_num = code_index = 0;
     for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		INSN *iobj = (INSN *)list;
-		/* update sp */
-		sp = calc_sp_depth(sp, iobj);
-		insn_num++;
+        switch (list->type) {
+          case ISEQ_ELEMENT_INSN:
+            {
+                INSN *iobj = (INSN *)list;
+                /* update sp */
+                sp = calc_sp_depth(sp, iobj);
+                insn_num++;
                 events = iobj->insn_info.events |= events;
                 if (ISEQ_COVERAGE(iseq)) {
                     if (ISEQ_LINE_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_LINE) &&
                         !(rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES)) {
-                        int line = iobj->insn_info.line_no;
-                        if (line >= 1) {
-                            RARRAY_ASET(ISEQ_LINE_COVERAGE(iseq), line - 1, INT2FIX(0));
+                        int line = iobj->insn_info.line_no - 1;
+                        if (line >= 0 && line < RARRAY_LEN(ISEQ_LINE_COVERAGE(iseq))) {
+                            RARRAY_ASET(ISEQ_LINE_COVERAGE(iseq), line, INT2FIX(0));
                         }
                     }
                     if (ISEQ_BRANCH_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_BRANCH)) {
@@ -2281,144 +2335,189 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
                         }
                         RARRAY_ASET(ISEQ_PC2BRANCHINDEX(iseq), code_index, INT2FIX(data));
                     }
-		}
+                }
                 code_index += insn_data_length(iobj);
-		events = 0;
+                events = 0;
                 data = 0;
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		LABEL *lobj = (LABEL *)list;
-		lobj->position = code_index;
+                break;
+            }
+          case ISEQ_ELEMENT_LABEL:
+            {
+                LABEL *lobj = (LABEL *)list;
+                lobj->position = code_index;
                 if (lobj->sp != sp) {
                     debugs("%s: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
                            RSTRING_PTR(rb_iseq_path(iseq)),
                            lobj->label_no, lobj->sp, sp);
                 }
-		sp = lobj->sp;
-		break;
-	    }
-	  case ISEQ_ELEMENT_TRACE:
-	    {
-		TRACE *trace = (TRACE *)list;
-		events |= trace->event;
+                sp = lobj->sp;
+                break;
+            }
+          case ISEQ_ELEMENT_TRACE:
+            {
+                TRACE *trace = (TRACE *)list;
+                events |= trace->event;
                 if (trace->event & RUBY_EVENT_COVERAGE_BRANCH) data = trace->data;
-		break;
-	    }
-	  case ISEQ_ELEMENT_ADJUST:
-	    {
-		ADJUST *adjust = (ADJUST *)list;
-		if (adjust->line_no != -1) {
-		    int orig_sp = sp;
-		    sp = adjust->label ? adjust->label->sp : 0;
-		    if (orig_sp - sp > 0) {
-			if (orig_sp - sp > 1) code_index++; /* 1 operand */
-			code_index++; /* insn */
-			insn_num++;
-		    }
-		}
-		break;
-	    }
-	  default: break;
-	}
+                break;
+            }
+          case ISEQ_ELEMENT_ADJUST:
+            {
+                ADJUST *adjust = (ADJUST *)list;
+                if (adjust->line_no != -1) {
+                    int orig_sp = sp;
+                    sp = adjust->label ? adjust->label->sp : 0;
+                    if (orig_sp - sp > 0) {
+                        if (orig_sp - sp > 1) code_index++; /* 1 operand */
+                        code_index++; /* insn */
+                        insn_num++;
+                    }
+                }
+                break;
+            }
+          default: break;
+        }
     }
 
     /* make instruction sequence */
     generated_iseq = ALLOC_N(VALUE, code_index);
     insns_info = ALLOC_N(struct iseq_insn_info_entry, insn_num);
     positions = ALLOC_N(unsigned int, insn_num);
-    body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, body->is_size);
+    body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, ISEQ_IS_SIZE(body));
     body->call_data = ZALLOC_N(struct rb_call_data, body->ci_size);
     ISEQ_COMPILE_DATA(iseq)->ci_index = 0;
 
+    // Calculate the bitmask buffer size.
+    // Round the generated_iseq size up to the nearest multiple
+    // of the number of bits in an unsigned long.
+
+    // Allocate enough room for the bitmask list
+    iseq_bits_t * mark_offset_bits;
+    int code_size = code_index;
+
+    iseq_bits_t tmp[1] = {0};
+    bool needs_bitmap = false;
+
+    if (ISEQ_MBITS_BUFLEN(code_index) == 1) {
+        mark_offset_bits = tmp;
+    }
+    else {
+        mark_offset_bits = ZALLOC_N(iseq_bits_t, ISEQ_MBITS_BUFLEN(code_index));
+    }
+
     list = FIRST_ELEMENT(anchor);
     insns_info_index = code_index = sp = 0;
 
     while (list) {
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		int j, len, insn;
-		const char *types;
-		VALUE *operands;
-		INSN *iobj = (INSN *)list;
-
-		/* update sp */
-		sp = calc_sp_depth(sp, iobj);
-		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
-		operands = iobj->operands;
-		insn = iobj->insn_id;
-		generated_iseq[code_index] = insn;
-		types = insn_op_types(insn);
-		len = insn_len(insn);
-
-		for (j = 0; types[j]; j++) {
-		    char type = types[j];
-		    /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
-		    switch (type) {
-		      case TS_OFFSET:
-			{
-			    /* label(destination position) */
-			    LABEL *lobj = (LABEL *)operands[j];
-			    generated_iseq[code_index + 1 + j] = lobj->position - (code_index + len);
-			    break;
-			}
-		      case TS_CDHASH:
-			{
-			    VALUE map = operands[j];
-			    struct cdhash_set_label_struct data;
+        switch (list->type) {
+          case ISEQ_ELEMENT_INSN:
+            {
+                int j, len, insn;
+                const char *types;
+                VALUE *operands;
+                INSN *iobj = (INSN *)list;
+
+                /* update sp */
+                sp = calc_sp_depth(sp, iobj);
+                /* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
+                operands = iobj->operands;
+                insn = iobj->insn_id;
+                generated_iseq[code_index] = insn;
+                types = insn_op_types(insn);
+                len = insn_len(insn);
+
+                for (j = 0; types[j]; j++) {
+                    char type = types[j];
+
+                    /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
+                    switch (type) {
+                      case TS_OFFSET:
+                        {
+                            /* label(destination position) */
+                            LABEL *lobj = (LABEL *)operands[j];
+                            generated_iseq[code_index + 1 + j] = lobj->position - (code_index + len);
+                            break;
+                        }
+                      case TS_CDHASH:
+                        {
+                            VALUE map = operands[j];
+                            struct cdhash_set_label_struct data;
                             data.hash = map;
                             data.pos = code_index;
                             data.len = len;
-			    rb_hash_foreach(map, cdhash_set_label_i, (VALUE)&data);
-
-			    rb_hash_rehash(map);
-			    freeze_hide_obj(map);
-			    generated_iseq[code_index + 1 + j] = map;
-			    RB_OBJ_WRITTEN(iseq, Qundef, map);
-                            FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
-			    break;
-			}
-		      case TS_LINDEX:
-		      case TS_NUM:	/* ulong */
-			generated_iseq[code_index + 1 + j] = FIX2INT(operands[j]);
-			break;
-		      case TS_VALUE:	/* VALUE */
-		      case TS_ISEQ:	/* iseq */
-			{
-			    VALUE v = operands[j];
-			    generated_iseq[code_index + 1 + j] = v;
-			    /* to mark ruby object */
-			    if (!SPECIAL_CONST_P(v)) {
-				RB_OBJ_WRITTEN(iseq, Qundef, v);
-                                FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
-			    }
-			    break;
-			}
-		      case TS_IC: /* inline cache */
-		      case TS_ISE: /* inline storage entry */
-              case TS_ICVARC: /* inline cvar cache */
-		      case TS_IVC: /* inline ivar cache */
-			{
-			    unsigned int ic_index = FIX2UINT(operands[j]);
-			    IC ic = (IC)&body->is_entries[ic_index];
-			    if (UNLIKELY(ic_index >= body->is_size)) {
+                            rb_hash_foreach(map, cdhash_set_label_i, (VALUE)&data);
+
+                            rb_hash_rehash(map);
+                            freeze_hide_obj(map);
+                            generated_iseq[code_index + 1 + j] = map;
+                            ISEQ_MBITS_SET(mark_offset_bits, code_index + 1 + j);
+                            RB_OBJ_WRITTEN(iseq, Qundef, map);
+                            needs_bitmap = true;
+                            break;
+                        }
+                      case TS_LINDEX:
+                      case TS_NUM:	/* ulong */
+                        generated_iseq[code_index + 1 + j] = FIX2INT(operands[j]);
+                        break;
+                      case TS_ISEQ:	/* iseq */
+                      case TS_VALUE:	/* VALUE */
+                        {
+                            VALUE v = operands[j];
+                            generated_iseq[code_index + 1 + j] = v;
+                            /* to mark ruby object */
+                            if (!SPECIAL_CONST_P(v)) {
+                                RB_OBJ_WRITTEN(iseq, Qundef, v);
+                                ISEQ_MBITS_SET(mark_offset_bits, code_index + 1 + j);
+                                needs_bitmap = true;
+                            }
+                            break;
+                        }
+                      /* [ TS_IVC | TS_ICVARC | TS_ISE | TS_IC ] */
+                      case TS_IC: /* inline cache: constants */
+                        {
+                            unsigned int ic_index = ISEQ_COMPILE_DATA(iseq)->ic_index++;
+                            IC ic = &ISEQ_IS_ENTRY_START(body, type)[ic_index].ic_cache;
+                            if (UNLIKELY(ic_index >= body->ic_size)) {
                                 BADINSN_DUMP(anchor, &iobj->link, 0);
                                 COMPILE_ERROR(iseq, iobj->insn_info.line_no,
                                               "iseq_set_sequence: ic_index overflow: index: %d, size: %d",
-                                              ic_index, body->is_size);
-			    }
-			    generated_iseq[code_index + 1 + j] = (VALUE)ic;
-                            FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
-
-                            if (insn == BIN(opt_getinlinecache) && type == TS_IC) {
-                                // Store the instruction index for opt_getinlinecache on the IC for
-                                // YJIT to invalidate code when opt_setinlinecache runs.
-                                ic->get_insn_idx = (unsigned int)code_index;
+                                              ic_index, ISEQ_IS_SIZE(body));
                             }
-			    break;
-			}
+
+                            ic->segments = array_to_idlist(operands[j]);
+
+                            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 */
+                        {
+                            unsigned int ic_index = FIX2UINT(operands[j]);
+                            IC ic = &ISEQ_IS_ENTRY_START(body, type)[ic_index].ic_cache;
+                            if (UNLIKELY(ic_index >= ISEQ_IS_SIZE(body))) {
+                                BADINSN_DUMP(anchor, &iobj->link, 0);
+                                COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                                              "iseq_set_sequence: ic_index overflow: index: %d, size: %d",
+                                              ic_index, ISEQ_IS_SIZE(body));
+                            }
+                            generated_iseq[code_index + 1 + j] = (VALUE)ic;
+
+                            break;
+                        }
                         case TS_CALLDATA:
                         {
                             const struct rb_callinfo *source_ci = (const struct rb_callinfo *)operands[j];
@@ -2429,85 +2528,105 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
                             generated_iseq[code_index + 1 + j] = (VALUE)cd;
                             break;
                         }
-		      case TS_ID: /* ID */
-			generated_iseq[code_index + 1 + j] = SYM2ID(operands[j]);
-			break;
-		      case TS_FUNCPTR:
-			generated_iseq[code_index + 1 + j] = operands[j];
-			break;
+                      case TS_ID: /* ID */
+                        generated_iseq[code_index + 1 + j] = SYM2ID(operands[j]);
+                        break;
+                      case TS_FUNCPTR:
+                        generated_iseq[code_index + 1 + j] = operands[j];
+                        break;
                       case TS_BUILTIN:
                         generated_iseq[code_index + 1 + j] = operands[j];
                         break;
-		      default:
-			BADINSN_ERROR(iseq, iobj->insn_info.line_no,
-				      "unknown operand type: %c", type);
-			return COMPILE_NG;
-		    }
-		}
-		if (add_insn_info(insns_info, positions, insns_info_index, code_index, iobj)) insns_info_index++;
-		code_index += len;
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		LABEL *lobj = (LABEL *)list;
+                      default:
+                        BADINSN_ERROR(iseq, iobj->insn_info.line_no,
+                                      "unknown operand type: %c", type);
+                        return COMPILE_NG;
+                    }
+                }
+                if (add_insn_info(insns_info, positions, insns_info_index, code_index, iobj)) insns_info_index++;
+                code_index += len;
+                break;
+            }
+          case ISEQ_ELEMENT_LABEL:
+            {
+                LABEL *lobj = (LABEL *)list;
                 if (lobj->sp != sp) {
                     debugs("%s: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
                            RSTRING_PTR(rb_iseq_path(iseq)),
                            lobj->label_no, lobj->sp, sp);
                 }
-		sp = lobj->sp;
-		break;
-	    }
-	  case ISEQ_ELEMENT_ADJUST:
-	    {
-		ADJUST *adjust = (ADJUST *)list;
-		int orig_sp = sp;
-
-		if (adjust->label) {
-		    sp = adjust->label->sp;
-		}
-		else {
-		    sp = 0;
-		}
-
-		if (adjust->line_no != -1) {
-		    const int diff = orig_sp - sp;
-		    if (diff > 0) {
-			if (add_adjust_info(insns_info, positions, insns_info_index, code_index, adjust)) insns_info_index++;
-		    }
-		    if (diff > 1) {
-			generated_iseq[code_index++] = BIN(adjuststack);
-			generated_iseq[code_index++] = orig_sp - sp;
-		    }
-		    else if (diff == 1) {
-			generated_iseq[code_index++] = BIN(pop);
-		    }
-		    else if (diff < 0) {
-			int label_no = adjust->label ? adjust->label->label_no : -1;
-			xfree(generated_iseq);
-			xfree(insns_info);
-			xfree(positions);
-			debug_list(anchor, list);
-			COMPILE_ERROR(iseq, adjust->line_no,
-				      "iseq_set_sequence: adjust bug to %d %d < %d",
-				      label_no, orig_sp, sp);
-			return COMPILE_NG;
-		    }
-		}
-		break;
-	    }
-	  default:
-	    /* ignore */
-	    break;
-	}
-	list = list->next;
+                sp = lobj->sp;
+                break;
+            }
+          case ISEQ_ELEMENT_ADJUST:
+            {
+                ADJUST *adjust = (ADJUST *)list;
+                int orig_sp = sp;
+
+                if (adjust->label) {
+                    sp = adjust->label->sp;
+                }
+                else {
+                    sp = 0;
+                }
+
+                if (adjust->line_no != -1) {
+                    const int diff = orig_sp - sp;
+                    if (diff > 0) {
+                        if (insns_info_index == 0) {
+                            COMPILE_ERROR(iseq, adjust->line_no,
+                                          "iseq_set_sequence: adjust bug (ISEQ_ELEMENT_ADJUST must not be the first in iseq)");
+                        }
+                        if (add_adjust_info(insns_info, positions, insns_info_index, code_index, adjust)) insns_info_index++;
+                    }
+                    if (diff > 1) {
+                        generated_iseq[code_index++] = BIN(adjuststack);
+                        generated_iseq[code_index++] = orig_sp - sp;
+                    }
+                    else if (diff == 1) {
+                        generated_iseq[code_index++] = BIN(pop);
+                    }
+                    else if (diff < 0) {
+                        int label_no = adjust->label ? adjust->label->label_no : -1;
+                        xfree(generated_iseq);
+                        xfree(insns_info);
+                        xfree(positions);
+                        if (ISEQ_MBITS_BUFLEN(code_size) > 1) {
+                            xfree(mark_offset_bits);
+                        }
+                        debug_list(anchor, list);
+                        COMPILE_ERROR(iseq, adjust->line_no,
+                                      "iseq_set_sequence: adjust bug to %d %d < %d",
+                                      label_no, orig_sp, sp);
+                        return COMPILE_NG;
+                    }
+                }
+                break;
+            }
+          default:
+            /* ignore */
+            break;
+        }
+        list = list->next;
     }
 
     body->iseq_encoded = (void *)generated_iseq;
     body->iseq_size = code_index;
     body->stack_max = stack_max;
 
+    if (ISEQ_MBITS_BUFLEN(body->iseq_size) == 1) {
+        body->mark_bits.single = mark_offset_bits[0];
+    }
+    else {
+        if (needs_bitmap) {
+            body->mark_bits.list = mark_offset_bits;
+        }
+        else {
+            body->mark_bits.list = 0;
+            ruby_xfree(mark_offset_bits);
+        }
+    }
+
     /* get rid of memory leak when REALLOC failed */
     body->insns_info.body = insns_info;
     body->insns_info.positions = positions;
@@ -2541,44 +2660,48 @@ 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));
-	table->size = tlen;
+        struct iseq_catch_table *table = xmalloc(iseq_catch_table_bytes(tlen));
+        table->size = tlen;
 
-	for (i = 0; i < table->size; i++) {
+        for (i = 0; i < table->size; i++) {
             ptr = RARRAY_CONST_PTR_TRANSIENT(tptr[i]);
-	    entry = UNALIGNED_MEMBER_PTR(table, entries[i]);
-	    entry->type = (enum catch_type)(ptr[0] & 0xffff);
-	    entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
-	    entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
-	    entry->iseq = (rb_iseq_t *)ptr[3];
-	    RB_OBJ_WRITTEN(iseq, Qundef, entry->iseq);
-
-	    /* stack depth */
-	    if (ptr[4]) {
-		LABEL *lobj = (LABEL *)(ptr[4] & ~1);
-		entry->cont = label_get_position(lobj);
-		entry->sp = label_get_sp(lobj);
-
-		/* TODO: Dirty Hack!  Fix me */
-		if (entry->type == CATCH_TYPE_RESCUE ||
-		    entry->type == CATCH_TYPE_BREAK ||
-		    entry->type == CATCH_TYPE_NEXT) {
-		    entry->sp--;
-		}
-	    }
-	    else {
-		entry->cont = 0;
-	    }
-	}
+            entry = UNALIGNED_MEMBER_PTR(table, entries[i]);
+            entry->type = (enum rb_catch_type)(ptr[0] & 0xffff);
+            entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
+            entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
+            entry->iseq = (rb_iseq_t *)ptr[3];
+            RB_OBJ_WRITTEN(iseq, Qundef, entry->iseq);
+
+            /* stack depth */
+            if (ptr[4]) {
+                LABEL *lobj = (LABEL *)(ptr[4] & ~1);
+                entry->cont = label_get_position(lobj);
+                entry->sp = label_get_sp(lobj);
+
+                /* TODO: Dirty Hack!  Fix me */
+                if (entry->type == CATCH_TYPE_RESCUE ||
+                    entry->type == CATCH_TYPE_BREAK ||
+                    entry->type == CATCH_TYPE_NEXT) {
+                    entry->sp--;
+                }
+            }
+            else {
+                entry->cont = 0;
+            }
+        }
         ISEQ_BODY(iseq)->catch_table = table;
-	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */
+        RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */
     }
 
+    RB_GC_GUARD(catch_table_ary);
+
     return COMPILE_OK;
 }
 
@@ -2599,8 +2722,8 @@ iseq_set_optargs_table(rb_iseq_t *iseq)
 
     if (ISEQ_BODY(iseq)->param.flags.has_opt) {
         for (i = 0; i < ISEQ_BODY(iseq)->param.opt_num + 1; i++) {
-	    opt_table[i] = label_get_position((LABEL *)opt_table[i]);
-	}
+            opt_table[i] = label_get_position((LABEL *)opt_table[i]);
+        }
     }
     return COMPILE_OK;
 }
@@ -2614,27 +2737,27 @@ get_destination_insn(INSN *iobj)
 
     list = lobj->link.next;
     while (list) {
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	  case ISEQ_ELEMENT_ADJUST:
-	    goto found;
-	  case ISEQ_ELEMENT_LABEL:
-	    /* ignore */
-	    break;
-	  case ISEQ_ELEMENT_TRACE:
-	    {
-		TRACE *trace = (TRACE *)list;
-		events |= trace->event;
-	    }
-	    break;
-	  default: break;
-	}
-	list = list->next;
+        switch (list->type) {
+          case ISEQ_ELEMENT_INSN:
+          case ISEQ_ELEMENT_ADJUST:
+            goto found;
+          case ISEQ_ELEMENT_LABEL:
+            /* ignore */
+            break;
+          case ISEQ_ELEMENT_TRACE:
+            {
+                TRACE *trace = (TRACE *)list;
+                events |= trace->event;
+            }
+            break;
+          default: break;
+        }
+        list = list->next;
     }
   found:
     if (list && IS_INSN(list)) {
-	INSN *iobj = (INSN *)list;
-	iobj->insn_info.events |= events;
+        INSN *iobj = (INSN *)list;
+        iobj->insn_info.events |= events;
     }
     return list;
 }
@@ -2645,10 +2768,10 @@ get_next_insn(INSN *iobj)
     LINK_ELEMENT *list = iobj->link.next;
 
     while (list) {
-	if (IS_INSN(list) || IS_ADJUST(list)) {
-	    return list;
-	}
-	list = list->next;
+        if (IS_INSN(list) || IS_ADJUST(list)) {
+            return list;
+        }
+        list = list->next;
     }
     return 0;
 }
@@ -2659,10 +2782,10 @@ get_prev_insn(INSN *iobj)
     LINK_ELEMENT *list = iobj->link.prev;
 
     while (list) {
-	if (IS_INSN(list) || IS_ADJUST(list)) {
-	    return list;
-	}
-	list = list->prev;
+        if (IS_INSN(list) || IS_ADJUST(list)) {
+            return list;
+        }
+        list = list->prev;
     }
     return 0;
 }
@@ -2692,9 +2815,9 @@ find_destination(INSN *i)
 {
     int pos, len = insn_len(i->insn_id);
     for (pos = 0; pos < len; ++pos) {
-	if (insn_op_types(i->insn_id)[pos] == TS_OFFSET) {
-	    return (LABEL *)OPERAND_AT(i, pos);
-	}
+        if (insn_op_types(i->insn_id)[pos] == TS_OFFSET) {
+            return (LABEL *)OPERAND_AT(i, pos);
+        }
     }
     return 0;
 }
@@ -2710,53 +2833,51 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
     MEMZERO(unref_counts, int, nlabels);
     end = i;
     do {
-	LABEL *lab;
-	if (IS_INSN(i)) {
-	    if (IS_INSN_ID(i, leave)) {
-		end = i;
-		break;
-	    }
-	    else if ((lab = find_destination((INSN *)i)) != 0) {
-		if (lab->unremovable) break;
-		unref_counts[lab->label_no]++;
-	    }
-	}
-	else if (IS_LABEL(i)) {
-	    lab = (LABEL *)i;
-	    if (lab->unremovable) return 0;
-	    if (lab->refcnt > unref_counts[lab->label_no]) {
-		if (i == first) return 0;
-		break;
-	    }
-	    continue;
-	}
-	else if (IS_TRACE(i)) {
-	    /* do nothing */
-	}
-	else if (IS_ADJUST(i)) {
-	    LABEL *dest = ((ADJUST *)i)->label;
-	    if (dest && dest->unremovable) return 0;
-	}
-	end = i;
+        LABEL *lab;
+        if (IS_INSN(i)) {
+            if (IS_INSN_ID(i, leave)) {
+                end = i;
+                break;
+            }
+            else if ((lab = find_destination((INSN *)i)) != 0) {
+                unref_counts[lab->label_no]++;
+            }
+        }
+        else if (IS_LABEL(i)) {
+            lab = (LABEL *)i;
+            if (lab->unremovable) return 0;
+            if (lab->refcnt > unref_counts[lab->label_no]) {
+                if (i == first) return 0;
+                break;
+            }
+            continue;
+        }
+        else if (IS_TRACE(i)) {
+            /* do nothing */
+        }
+        else if (IS_ADJUST(i)) {
+            return 0;
+        }
+        end = i;
     } while ((i = i->next) != 0);
     i = first;
     do {
-	if (IS_INSN(i)) {
+        if (IS_INSN(i)) {
             struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
-	    VALUE insn = INSN_OF(i);
-	    int pos, len = insn_len(insn);
-	    for (pos = 0; pos < len; ++pos) {
-		switch (insn_op_types(insn)[pos]) {
-		  case TS_OFFSET:
-		    unref_destination((INSN *)i, pos);
-		    break;
+            VALUE insn = INSN_OF(i);
+            int pos, len = insn_len(insn);
+            for (pos = 0; pos < len; ++pos) {
+                switch (insn_op_types(insn)[pos]) {
+                  case TS_OFFSET:
+                    unref_destination((INSN *)i, pos);
+                    break;
                   case TS_CALLDATA:
                     --(body->ci_size);
-		    break;
-		}
-	    }
-	}
-	ELEM_REMOVE(i);
+                    break;
+                }
+            }
+        }
+        ELEM_REMOVE(i);
     } while ((i != end) && (i = i->next) != 0);
     return 1;
 }
@@ -2766,14 +2887,14 @@ iseq_pop_newarray(rb_iseq_t *iseq, INSN *iobj)
 {
     switch (OPERAND_AT(iobj, 0)) {
       case INT2FIX(0): /* empty array */
-	ELEM_REMOVE(&iobj->link);
-	return TRUE;
+        ELEM_REMOVE(&iobj->link);
+        return TRUE;
       case INT2FIX(1): /* single element array */
-	ELEM_REMOVE(&iobj->link);
-	return FALSE;
+        ELEM_REMOVE(&iobj->link);
+        return FALSE;
       default:
-	iobj->insn_id = BIN(adjuststack);
-	return TRUE;
+        iobj->insn_id = BIN(adjuststack);
+        return TRUE;
     }
 }
 
@@ -2822,41 +2943,41 @@ optimize_checktype(rb_iseq_t *iseq, INSN *iobj)
 
     switch (INSN_OF(iobj)) {
       case BIN(putstring):
-	type = INT2FIX(T_STRING);
-	break;
+        type = INT2FIX(T_STRING);
+        break;
       case BIN(putnil):
-	type = INT2FIX(T_NIL);
-	break;
+        type = INT2FIX(T_NIL);
+        break;
       case BIN(putobject):
-	type = INT2FIX(TYPE(OPERAND_AT(iobj, 0)));
-	break;
+        type = INT2FIX(TYPE(OPERAND_AT(iobj, 0)));
+        break;
       default: return FALSE;
     }
 
     ciobj = (INSN *)get_next_insn(iobj);
     if (IS_INSN_ID(ciobj, jump)) {
-	ciobj = (INSN *)get_next_insn((INSN*)OPERAND_AT(ciobj, 0));
+        ciobj = (INSN *)get_next_insn((INSN*)OPERAND_AT(ciobj, 0));
     }
     if (IS_INSN_ID(ciobj, dup)) {
-	ciobj = (INSN *)get_next_insn(dup = ciobj);
+        ciobj = (INSN *)get_next_insn(dup = ciobj);
     }
     if (!ciobj || !IS_INSN_ID(ciobj, checktype)) return FALSE;
     niobj = (INSN *)get_next_insn(ciobj);
     if (!niobj) {
-	/* TODO: putobject true/false */
-	return FALSE;
+        /* TODO: putobject true/false */
+        return FALSE;
     }
     switch (INSN_OF(niobj)) {
       case BIN(branchif):
-	if (OPERAND_AT(ciobj, 0) == type) {
-	    dest = (LABEL *)OPERAND_AT(niobj, 0);
-	}
-	break;
+        if (OPERAND_AT(ciobj, 0) == type) {
+            dest = (LABEL *)OPERAND_AT(niobj, 0);
+        }
+        break;
       case BIN(branchunless):
-	if (OPERAND_AT(ciobj, 0) != type) {
-	    dest = (LABEL *)OPERAND_AT(niobj, 0);
-	}
-	break;
+        if (OPERAND_AT(ciobj, 0) != type) {
+            dest = (LABEL *)OPERAND_AT(niobj, 0);
+        }
+        break;
       default:
         return FALSE;
     }
@@ -2864,13 +2985,13 @@ optimize_checktype(rb_iseq_t *iseq, INSN *iobj)
     node_id = ciobj->insn_info.node_id;
     NODE dummy_line_node = generate_dummy_line_node(line, node_id);
     if (!dest) {
-	if (niobj->link.next && IS_LABEL(niobj->link.next)) {
-	    dest = (LABEL *)niobj->link.next; /* reuse label */
-	}
-	else {
-	    dest = NEW_LABEL(line);
-	    ELEM_INSERT_NEXT(&niobj->link, &dest->link);
-	}
+        if (niobj->link.next && IS_LABEL(niobj->link.next)) {
+            dest = (LABEL *)niobj->link.next; /* reuse label */
+        }
+        else {
+            dest = NEW_LABEL(line);
+            ELEM_INSERT_NEXT(&niobj->link, &dest->link);
+        }
     }
     INSERT_AFTER_INSN1(iobj, &dummy_line_node, jump, dest);
     LABEL_REF(dest);
@@ -2910,112 +3031,112 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 
     if (IS_INSN_ID(iobj, jump)) {
         INSN *niobj, *diobj, *piobj;
-	diobj = (INSN *)get_destination_insn(iobj);
-	niobj = (INSN *)get_next_insn(iobj);
-
-	if (diobj == niobj) {
-	    /*
-	     *   jump LABEL
-	     *  LABEL:
-	     * =>
-	     *   LABEL:
-	     */
-	    unref_destination(iobj, 0);
-	    ELEM_REMOVE(&iobj->link);
-	    return COMPILE_OK;
-	}
+        diobj = (INSN *)get_destination_insn(iobj);
+        niobj = (INSN *)get_next_insn(iobj);
+
+        if (diobj == niobj) {
+            /*
+             *   jump LABEL
+             *  LABEL:
+             * =>
+             *   LABEL:
+             */
+            unref_destination(iobj, 0);
+            ELEM_REMOVE(&iobj->link);
+            return COMPILE_OK;
+        }
         else if (iobj != diobj && IS_INSN(&diobj->link) &&
                  IS_INSN_ID(diobj, jump) &&
-		 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0) &&
+                 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0) &&
                  diobj->insn_info.events == 0) {
-	    /*
-	     *  useless jump elimination:
-	     *     jump LABEL1
-	     *     ...
-	     *   LABEL1:
-	     *     jump LABEL2
-	     *
-	     *   => in this case, first jump instruction should jump to
-	     *      LABEL2 directly
-	     */
-	    replace_destination(iobj, diobj);
-	    remove_unreachable_chunk(iseq, iobj->link.next);
-	    goto again;
-	}
+            /*
+             *  useless jump elimination:
+             *     jump LABEL1
+             *     ...
+             *   LABEL1:
+             *     jump LABEL2
+             *
+             *   => in this case, first jump instruction should jump to
+             *      LABEL2 directly
+             */
+            replace_destination(iobj, diobj);
+            remove_unreachable_chunk(iseq, iobj->link.next);
+            goto again;
+        }
         else if (IS_INSN_ID(diobj, leave)) {
-	    /*
-	     *  jump LABEL
-	     *  ...
-	     * LABEL:
-	     *  leave
-	     * =>
-	     *  leave
-	     *  ...
-	     * LABEL:
-	     *  leave
-	     */
-	    /* replace */
-	    unref_destination(iobj, 0);
+            /*
+             *  jump LABEL
+             *  ...
+             * LABEL:
+             *  leave
+             * =>
+             *  leave
+             *  ...
+             * LABEL:
+             *  leave
+             */
+            /* replace */
+            unref_destination(iobj, 0);
             iobj->insn_id = BIN(leave);
-	    iobj->operand_size = 0;
-	    iobj->insn_info = diobj->insn_info;
-	    goto again;
-	}
+            iobj->operand_size = 0;
+            iobj->insn_info = diobj->insn_info;
+            goto again;
+        }
         else if (IS_INSN(iobj->link.prev) &&
                  (piobj = (INSN *)iobj->link.prev) &&
-		 (IS_INSN_ID(piobj, branchif) ||
-		  IS_INSN_ID(piobj, branchunless))) {
-	    INSN *pdiobj = (INSN *)get_destination_insn(piobj);
-	    if (niobj == pdiobj) {
-		int refcnt = IS_LABEL(piobj->link.next) ?
-		    ((LABEL *)piobj->link.next)->refcnt : 0;
-		/*
-		 * useless jump elimination (if/unless destination):
-		 *   if   L1
-		 *   jump L2
-		 * L1:
-		 *   ...
-		 * L2:
-		 *
-		 * ==>
-		 *   unless L2
-		 * L1:
-		 *   ...
-		 * L2:
-		 */
-		piobj->insn_id = (IS_INSN_ID(piobj, branchif))
-		  ? BIN(branchunless) : BIN(branchif);
-		replace_destination(piobj, iobj);
-		if (refcnt <= 1) {
-		    ELEM_REMOVE(&iobj->link);
-		}
-		else {
-		    /* TODO: replace other branch destinations too */
-		}
-		return COMPILE_OK;
-	    }
-	    else if (diobj == pdiobj) {
-		/*
-		 * useless jump elimination (if/unless before jump):
-		 * L1:
-		 *   ...
-		 *   if   L1
-		 *   jump L1
-		 *
-		 * ==>
-		 * L1:
-		 *   ...
-		 *   pop
-		 *   jump L1
-		 */
+                 (IS_INSN_ID(piobj, branchif) ||
+                  IS_INSN_ID(piobj, branchunless))) {
+            INSN *pdiobj = (INSN *)get_destination_insn(piobj);
+            if (niobj == pdiobj) {
+                int refcnt = IS_LABEL(piobj->link.next) ?
+                    ((LABEL *)piobj->link.next)->refcnt : 0;
+                /*
+                 * useless jump elimination (if/unless destination):
+                 *   if   L1
+                 *   jump L2
+                 * L1:
+                 *   ...
+                 * L2:
+                 *
+                 * ==>
+                 *   unless L2
+                 * L1:
+                 *   ...
+                 * L2:
+                 */
+                piobj->insn_id = (IS_INSN_ID(piobj, branchif))
+                  ? BIN(branchunless) : BIN(branchif);
+                replace_destination(piobj, iobj);
+                if (refcnt <= 1) {
+                    ELEM_REMOVE(&iobj->link);
+                }
+                else {
+                    /* TODO: replace other branch destinations too */
+                }
+                return COMPILE_OK;
+            }
+            else if (diobj == pdiobj) {
+                /*
+                 * useless jump elimination (if/unless before jump):
+                 * L1:
+                 *   ...
+                 *   if   L1
+                 *   jump L1
+                 *
+                 * ==>
+                 * L1:
+                 *   ...
+                 *   pop
+                 *   jump L1
+                 */
                 NODE dummy_line_node = generate_dummy_line_node(iobj->insn_info.line_no, iobj->insn_info.node_id);
-		INSN *popiobj = new_insn_core(iseq, &dummy_line_node, BIN(pop), 0, 0);
-		ELEM_REPLACE(&piobj->link, &popiobj->link);
-	    }
-	}
-	if (remove_unreachable_chunk(iseq, iobj->link.next)) {
-	    goto again;
-	}
+                INSN *popiobj = new_insn_core(iseq, &dummy_line_node, BIN(pop), 0, 0);
+                ELEM_REPLACE(&piobj->link, &popiobj->link);
+            }
+        }
+        if (remove_unreachable_chunk(iseq, iobj->link.next)) {
+            goto again;
+        }
     }
 
     /*
@@ -3036,19 +3157,19 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
                 is_frozen_putstring(end, &str_end) &&
                 (beg = (INSN *)get_prev_insn(end)) != 0 &&
                 is_frozen_putstring(beg, &str_beg)) {
-	    int excl = FIX2INT(OPERAND_AT(range, 0));
-	    VALUE lit_range = rb_range_new(str_beg, str_end, excl);
-
-	    ELEM_REMOVE(&beg->link);
-	    ELEM_REMOVE(&end->link);
-	    range->insn_id = BIN(putobject);
-	    OPERAND_AT(range, 0) = lit_range;
-	    RB_OBJ_WRITTEN(iseq, Qundef, lit_range);
-	}
+            int excl = FIX2INT(OPERAND_AT(range, 0));
+            VALUE lit_range = rb_range_new(str_beg, str_end, excl);
+
+            ELEM_REMOVE(&beg->link);
+            ELEM_REMOVE(&end->link);
+            range->insn_id = BIN(putobject);
+            OPERAND_AT(range, 0) = lit_range;
+            RB_OBJ_WRITTEN(iseq, Qundef, lit_range);
+        }
     }
 
     if (IS_INSN_ID(iobj, leave)) {
-	remove_unreachable_chunk(iseq, iobj->link.next);
+        remove_unreachable_chunk(iseq, iobj->link.next);
     }
 
     /*
@@ -3068,17 +3189,17 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
     }
 
     if (IS_INSN_ID(iobj, branchif) ||
-	IS_INSN_ID(iobj, branchnil) ||
-	IS_INSN_ID(iobj, branchunless)) {
-	/*
-	 *   if L1
-	 *   ...
-	 * L1:
-	 *   jump L2
-	 * =>
-	 *   if L2
-	 */
-	INSN *nobj = (INSN *)get_destination_insn(iobj);
+        IS_INSN_ID(iobj, branchnil) ||
+        IS_INSN_ID(iobj, branchunless)) {
+        /*
+         *   if L1
+         *   ...
+         * L1:
+         *   jump L2
+         * =>
+         *   if L2
+         */
+        INSN *nobj = (INSN *)get_destination_insn(iobj);
 
         /* This is super nasty hack!!!
          *
@@ -3101,10 +3222,10 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
          * This should be fixed in future.
          */
         int stop_optimization =
-	    ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq) &&
+            ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq) &&
             nobj->link.type == ISEQ_ELEMENT_INSN &&
             nobj->insn_info.events;
-	if (!stop_optimization) {
+        if (!stop_optimization) {
             INSN *pobj = (INSN *)iobj->link.prev;
             int prev_dup = 0;
             if (pobj) {
@@ -3214,231 +3335,344 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
     }
 
     if (IS_INSN_ID(iobj, pop)) {
-	/*
-	 *  putself / putnil / putobject obj / putstring "..."
-	 *  pop
-	 * =>
-	 *  # do nothing
-	 */
-	LINK_ELEMENT *prev = iobj->link.prev;
-	if (IS_INSN(prev)) {
-	    enum ruby_vminsn_type previ = ((INSN *)prev)->insn_id;
-	    if (previ == BIN(putobject) || previ == BIN(putnil) ||
-		previ == BIN(putself) || previ == BIN(putstring) ||
-		previ == BIN(dup) ||
-		previ == BIN(getlocal) ||
-		previ == BIN(getblockparam) ||
-		previ == BIN(getblockparamproxy) ||
-		/* getinstancevariable may issue a warning */
-		previ == BIN(duparray)) {
-		/* just push operand or static value and pop soon, no
-		 * side effects */
-		ELEM_REMOVE(prev);
-		ELEM_REMOVE(&iobj->link);
-	    }
-	    else if (previ == BIN(newarray) && iseq_pop_newarray(iseq, (INSN*)prev)) {
-		ELEM_REMOVE(&iobj->link);
-	    }
-	    else if (previ == BIN(concatarray)) {
-		INSN *piobj = (INSN *)prev;
+        /*
+         *  putself / putnil / putobject obj / putstring "..."
+         *  pop
+         * =>
+         *  # do nothing
+         */
+        LINK_ELEMENT *prev = iobj->link.prev;
+        if (IS_INSN(prev)) {
+            enum ruby_vminsn_type previ = ((INSN *)prev)->insn_id;
+            if (previ == BIN(putobject) || previ == BIN(putnil) ||
+                previ == BIN(putself) || previ == BIN(putstring) ||
+                previ == BIN(dup) ||
+                previ == BIN(getlocal) ||
+                previ == BIN(getblockparam) ||
+                previ == BIN(getblockparamproxy) ||
+                /* getinstancevariable may issue a warning */
+                previ == BIN(duparray)) {
+                /* just push operand or static value and pop soon, no
+                 * side effects */
+                ELEM_REMOVE(prev);
+                ELEM_REMOVE(&iobj->link);
+            }
+            else if (previ == BIN(newarray) && iseq_pop_newarray(iseq, (INSN*)prev)) {
+                ELEM_REMOVE(&iobj->link);
+            }
+            else if (previ == BIN(concatarray)) {
+                INSN *piobj = (INSN *)prev;
                 NODE dummy_line_node = generate_dummy_line_node(piobj->insn_info.line_no, piobj->insn_info.node_id);
-		INSERT_BEFORE_INSN1(piobj, &dummy_line_node, splatarray, Qfalse);
-		INSN_OF(piobj) = BIN(pop);
-	    }
-	    else if (previ == BIN(concatstrings)) {
-		if (OPERAND_AT(prev, 0) == INT2FIX(1)) {
-		    ELEM_REMOVE(prev);
-		}
-		else {
-		    ELEM_REMOVE(&iobj->link);
-		    INSN_OF(prev) = BIN(adjuststack);
-		}
-	    }
-	}
+                INSERT_BEFORE_INSN1(piobj, &dummy_line_node, splatarray, Qfalse);
+                INSN_OF(piobj) = BIN(pop);
+            }
+            else if (previ == BIN(concatstrings)) {
+                if (OPERAND_AT(prev, 0) == INT2FIX(1)) {
+                    ELEM_REMOVE(prev);
+                }
+                else {
+                    ELEM_REMOVE(&iobj->link);
+                    INSN_OF(prev) = BIN(adjuststack);
+                }
+            }
+        }
     }
 
     if (IS_INSN_ID(iobj, newarray) ||
-	IS_INSN_ID(iobj, duparray) ||
-	IS_INSN_ID(iobj, expandarray) ||
-	IS_INSN_ID(iobj, concatarray) ||
-	IS_INSN_ID(iobj, splatarray) ||
-	0) {
-	/*
-	 *  newarray N
-	 *  splatarray
-	 * =>
-	 *  newarray N
-	 * newarray always puts an array
-	 */
-	LINK_ELEMENT *next = iobj->link.next;
-	if (IS_INSN(next) && IS_INSN_ID(next, splatarray)) {
-	    /* remove splatarray following always-array insn */
-	    ELEM_REMOVE(next);
-	}
+        IS_INSN_ID(iobj, duparray) ||
+        IS_INSN_ID(iobj, expandarray) ||
+        IS_INSN_ID(iobj, concatarray) ||
+        IS_INSN_ID(iobj, splatarray) ||
+        0) {
+        /*
+         *  newarray N
+         *  splatarray
+         * =>
+         *  newarray N
+         * newarray always puts an array
+         */
+        LINK_ELEMENT *next = iobj->link.next;
+        if (IS_INSN(next) && IS_INSN_ID(next, splatarray)) {
+            /* remove splatarray following always-array insn */
+            ELEM_REMOVE(next);
+        }
+    }
+
+    if (IS_INSN_ID(iobj, newarray)) {
+        LINK_ELEMENT *next = iobj->link.next;
+        if (IS_INSN(next) && IS_INSN_ID(next, expandarray) &&
+            OPERAND_AT(next, 1) == INT2FIX(0)) {
+            VALUE op1, op2;
+            op1 = OPERAND_AT(iobj, 0);
+            op2 = OPERAND_AT(next, 0);
+            ELEM_REMOVE(next);
+
+            if (op1 == op2) {
+                /*
+                 *  newarray 2
+                 *  expandarray 2, 0
+                 * =>
+                 *  swap
+                 */
+                if (op1 == INT2FIX(2)) {
+                    INSN_OF(iobj) = BIN(swap);
+                    iobj->operand_size = 0;
+                }
+                /*
+                 *  newarray X
+                 *  expandarray X, 0
+                 * =>
+                 *  opt_reverse X
+                 */
+                else {
+                    INSN_OF(iobj) = BIN(opt_reverse);
+                }
+            }
+            else {
+                NODE dummy_line_node = generate_dummy_line_node(iobj->insn_info.line_no, iobj->insn_info.node_id);
+                long diff = FIX2LONG(op1) - FIX2LONG(op2);
+                INSN_OF(iobj) = BIN(opt_reverse);
+                OPERAND_AT(iobj, 0) = OPERAND_AT(next, 0);
+
+                if (op1 > op2) {
+                    /* X > Y
+                     *  newarray X
+                     *  expandarray Y, 0
+                     * =>
+                     *  pop * (Y-X)
+                     *  opt_reverse Y
+                     */
+                    for (; diff > 0; diff--) {
+                        INSERT_BEFORE_INSN(iobj, &dummy_line_node, pop);
+                    }
+                }
+                else { /* (op1 < op2) */
+                    /* X < Y
+                     *  newarray X
+                     *  expandarray Y, 0
+                     * =>
+                     *  putnil * (Y-X)
+                     *  opt_reverse Y
+                     */
+                    for (; diff < 0; diff++) {
+                        INSERT_BEFORE_INSN(iobj, &dummy_line_node, putnil);
+                    }
+                }
+            }
+        }
+    }
+
+    if (IS_INSN_ID(iobj, duparray)) {
+        LINK_ELEMENT *next = iobj->link.next;
+        /*
+         *  duparray obj
+         *  expandarray X, 0
+         * =>
+         *  putobject obj
+         *  expandarray X, 0
+         */
+        if (IS_INSN(next) && IS_INSN_ID(next, expandarray)) {
+            INSN_OF(iobj) = BIN(putobject);
+        }
     }
 
     if (IS_INSN_ID(iobj, anytostring)) {
-	LINK_ELEMENT *next = iobj->link.next;
-	/*
+        LINK_ELEMENT *next = iobj->link.next;
+        /*
          *  anytostring
-	 *  concatstrings 1
-	 * =>
+         *  concatstrings 1
+         * =>
          *  anytostring
-	 */
-	if (IS_INSN(next) && IS_INSN_ID(next, concatstrings) &&
-	    OPERAND_AT(next, 0) == INT2FIX(1)) {
-	    ELEM_REMOVE(next);
-	}
+         */
+        if (IS_INSN(next) && IS_INSN_ID(next, concatstrings) &&
+            OPERAND_AT(next, 0) == INT2FIX(1)) {
+            ELEM_REMOVE(next);
+        }
     }
 
     if (IS_INSN_ID(iobj, putstring) ||
-	(IS_INSN_ID(iobj, putobject) && RB_TYPE_P(OPERAND_AT(iobj, 0), T_STRING))) {
-	/*
-	 *  putstring ""
-	 *  concatstrings N
-	 * =>
-	 *  concatstrings N-1
-	 */
-	if (IS_NEXT_INSN_ID(&iobj->link, concatstrings) &&
-	    RSTRING_LEN(OPERAND_AT(iobj, 0)) == 0) {
-	    INSN *next = (INSN *)iobj->link.next;
-	    if ((OPERAND_AT(next, 0) = FIXNUM_INC(OPERAND_AT(next, 0), -1)) == INT2FIX(1)) {
-		ELEM_REMOVE(&next->link);
-	    }
-	    ELEM_REMOVE(&iobj->link);
-	}
+        (IS_INSN_ID(iobj, putobject) && RB_TYPE_P(OPERAND_AT(iobj, 0), T_STRING))) {
+        /*
+         *  putstring ""
+         *  concatstrings N
+         * =>
+         *  concatstrings N-1
+         */
+        if (IS_NEXT_INSN_ID(&iobj->link, concatstrings) &&
+            RSTRING_LEN(OPERAND_AT(iobj, 0)) == 0) {
+            INSN *next = (INSN *)iobj->link.next;
+            if ((OPERAND_AT(next, 0) = FIXNUM_INC(OPERAND_AT(next, 0), -1)) == INT2FIX(1)) {
+                ELEM_REMOVE(&next->link);
+            }
+            ELEM_REMOVE(&iobj->link);
+        }
     }
 
     if (IS_INSN_ID(iobj, concatstrings)) {
-	/*
-	 *  concatstrings N
-	 *  concatstrings M
-	 * =>
-	 *  concatstrings N+M-1
-	 */
-	LINK_ELEMENT *next = iobj->link.next;
-	INSN *jump = 0;
-	if (IS_INSN(next) && IS_INSN_ID(next, jump))
-	    next = get_destination_insn(jump = (INSN *)next);
-	if (IS_INSN(next) && IS_INSN_ID(next, concatstrings)) {
-	    int n = FIX2INT(OPERAND_AT(iobj, 0)) + FIX2INT(OPERAND_AT(next, 0)) - 1;
-	    OPERAND_AT(iobj, 0) = INT2FIX(n);
-	    if (jump) {
-		LABEL *label = ((LABEL *)OPERAND_AT(jump, 0));
-		if (!--label->refcnt) {
-		    ELEM_REMOVE(&label->link);
-		}
-		else {
-		    label = NEW_LABEL(0);
-		    OPERAND_AT(jump, 0) = (VALUE)label;
-		}
-		label->refcnt++;
-		ELEM_INSERT_NEXT(next, &label->link);
-		CHECK(iseq_peephole_optimize(iseq, get_next_insn(jump), do_tailcallopt));
-	    }
-	    else {
-		ELEM_REMOVE(next);
-	    }
-	}
+        /*
+         *  concatstrings N
+         *  concatstrings M
+         * =>
+         *  concatstrings N+M-1
+         */
+        LINK_ELEMENT *next = iobj->link.next;
+        INSN *jump = 0;
+        if (IS_INSN(next) && IS_INSN_ID(next, jump))
+            next = get_destination_insn(jump = (INSN *)next);
+        if (IS_INSN(next) && IS_INSN_ID(next, concatstrings)) {
+            int n = FIX2INT(OPERAND_AT(iobj, 0)) + FIX2INT(OPERAND_AT(next, 0)) - 1;
+            OPERAND_AT(iobj, 0) = INT2FIX(n);
+            if (jump) {
+                LABEL *label = ((LABEL *)OPERAND_AT(jump, 0));
+                if (!--label->refcnt) {
+                    ELEM_REMOVE(&label->link);
+                }
+                else {
+                    label = NEW_LABEL(0);
+                    OPERAND_AT(jump, 0) = (VALUE)label;
+                }
+                label->refcnt++;
+                ELEM_INSERT_NEXT(next, &label->link);
+                CHECK(iseq_peephole_optimize(iseq, get_next_insn(jump), do_tailcallopt));
+            }
+            else {
+                ELEM_REMOVE(next);
+            }
+        }
     }
 
     if (do_tailcallopt &&
-	(IS_INSN_ID(iobj, send) ||
-	 IS_INSN_ID(iobj, opt_aref_with) ||
-	 IS_INSN_ID(iobj, opt_aset_with) ||
-	 IS_INSN_ID(iobj, invokesuper))) {
-	/*
-	 *  send ...
-	 *  leave
-	 * =>
-	 *  send ..., ... | VM_CALL_TAILCALL, ...
-	 *  leave # unreachable
-	 */
-	INSN *piobj = NULL;
-	if (iobj->link.next) {
-	    LINK_ELEMENT *next = iobj->link.next;
-	    do {
-		if (!IS_INSN(next)) {
-		    next = next->next;
-		    continue;
-		}
-		switch (INSN_OF(next)) {
-		  case BIN(nop):
-		    next = next->next;
-		    break;
-		  case BIN(jump):
-		    /* if cond
-		     *   return tailcall
-		     * end
-		     */
-		    next = get_destination_insn((INSN *)next);
-		    break;
-		  case BIN(leave):
-		    piobj = iobj;
+        (IS_INSN_ID(iobj, send) ||
+         IS_INSN_ID(iobj, opt_aref_with) ||
+         IS_INSN_ID(iobj, opt_aset_with) ||
+         IS_INSN_ID(iobj, invokesuper))) {
+        /*
+         *  send ...
+         *  leave
+         * =>
+         *  send ..., ... | VM_CALL_TAILCALL, ...
+         *  leave # unreachable
+         */
+        INSN *piobj = NULL;
+        if (iobj->link.next) {
+            LINK_ELEMENT *next = iobj->link.next;
+            do {
+                if (!IS_INSN(next)) {
+                    next = next->next;
+                    continue;
+                }
+                switch (INSN_OF(next)) {
+                  case BIN(nop):
+                    next = next->next;
+                    break;
+                  case BIN(jump):
+                    /* if cond
+                     *   return tailcall
+                     * end
+                     */
+                    next = get_destination_insn((INSN *)next);
+                    break;
+                  case BIN(leave):
+                    piobj = iobj;
                     /* fall through */
-		  default:
-		    next = NULL;
-		    break;
-		}
-	    } while (next);
-	}
-
-	if (piobj) {
+                  default:
+                    next = NULL;
+                    break;
+                }
+            } while (next);
+        }
+
+        if (piobj) {
             const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(piobj, 0);
-	    if (IS_INSN_ID(piobj, send) ||
+            if (IS_INSN_ID(piobj, send) ||
                 IS_INSN_ID(piobj, invokesuper)) {
                 if (OPERAND_AT(piobj, 1) == 0) { /* no blockiseq */
                     ci = ci_flag_set(iseq, ci, VM_CALL_TAILCALL);
                     OPERAND_AT(piobj, 0) = (VALUE)ci;
                     RB_OBJ_WRITTEN(iseq, Qundef, ci);
-		}
-	    }
-	    else {
+                }
+            }
+            else {
                 ci = ci_flag_set(iseq, ci, VM_CALL_TAILCALL);
                 OPERAND_AT(piobj, 0) = (VALUE)ci;
                 RB_OBJ_WRITTEN(iseq, Qundef, ci);
-	    }
-	}
+            }
+        }
     }
 
     if (IS_INSN_ID(iobj, dup)) {
-	if (IS_NEXT_INSN_ID(&iobj->link, setlocal)) {
-	    LINK_ELEMENT *set1 = iobj->link.next, *set2 = NULL;
-	    if (IS_NEXT_INSN_ID(set1, setlocal)) {
-		set2 = set1->next;
-		if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
-		    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
-		    ELEM_REMOVE(set1);
-		    ELEM_REMOVE(&iobj->link);
-		}
-	    }
-	    else if (IS_NEXT_INSN_ID(set1, dup) &&
-		     IS_NEXT_INSN_ID(set1->next, setlocal)) {
-		set2 = set1->next->next;
-		if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
-		    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
-		    ELEM_REMOVE(set1->next);
-		    ELEM_REMOVE(set2);
-		}
-	    }
-	}
+        if (IS_NEXT_INSN_ID(&iobj->link, setlocal)) {
+            LINK_ELEMENT *set1 = iobj->link.next, *set2 = NULL;
+
+            /*
+            *  dup
+            *  setlocal x, y
+            *  setlocal x, y
+            * =>
+            *  dup
+            *  setlocal x, y
+            */
+            if (IS_NEXT_INSN_ID(set1, setlocal)) {
+                set2 = set1->next;
+                if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
+                    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
+                    ELEM_REMOVE(set1);
+                    ELEM_REMOVE(&iobj->link);
+                }
+            }
+
+            /*
+            *  dup
+            *  setlocal x, y
+            *  dup
+            *  setlocal x, y
+            * =>
+            *  dup
+            *  setlocal x, y
+            */
+            else if (IS_NEXT_INSN_ID(set1, dup) &&
+                     IS_NEXT_INSN_ID(set1->next, setlocal)) {
+                set2 = set1->next->next;
+                if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
+                    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
+                    ELEM_REMOVE(set1->next);
+                    ELEM_REMOVE(set2);
+                }
+            }
+        }
     }
 
+    /*
+    *  getlocal x, y
+    *  dup
+    *  setlocal x, y
+    * =>
+    *  dup
+    */
     if (IS_INSN_ID(iobj, getlocal)) {
-	LINK_ELEMENT *niobj = &iobj->link;
-	if (IS_NEXT_INSN_ID(niobj, dup)) {
-	    niobj = niobj->next;
-	}
-	if (IS_NEXT_INSN_ID(niobj, setlocal)) {
-	    LINK_ELEMENT *set1 = niobj->next;
-	    if (OPERAND_AT(iobj, 0) == OPERAND_AT(set1, 0) &&
-		OPERAND_AT(iobj, 1) == OPERAND_AT(set1, 1)) {
-		ELEM_REMOVE(set1);
-		ELEM_REMOVE(niobj);
-	    }
-	}
+        LINK_ELEMENT *niobj = &iobj->link;
+        if (IS_NEXT_INSN_ID(niobj, dup)) {
+            niobj = niobj->next;
+        }
+        if (IS_NEXT_INSN_ID(niobj, setlocal)) {
+            LINK_ELEMENT *set1 = niobj->next;
+            if (OPERAND_AT(iobj, 0) == OPERAND_AT(set1, 0) &&
+                OPERAND_AT(iobj, 1) == OPERAND_AT(set1, 1)) {
+                ELEM_REMOVE(set1);
+                ELEM_REMOVE(niobj);
+            }
+        }
     }
 
+    /*
+    *  opt_invokebuiltin_delegate
+    *  trace
+    *  leave
+    * =>
+    *  opt_invokebuiltin_delegate_leave
+    *  trace
+    *  leave
+    */
     if (IS_INSN_ID(iobj, opt_invokebuiltin_delegate)) {
         if (IS_TRACE(iobj->link.next)) {
             if (IS_NEXT_INSN_ID(iobj->link.next, leave)) {
@@ -3447,6 +3681,19 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
         }
     }
 
+    /*
+    *  getblockparam
+    *  branchif / branchunless
+    * =>
+    *  getblockparamproxy
+    *  branchif / branchunless
+    */
+    if (IS_INSN_ID(iobj, getblockparam)) {
+        if (IS_NEXT_INSN_ID(&iobj->link, branchif) || IS_NEXT_INSN_ID(&iobj->link, branchunless)) {
+            iobj->insn_id = BIN(getblockparamproxy);
+        }
+    }
+
     return COMPILE_OK;
 }
 
@@ -3472,26 +3719,26 @@ static int
 iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 {
     if (IS_INSN_ID(iobj, newarray) && iobj->link.next &&
-	IS_INSN(iobj->link.next)) {
-	/*
-	 *   [a, b, ...].max/min -> a, b, c, opt_newarray_max/min
-	 */
-	INSN *niobj = (INSN *)iobj->link.next;
-	if (IS_INSN_ID(niobj, send)) {
+        IS_INSN(iobj->link.next)) {
+        /*
+         *   [a, b, ...].max/min -> a, b, c, opt_newarray_max/min
+         */
+        INSN *niobj = (INSN *)iobj->link.next;
+        if (IS_INSN_ID(niobj, send)) {
             const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(niobj, 0);
             if ((vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) && vm_ci_argc(ci) == 0) {
-		switch (vm_ci_mid(ci)) {
-		  case idMax:
-		    iobj->insn_id = BIN(opt_newarray_max);
-		    ELEM_REMOVE(&niobj->link);
-		    return COMPILE_OK;
-		  case idMin:
-		    iobj->insn_id = BIN(opt_newarray_min);
-		    ELEM_REMOVE(&niobj->link);
-		    return COMPILE_OK;
-		}
-	    }
-	}
+                switch (vm_ci_mid(ci)) {
+                  case idMax:
+                    iobj->insn_id = BIN(opt_newarray_max);
+                    ELEM_REMOVE(&niobj->link);
+                    return COMPILE_OK;
+                  case idMin:
+                    iobj->insn_id = BIN(opt_newarray_min);
+                    ELEM_REMOVE(&niobj->link);
+                    return COMPILE_OK;
+                }
+            }
+        }
     }
 
     if (IS_INSN_ID(iobj, send)) {
@@ -3499,50 +3746,50 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
         const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 1);
 
 #define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt))
-	if (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) {
-	    switch (vm_ci_argc(ci)) {
-	      case 0:
-		switch (vm_ci_mid(ci)) {
-		  case idLength: SP_INSN(length); return COMPILE_OK;
-		  case idSize:	 SP_INSN(size);	  return COMPILE_OK;
-		  case idEmptyP: SP_INSN(empty_p);return COMPILE_OK;
+        if (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) {
+            switch (vm_ci_argc(ci)) {
+              case 0:
+                switch (vm_ci_mid(ci)) {
+                  case idLength: SP_INSN(length); return COMPILE_OK;
+                  case idSize:	 SP_INSN(size);	  return COMPILE_OK;
+                  case idEmptyP: SP_INSN(empty_p);return COMPILE_OK;
                   case idNilP:   SP_INSN(nil_p);  return COMPILE_OK;
-		  case idSucc:	 SP_INSN(succ);	  return COMPILE_OK;
-		  case idNot:	 SP_INSN(not);	  return COMPILE_OK;
-		}
-		break;
-	      case 1:
-		switch (vm_ci_mid(ci)) {
-		  case idPLUS:	 SP_INSN(plus);	  return COMPILE_OK;
-		  case idMINUS:	 SP_INSN(minus);  return COMPILE_OK;
-		  case idMULT:	 SP_INSN(mult);	  return COMPILE_OK;
-		  case idDIV:	 SP_INSN(div);	  return COMPILE_OK;
-		  case idMOD:	 SP_INSN(mod);	  return COMPILE_OK;
-		  case idEq:	 SP_INSN(eq);	  return COMPILE_OK;
-		  case idNeq:	 SP_INSN(neq);	  return COMPILE_OK;
-		  case idEqTilde:SP_INSN(regexpmatch2);return COMPILE_OK;
-		  case idLT:	 SP_INSN(lt);	  return COMPILE_OK;
-		  case idLE:	 SP_INSN(le);	  return COMPILE_OK;
-		  case idGT:	 SP_INSN(gt);	  return COMPILE_OK;
-		  case idGE:	 SP_INSN(ge);	  return COMPILE_OK;
-		  case idLTLT:	 SP_INSN(ltlt);	  return COMPILE_OK;
-		  case idAREF:	 SP_INSN(aref);	  return COMPILE_OK;
+                  case idSucc:	 SP_INSN(succ);	  return COMPILE_OK;
+                  case idNot:	 SP_INSN(not);	  return COMPILE_OK;
+                }
+                break;
+              case 1:
+                switch (vm_ci_mid(ci)) {
+                  case idPLUS:	 SP_INSN(plus);	  return COMPILE_OK;
+                  case idMINUS:	 SP_INSN(minus);  return COMPILE_OK;
+                  case idMULT:	 SP_INSN(mult);	  return COMPILE_OK;
+                  case idDIV:	 SP_INSN(div);	  return COMPILE_OK;
+                  case idMOD:	 SP_INSN(mod);	  return COMPILE_OK;
+                  case idEq:	 SP_INSN(eq);	  return COMPILE_OK;
+                  case idNeq:	 SP_INSN(neq);	  return COMPILE_OK;
+                  case idEqTilde:SP_INSN(regexpmatch2);return COMPILE_OK;
+                  case idLT:	 SP_INSN(lt);	  return COMPILE_OK;
+                  case idLE:	 SP_INSN(le);	  return COMPILE_OK;
+                  case idGT:	 SP_INSN(gt);	  return COMPILE_OK;
+                  case idGE:	 SP_INSN(ge);	  return COMPILE_OK;
+                  case idLTLT:	 SP_INSN(ltlt);	  return COMPILE_OK;
+                  case idAREF:	 SP_INSN(aref);	  return COMPILE_OK;
                   case idAnd:    SP_INSN(and);    return COMPILE_OK;
                   case idOr:     SP_INSN(or);    return COMPILE_OK;
-		}
-		break;
-	      case 2:
-		switch (vm_ci_mid(ci)) {
-		  case idASET:	 SP_INSN(aset);	  return COMPILE_OK;
-		}
-		break;
-	    }
-	}
-
-	if ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) {
-	    iobj->insn_id = BIN(opt_send_without_block);
-	    iobj->operand_size = insn_len(iobj->insn_id) - 1;
-	}
+                }
+                break;
+              case 2:
+                switch (vm_ci_mid(ci)) {
+                  case idASET:	 SP_INSN(aset);	  return COMPILE_OK;
+                }
+                break;
+            }
+        }
+
+        if ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) {
+            iobj->insn_id = BIN(opt_send_without_block);
+            iobj->operand_size = insn_len(iobj->insn_id) - 1;
+        }
     }
 #undef SP_INSN
 
@@ -3556,13 +3803,13 @@ tailcallable_p(rb_iseq_t *iseq)
       case ISEQ_TYPE_TOP:
       case ISEQ_TYPE_EVAL:
       case ISEQ_TYPE_MAIN:
-	/* not tail callable because cfp will be over popped */
+        /* not tail callable because cfp will be over popped */
       case ISEQ_TYPE_RESCUE:
       case ISEQ_TYPE_ENSURE:
-	/* rescue block can't tail call because of errinfo */
-	return FALSE;
+        /* rescue block can't tail call because of errinfo */
+        return FALSE;
       default:
-	return TRUE;
+        return TRUE;
     }
 }
 
@@ -3572,7 +3819,7 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     LINK_ELEMENT *list;
     const int do_peepholeopt = ISEQ_COMPILE_DATA(iseq)->option->peephole_optimization;
     const int do_tailcallopt = tailcallable_p(iseq) &&
-	ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization;
+        ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization;
     const int do_si = ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction;
     const int do_ou = ISEQ_COMPILE_DATA(iseq)->option->operands_unification;
     int rescue_level = 0;
@@ -3587,16 +3834,16 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     }
 
     while (list) {
-	if (IS_INSN(list)) {
-	    if (do_peepholeopt) {
-		iseq_peephole_optimize(iseq, list, tailcallopt);
-	    }
-	    if (do_si) {
-		iseq_specialized_instruction(iseq, (INSN *)list);
-	    }
-	    if (do_ou) {
-		insn_operands_unification((INSN *)list);
-	    }
+        if (IS_INSN(list)) {
+            if (do_peepholeopt) {
+                iseq_peephole_optimize(iseq, list, tailcallopt);
+            }
+            if (do_si) {
+                iseq_specialized_instruction(iseq, (INSN *)list);
+            }
+            if (do_ou) {
+                insn_operands_unification((INSN *)list);
+            }
 
             if (do_block_optimization) {
                 INSN * item = (INSN *)list;
@@ -3604,19 +3851,19 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
                     do_block_optimization = 0;
                 }
             }
-	}
-	if (IS_LABEL(list)) {
-	    switch (((LABEL *)list)->rescued) {
-	      case LABEL_RESCUE_BEG:
-		rescue_level++;
-		tailcallopt = FALSE;
-		break;
-	      case LABEL_RESCUE_END:
-		if (!--rescue_level) tailcallopt = do_tailcallopt;
-		break;
-	    }
-	}
-	list = list->next;
+        }
+        if (IS_LABEL(list)) {
+            switch (((LABEL *)list)->rescued) {
+              case LABEL_RESCUE_BEG:
+                rescue_level++;
+                tailcallopt = FALSE;
+                break;
+              case LABEL_RESCUE_END:
+                if (!--rescue_level) tailcallopt = do_tailcallopt;
+                break;
+            }
+        }
+        list = list->next;
     }
 
     if (do_block_optimization) {
@@ -3631,7 +3878,7 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 #if OPT_INSTRUCTIONS_UNIFICATION
 static INSN *
 new_unified_insn(rb_iseq_t *iseq,
-		 int insn_id, int size, LINK_ELEMENT *seq_list)
+                 int insn_id, int size, LINK_ELEMENT *seq_list)
 {
     INSN *iobj = 0;
     LINK_ELEMENT *list = seq_list;
@@ -3641,22 +3888,22 @@ new_unified_insn(rb_iseq_t *iseq,
 
     /* count argc */
     for (i = 0; i < size; i++) {
-	iobj = (INSN *)list;
-	argc += iobj->operand_size;
-	list = list->next;
+        iobj = (INSN *)list;
+        argc += iobj->operand_size;
+        list = list->next;
     }
 
     if (argc > 0) {
-	ptr = operands = compile_data_alloc2(iseq, sizeof(VALUE), argc);
+        ptr = operands = compile_data_alloc2(iseq, sizeof(VALUE), argc);
     }
 
     /* copy operands */
     list = seq_list;
     for (i = 0; i < size; i++) {
-	iobj = (INSN *)list;
-	MEMCPY(ptr, iobj->operands, VALUE, iobj->operand_size);
-	ptr += iobj->operand_size;
-	list = list->next;
+        iobj = (INSN *)list;
+        MEMCPY(ptr, iobj->operands, VALUE, iobj->operand_size);
+        ptr += iobj->operand_size;
+        list = list->next;
     }
 
     NODE dummy_line_node = generate_dummy_line_node(iobj->insn_info.line_no, iobj->insn_info.node_id);
@@ -3680,41 +3927,41 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 
     list = FIRST_ELEMENT(anchor);
     while (list) {
-	if (IS_INSN(list)) {
-	    iobj = (INSN *)list;
-	    id = iobj->insn_id;
-	    if (unified_insns_data[id] != 0) {
-		const int *const *entry = unified_insns_data[id];
-		for (j = 1; j < (intptr_t)entry[0]; j++) {
-		    const int *unified = entry[j];
-		    LINK_ELEMENT *li = list->next;
-		    for (k = 2; k < unified[1]; k++) {
-			if (!IS_INSN(li) ||
-			    ((INSN *)li)->insn_id != unified[k]) {
-			    goto miss;
-			}
-			li = li->next;
-		    }
-		    /* matched */
-		    niobj =
-			new_unified_insn(iseq, unified[0], unified[1] - 1,
-					 list);
-
-		    /* insert to list */
-		    niobj->link.prev = (LINK_ELEMENT *)iobj->link.prev;
-		    niobj->link.next = li;
-		    if (li) {
-			li->prev = (LINK_ELEMENT *)niobj;
-		    }
-
-		    list->prev->next = (LINK_ELEMENT *)niobj;
-		    list = (LINK_ELEMENT *)niobj;
-		    break;
-		  miss:;
-		}
-	    }
-	}
-	list = list->next;
+        if (IS_INSN(list)) {
+            iobj = (INSN *)list;
+            id = iobj->insn_id;
+            if (unified_insns_data[id] != 0) {
+                const int *const *entry = unified_insns_data[id];
+                for (j = 1; j < (intptr_t)entry[0]; j++) {
+                    const int *unified = entry[j];
+                    LINK_ELEMENT *li = list->next;
+                    for (k = 2; k < unified[1]; k++) {
+                        if (!IS_INSN(li) ||
+                            ((INSN *)li)->insn_id != unified[k]) {
+                            goto miss;
+                        }
+                        li = li->next;
+                    }
+                    /* matched */
+                    niobj =
+                        new_unified_insn(iseq, unified[0], unified[1] - 1,
+                                         list);
+
+                    /* insert to list */
+                    niobj->link.prev = (LINK_ELEMENT *)iobj->link.prev;
+                    niobj->link.next = li;
+                    if (li) {
+                        li->prev = (LINK_ELEMENT *)niobj;
+                    }
+
+                    list->prev->next = (LINK_ELEMENT *)niobj;
+                    list = (LINK_ELEMENT *)niobj;
+                    break;
+                  miss:;
+                }
+            }
+        }
+        list = list->next;
     }
 #endif
     return COMPILE_OK;
@@ -3738,28 +3985,28 @@ insn_set_sc_state(rb_iseq_t *iseq, const LINK_ELEMENT *anchor, INSN *iobj, int s
     nstate = SC_NEXT(iobj->insn_id);
 
     if (insn_id == BIN(jump) ||
-	insn_id == BIN(branchif) || insn_id == BIN(branchunless)) {
-	LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
-
-	if (lobj->sc_state != 0) {
-	    if (lobj->sc_state != nstate) {
-		BADINSN_DUMP(anchor, iobj, lobj);
-		COMPILE_ERROR(iseq, iobj->insn_info.line_no,
-			      "insn_set_sc_state error: %d at "LABEL_FORMAT
-			      ", %d expected\n",
-			      lobj->sc_state, lobj->label_no, nstate);
-		return COMPILE_NG;
-	    }
-	}
-	else {
-	    lobj->sc_state = nstate;
-	}
-	if (insn_id == BIN(jump)) {
-	    nstate = SCS_XX;
-	}
+        insn_id == BIN(branchif) || insn_id == BIN(branchunless)) {
+        LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
+
+        if (lobj->sc_state != 0) {
+            if (lobj->sc_state != nstate) {
+                BADINSN_DUMP(anchor, iobj, lobj);
+                COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                              "insn_set_sc_state error: %d at "LABEL_FORMAT
+                              ", %d expected\n",
+                              lobj->sc_state, lobj->label_no, nstate);
+                return COMPILE_NG;
+            }
+        }
+        else {
+            lobj->sc_state = nstate;
+        }
+        if (insn_id == BIN(jump)) {
+            nstate = SCS_XX;
+        }
     }
     else if (insn_id == BIN(leave)) {
-	nstate = SCS_XX;
+        nstate = SCS_XX;
     }
 
     return nstate;
@@ -3769,12 +4016,12 @@ static int
 label_set_sc_state(LABEL *lobj, int state)
 {
     if (lobj->sc_state != 0) {
-	if (lobj->sc_state != state) {
-	    state = lobj->sc_state;
-	}
+        if (lobj->sc_state != state) {
+            state = lobj->sc_state;
+        }
     }
     else {
-	lobj->sc_state = state;
+        lobj->sc_state = state;
     }
 
     return state;
@@ -3798,84 +4045,84 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     /* for each list element */
     while (list) {
       redo_point:
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		INSN *iobj = (INSN *)list;
-		insn_id = iobj->insn_id;
-
-		/* dump_disasm_list(list); */
-
-		switch (insn_id) {
-		  case BIN(nop):
-		    {
-			/* exception merge point */
-			if (state != SCS_AX) {
+        switch (list->type) {
+          case ISEQ_ELEMENT_INSN:
+            {
+                INSN *iobj = (INSN *)list;
+                insn_id = iobj->insn_id;
+
+                /* dump_disasm_list(list); */
+
+                switch (insn_id) {
+                  case BIN(nop):
+                    {
+                        /* exception merge point */
+                        if (state != SCS_AX) {
                             NODE dummy_line_node = generate_dummy_line_node(0, -1);
-			    INSN *rpobj =
-				new_insn_body(iseq, &dummy_line_node, BIN(reput), 0);
-
-			    /* replace this insn */
-			    ELEM_REPLACE(list, (LINK_ELEMENT *)rpobj);
-			    list = (LINK_ELEMENT *)rpobj;
-			    goto redo_point;
-			}
-			break;
-		    }
-		  case BIN(swap):
-		    {
-			if (state == SCS_AB || state == SCS_BA) {
-			    state = (state == SCS_AB ? SCS_BA : SCS_AB);
-
-			    ELEM_REMOVE(list);
-			    list = list->next;
-			    goto redo_point;
-			}
-			break;
-		    }
-		  case BIN(pop):
-		    {
-			switch (state) {
-			  case SCS_AX:
-			  case SCS_BX:
-			    state = SCS_XX;
-			    break;
-			  case SCS_AB:
-			    state = SCS_AX;
-			    break;
-			  case SCS_BA:
-			    state = SCS_BX;
-			    break;
-			  case SCS_XX:
-			    goto normal_insn;
-			  default:
-			    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
-					  "unreachable");
-			    return COMPILE_NG;
-			}
-			/* remove useless pop */
-			ELEM_REMOVE(list);
-			list = list->next;
-			goto redo_point;
-		    }
-		  default:;
-		    /* none */
-		}		/* end of switch */
-	      normal_insn:
-		state = insn_set_sc_state(iseq, anchor, iobj, state);
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		LABEL *lobj;
-		lobj = (LABEL *)list;
-
-		state = label_set_sc_state(lobj, state);
-	    }
-	  default:
-	    break;
-	}
-	list = list->next;
+                            INSN *rpobj =
+                                new_insn_body(iseq, &dummy_line_node, BIN(reput), 0);
+
+                            /* replace this insn */
+                            ELEM_REPLACE(list, (LINK_ELEMENT *)rpobj);
+                            list = (LINK_ELEMENT *)rpobj;
+                            goto redo_point;
+                        }
+                        break;
+                    }
+                  case BIN(swap):
+                    {
+                        if (state == SCS_AB || state == SCS_BA) {
+                            state = (state == SCS_AB ? SCS_BA : SCS_AB);
+
+                            ELEM_REMOVE(list);
+                            list = list->next;
+                            goto redo_point;
+                        }
+                        break;
+                    }
+                  case BIN(pop):
+                    {
+                        switch (state) {
+                          case SCS_AX:
+                          case SCS_BX:
+                            state = SCS_XX;
+                            break;
+                          case SCS_AB:
+                            state = SCS_AX;
+                            break;
+                          case SCS_BA:
+                            state = SCS_BX;
+                            break;
+                          case SCS_XX:
+                            goto normal_insn;
+                          default:
+                            COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                                          "unreachable");
+                            return COMPILE_NG;
+                        }
+                        /* remove useless pop */
+                        ELEM_REMOVE(list);
+                        list = list->next;
+                        goto redo_point;
+                    }
+                  default:;
+                    /* none */
+                }		/* end of switch */
+              normal_insn:
+                state = insn_set_sc_state(iseq, anchor, iobj, state);
+                break;
+            }
+          case ISEQ_ELEMENT_LABEL:
+            {
+                LABEL *lobj;
+                lobj = (LABEL *)list;
+
+                state = label_set_sc_state(lobj, state);
+            }
+          default:
+            break;
+        }
+        list = list->next;
     }
 #endif
     return COMPILE_OK;
@@ -3887,20 +4134,20 @@ all_string_result_p(const NODE *node)
     if (!node) return FALSE;
     switch (nd_type(node)) {
       case NODE_STR: case NODE_DSTR:
-	return TRUE;
+        return TRUE;
       case NODE_IF: case NODE_UNLESS:
-	if (!node->nd_body || !node->nd_else) return FALSE;
-	if (all_string_result_p(node->nd_body))
-	    return all_string_result_p(node->nd_else);
-	return FALSE;
+        if (!node->nd_body || !node->nd_else) return FALSE;
+        if (all_string_result_p(node->nd_body))
+            return all_string_result_p(node->nd_else);
+        return FALSE;
       case NODE_AND: case NODE_OR:
-	if (!node->nd_2nd)
-	    return all_string_result_p(node->nd_1st);
-	if (!all_string_result_p(node->nd_1st))
-	    return FALSE;
-	return all_string_result_p(node->nd_2nd);
+        if (!node->nd_2nd)
+            return all_string_result_p(node->nd_1st);
+        if (!all_string_result_p(node->nd_1st))
+            return FALSE;
+        return all_string_result_p(node->nd_2nd);
       default:
-	return FALSE;
+        return FALSE;
     }
 }
 
@@ -3914,35 +4161,35 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cons
 
     debugp_param("nd_lit", lit);
     if (!NIL_P(lit)) {
-	cnt++;
-	if (!RB_TYPE_P(lit, T_STRING)) {
-	    COMPILE_ERROR(ERROR_ARGS "dstr: must be string: %s",
-			  rb_builtin_type_name(TYPE(lit)));
-	    return COMPILE_NG;
-	}
-	lit = rb_fstring(lit);
-	ADD_INSN1(ret, node, putobject, lit);
+        cnt++;
+        if (!RB_TYPE_P(lit, T_STRING)) {
+            COMPILE_ERROR(ERROR_ARGS "dstr: must be string: %s",
+                          rb_builtin_type_name(TYPE(lit)));
+            return COMPILE_NG;
+        }
+        lit = rb_fstring(lit);
+        ADD_INSN1(ret, node, putobject, lit);
         RB_OBJ_WRITTEN(iseq, Qundef, lit);
-	if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret);
+        if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret);
     }
 
     while (list) {
-	const NODE *const head = list->nd_head;
-	if (nd_type_p(head, NODE_STR)) {
-	    lit = rb_fstring(head->nd_lit);
-	    ADD_INSN1(ret, head, putobject, lit);
+        const NODE *const head = list->nd_head;
+        if (nd_type_p(head, NODE_STR)) {
+            lit = rb_fstring(head->nd_lit);
+            ADD_INSN1(ret, head, putobject, lit);
             RB_OBJ_WRITTEN(iseq, Qundef, lit);
-	    lit = Qnil;
-	}
-	else {
-	    CHECK(COMPILE(ret, "each string", head));
-	}
-	cnt++;
-	list = list->nd_next;
+            lit = Qnil;
+        }
+        else {
+            CHECK(COMPILE(ret, "each string", head));
+        }
+        cnt++;
+        list = list->nd_next;
     }
     if (NIL_P(lit) && first_lit) {
-	ELEM_REMOVE(first_lit);
-	--cnt;
+        ELEM_REMOVE(first_lit);
+        --cnt;
     }
     *cntp = cnt;
 
@@ -3990,12 +4237,12 @@ compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 
 static int
 compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int again,
-		  LABEL *then_label, LABEL *else_label)
+                  LABEL *then_label, LABEL *else_label)
 {
     const int line = nd_line(node);
     LABEL *lend = NEW_LABEL(line);
     rb_num_t cnt = ISEQ_FLIP_CNT_INCREMENT(ISEQ_BODY(iseq)->local_iseq)
-	+ VM_SVAR_FLIPFLOP_START;
+        + VM_SVAR_FLIPFLOP_START;
     VALUE key = INT2FIX(cnt);
 
     ADD_INSN2(ret, node, getspecial, key, INT2FIX(0));
@@ -4007,7 +4254,7 @@ compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const nod
     ADD_INSN1(ret, node, putobject, Qtrue);
     ADD_INSN1(ret, node, setspecial, key);
     if (!again) {
-	ADD_INSNL(ret, node, jump, then_label);
+        ADD_INSNL(ret, node, jump, then_label);
     }
 
     /* *flip == 1 */
@@ -4023,67 +4270,67 @@ compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const nod
 
 static int
 compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cond,
-			 LABEL *then_label, LABEL *else_label)
+                         LABEL *then_label, LABEL *else_label)
 {
   again:
     switch (nd_type(cond)) {
       case NODE_AND:
-	{
-	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, label,
-					   else_label));
+        {
+            LABEL *label = NEW_LABEL(nd_line(cond));
+            CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, label,
+                                           else_label));
             if (!label->refcnt) {
                 ADD_INSN(ret, cond, putnil);
                 break;
             }
-	    ADD_LABEL(ret, label);
-	    cond = cond->nd_2nd;
-	    goto again;
-	}
+            ADD_LABEL(ret, label);
+            cond = cond->nd_2nd;
+            goto again;
+        }
       case NODE_OR:
-	{
-	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
-					   label));
+        {
+            LABEL *label = NEW_LABEL(nd_line(cond));
+            CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
+                                           label));
             if (!label->refcnt) {
                 ADD_INSN(ret, cond, putnil);
                 break;
             }
-	    ADD_LABEL(ret, label);
-	    cond = cond->nd_2nd;
-	    goto again;
-	}
+            ADD_LABEL(ret, label);
+            cond = cond->nd_2nd;
+            goto again;
+        }
       case NODE_LIT:		/* NODE_LIT is always true */
       case NODE_TRUE:
       case NODE_STR:
       case NODE_ZLIST:
       case NODE_LAMBDA:
-	/* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
-	ADD_INSNL(ret, cond, jump, then_label);
+        /* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
+        ADD_INSNL(ret, cond, jump, then_label);
         return COMPILE_OK;
       case NODE_FALSE:
       case NODE_NIL:
-	/* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
-	ADD_INSNL(ret, cond, jump, else_label);
+        /* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
+        ADD_INSNL(ret, cond, jump, else_label);
         return COMPILE_OK;
       case NODE_LIST:
       case NODE_ARGSCAT:
       case NODE_DREGX:
       case NODE_DSTR:
-	CHECK(COMPILE_POPPED(ret, "branch condition", cond));
-	ADD_INSNL(ret, cond, jump, then_label);
+        CHECK(COMPILE_POPPED(ret, "branch condition", cond));
+        ADD_INSNL(ret, cond, jump, then_label);
         return COMPILE_OK;
       case NODE_FLIP2:
-	CHECK(compile_flip_flop(iseq, ret, cond, TRUE, then_label, else_label));
+        CHECK(compile_flip_flop(iseq, ret, cond, TRUE, then_label, else_label));
         return COMPILE_OK;
       case NODE_FLIP3:
-	CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label));
+        CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label));
         return COMPILE_OK;
       case NODE_DEFINED:
-	CHECK(compile_defined_expr(iseq, ret, cond, Qfalse));
+        CHECK(compile_defined_expr(iseq, ret, cond, Qfalse));
         break;
       default:
-	CHECK(COMPILE(ret, "branch condition", cond));
+        CHECK(COMPILE(ret, "branch condition", cond));
         break;
     }
 
@@ -4102,25 +4349,25 @@ keyword_node_p(const NODE *const node)
 
 static int
 compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-			  const NODE *const root_node,
-			  struct rb_callinfo_kwarg **const kw_arg_ptr,
-			  unsigned int *flag)
+                          const NODE *const root_node,
+                          struct rb_callinfo_kwarg **const kw_arg_ptr,
+                          unsigned int *flag)
 {
     if (kw_arg_ptr == NULL) return FALSE;
 
     if (root_node->nd_head && nd_type_p(root_node->nd_head, NODE_LIST)) {
-	const NODE *node = root_node->nd_head;
+        const NODE *node = root_node->nd_head;
         int seen_nodes = 0;
 
-	while (node) {
-	    const NODE *key_node = node->nd_head;
+        while (node) {
+            const NODE *key_node = node->nd_head;
             seen_nodes++;
 
-	    assert(nd_type_p(node, NODE_LIST));
+            assert(nd_type_p(node, NODE_LIST));
             if (key_node && nd_type_p(key_node, NODE_LIT) && SYMBOL_P(key_node->nd_lit)) {
-		/* can be keywords */
-	    }
-	    else {
+                /* can be keywords */
+            }
+            else {
                 if (flag) {
                     *flag |= VM_CALL_KW_SPLAT;
                     if (seen_nodes > 1 || node->nd_next->nd_next) {
@@ -4131,33 +4378,33 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
                         *flag |= VM_CALL_KW_SPLAT_MUT;
                     }
                 }
-		return FALSE;
-	    }
-	    node = node->nd_next; /* skip value node */
-	    node = node->nd_next;
-	}
-
-	/* may be keywords */
-	node = root_node->nd_head;
-	{
-	    int len = (int)node->nd_alen / 2;
+                return FALSE;
+            }
+            node = node->nd_next; /* skip value node */
+            node = node->nd_next;
+        }
+
+        /* may be keywords */
+        node = root_node->nd_head;
+        {
+            int len = (int)node->nd_alen / 2;
             struct rb_callinfo_kwarg *kw_arg =
                 rb_xmalloc_mul_add(len, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
-	    VALUE *keywords = kw_arg->keywords;
-	    int i = 0;
-	    kw_arg->keyword_len = len;
+            VALUE *keywords = kw_arg->keywords;
+            int i = 0;
+            kw_arg->keyword_len = len;
 
-	    *kw_arg_ptr = kw_arg;
+            *kw_arg_ptr = kw_arg;
 
-	    for (i=0; node != NULL; i++, node = node->nd_next->nd_next) {
-		const NODE *key_node = node->nd_head;
-		const NODE *val_node = node->nd_next->nd_head;
-		keywords[i] = key_node->nd_lit;
+            for (i=0; node != NULL; i++, node = node->nd_next->nd_next) {
+                const NODE *key_node = node->nd_head;
+                const NODE *val_node = node->nd_next->nd_head;
+                keywords[i] = key_node->nd_lit;
                 NO_CHECK(COMPILE(ret, "keyword values", val_node));
-	    }
-	    assert(i == len);
-	    return TRUE;
-	}
+            }
+            assert(i == len);
+            return TRUE;
+        }
     }
     return FALSE;
 }
@@ -4197,11 +4444,11 @@ static_literal_node_p(const NODE *node, const rb_iseq_t *iseq)
       case NODE_NIL:
       case NODE_TRUE:
       case NODE_FALSE:
-	return TRUE;
+        return TRUE;
       case NODE_STR:
         return ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal;
       default:
-	return FALSE;
+        return FALSE;
     }
 }
 
@@ -4210,11 +4457,11 @@ static_literal_value(const NODE *node, rb_iseq_t *iseq)
 {
     switch (nd_type(node)) {
       case NODE_NIL:
-	return Qnil;
+        return Qnil;
       case NODE_TRUE:
-	return Qtrue;
+        return Qtrue;
       case NODE_FALSE:
-	return Qfalse;
+        return Qfalse;
       case NODE_STR:
         if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
             VALUE lit;
@@ -4227,7 +4474,7 @@ static_literal_value(const NODE *node, rb_iseq_t *iseq)
             return rb_fstring(node->nd_lit);
         }
       default:
-	return node->nd_lit;
+        return node->nd_lit;
     }
 }
 
@@ -4237,9 +4484,9 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
     const NODE *line_node = node;
 
     if (nd_type_p(node, NODE_ZLIST)) {
-	if (!popped) {
-	    ADD_INSN1(ret, line_node, newarray, INT2FIX(0));
-	}
+        if (!popped) {
+            ADD_INSN1(ret, line_node, newarray, INT2FIX(0));
+        }
         return 0;
     }
 
@@ -4314,7 +4561,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
 
             if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_ary_len) {
                 /* The literal contains only optimizable elements, or the subarray is long enough */
-                VALUE ary = rb_ary_tmp_new(count);
+                VALUE ary = rb_ary_hidden_new(count);
 
                 /* Create a hidden array */
                 for (; count; count--, node = node->nd_next)
@@ -4365,7 +4612,7 @@ static int
 compile_array_1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node)
 {
     if (static_literal_node_p(node, iseq)) {
-        VALUE ary = rb_ary_tmp_new(1);
+        VALUE ary = rb_ary_hidden_new(1);
         rb_ary_push(ary, static_literal_value(node, iseq));
         OBJ_FREEZE(ary);
 
@@ -4373,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;
@@ -4393,9 +4645,9 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
     node = node->nd_head;
 
     if (!node || nd_type_p(node, NODE_ZLIST)) {
-	if (!popped) {
-	    ADD_INSN1(ret, line_node, newhash, INT2FIX(0));
-	}
+        if (!popped) {
+            ADD_INSN1(ret, line_node, newhash, INT2FIX(0));
+        }
         return 0;
     }
 
@@ -4462,7 +4714,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
 
             if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_hash_len) {
                 /* The literal contains only optimizable elements, or the subsequence is long enough */
-                VALUE ary = rb_ary_tmp_new(count);
+                VALUE ary = rb_ary_hidden_new(count);
 
                 /* Create a hidden hash */
                 for (; count; count--, node = node->nd_next->nd_next) {
@@ -4580,62 +4832,62 @@ rb_node_case_when_optimizable_literal(const NODE *const node)
 {
     switch (nd_type(node)) {
       case NODE_LIT: {
-	VALUE v = node->nd_lit;
-	double ival;
-	if (RB_FLOAT_TYPE_P(v) &&
-	    modf(RFLOAT_VALUE(v), &ival) == 0.0) {
-	    return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
-	}
+        VALUE v = node->nd_lit;
+        double ival;
+        if (RB_FLOAT_TYPE_P(v) &&
+            modf(RFLOAT_VALUE(v), &ival) == 0.0) {
+            return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
+        }
         if (RB_TYPE_P(v, T_RATIONAL) || RB_TYPE_P(v, T_COMPLEX)) {
             return Qundef;
         }
-	if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
-	    return v;
-	}
-	break;
+        if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
+            return v;
+        }
+        break;
       }
       case NODE_NIL:
-	return Qnil;
+        return Qnil;
       case NODE_TRUE:
-	return Qtrue;
+        return Qtrue;
       case NODE_FALSE:
-	return Qfalse;
+        return Qfalse;
       case NODE_STR:
-	return rb_fstring(node->nd_lit);
+        return rb_fstring(node->nd_lit);
     }
     return Qundef;
 }
 
 static int
 when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
-	  LABEL *l1, int only_special_literals, VALUE literals)
+          LABEL *l1, int only_special_literals, VALUE literals)
 {
     while (vals) {
-	const NODE *val = vals->nd_head;
+        const NODE *val = vals->nd_head;
         VALUE lit = rb_node_case_when_optimizable_literal(val);
 
-	if (lit == Qundef) {
-	    only_special_literals = 0;
-	}
+        if (UNDEF_P(lit)) {
+            only_special_literals = 0;
+        }
         else if (NIL_P(rb_hash_lookup(literals, lit))) {
             rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
-	}
+        }
 
-	if (nd_type_p(val, NODE_STR)) {
-	    debugp_param("nd_lit", val->nd_lit);
-	    lit = rb_fstring(val->nd_lit);
-	    ADD_INSN1(cond_seq, val, putobject, lit);
+        if (nd_type_p(val, NODE_STR)) {
+            debugp_param("nd_lit", val->nd_lit);
+            lit = rb_fstring(val->nd_lit);
+            ADD_INSN1(cond_seq, val, putobject, lit);
             RB_OBJ_WRITTEN(iseq, Qundef, lit);
-	}
-	else {
-	    if (!COMPILE(cond_seq, "when cond", val)) return -1;
-	}
+        }
+        else {
+            if (!COMPILE(cond_seq, "when cond", val)) return -1;
+        }
 
         // Emit patern === target
         ADD_INSN1(cond_seq, vals, topn, INT2FIX(1));
         ADD_CALL(cond_seq, vals, idEqq, INT2FIX(1));
-	ADD_INSNL(cond_seq, val, branchif, l1);
-	vals = vals->nd_next;
+        ADD_INSNL(cond_seq, val, branchif, l1);
+        vals = vals->nd_next;
     }
     return only_special_literals;
 }
@@ -4782,7 +5034,8 @@ struct masgn_state {
 };
 
 static int
-add_masgn_lhs_node(struct masgn_state *state, int lhs_pos, const NODE *line_node, int argc, INSN *before_insn) {
+add_masgn_lhs_node(struct masgn_state *state, int lhs_pos, const NODE *line_node, int argc, INSN *before_insn)
+{
     if (!state) {
         rb_bug("no masgn_state");
     }
@@ -4818,17 +5071,22 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
 {
     switch (nd_type(node)) {
       case NODE_ATTRASGN: {
-	INSN *iobj;
+        INSN *iobj;
         const NODE *line_node = node;
 
         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;
+        ASSUME(iobj);
+        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;
@@ -4847,23 +5105,27 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
             return COMPILE_NG;
         }
 
-        ADD_ELEM(lhs, (LINK_ELEMENT *)iobj);
-	if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) {
+        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);
             OPERAND_AT(iobj, 0) = (VALUE)ci;
             RB_OBJ_WRITTEN(iseq, Qundef, iobj);
             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) {
+            INSERT_BEFORE_INSN(iobj, line_node, concatarray);
+        }
+        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);
         }
-	break;
+        break;
       }
       case NODE_MASGN: {
         DECL_ANCHOR(nest_rhs);
@@ -4881,7 +5143,7 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
 
         ADD_SEQ(lhs, nest_rhs);
         ADD_SEQ(lhs, nest_lhs);
-	break;
+        break;
       }
       case NODE_CDECL:
         if (!node->nd_vid) {
@@ -4907,10 +5169,10 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const pre, LINK_ANCHOR *const
         }
         /* Fallthrough */
       default: {
-	DECL_ANCHOR(anchor);
-	INIT_ANCHOR(anchor);
-	CHECK(COMPILE_POPPED(anchor, "masgn lhs", node));
-	ELEM_REMOVE(FIRST_ELEMENT(anchor));
+        DECL_ANCHOR(anchor);
+        INIT_ANCHOR(anchor);
+        CHECK(COMPILE_POPPED(anchor, "masgn lhs", node));
+        ELEM_REMOVE(FIRST_ELEMENT(anchor));
         ADD_SEQ(lhs, anchor);
       }
     }
@@ -4922,7 +5184,7 @@ static int
 compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *lhsn)
 {
     if (lhsn) {
-	CHECK(compile_massign_opt_lhs(iseq, ret, lhsn->nd_next));
+        CHECK(compile_massign_opt_lhs(iseq, ret, lhsn->nd_next));
         CHECK(compile_massign_lhs(iseq, ret, ret, ret, ret, lhsn->nd_head, NULL, 0));
     }
     return COMPILE_OK;
@@ -4930,7 +5192,7 @@ compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *lhs
 
 static int
 compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-		    const NODE *rhsn, const NODE *orig_lhsn)
+                    const NODE *rhsn, const NODE *orig_lhsn)
 {
     VALUE mem[64];
     const int memsize = numberof(mem);
@@ -4943,48 +5205,48 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
     int i; \
     if (memindex == memsize) return 0; \
     for (i=0; i<memindex; i++) { \
-	if (mem[i] == (v)) return 0; \
+        if (mem[i] == (v)) return 0; \
     } \
     mem[memindex++] = (v); \
 }
 
     if (rhsn == 0 || !nd_type_p(rhsn, NODE_LIST)) {
-	return 0;
+        return 0;
     }
 
     while (lhsn) {
-	const NODE *ln = lhsn->nd_head;
-	switch (nd_type(ln)) {
-	  case NODE_LASGN:
-	    MEMORY(ln->nd_vid);
-	    break;
-	  case NODE_DASGN:
-	  case NODE_IASGN:
-	  case NODE_CVASGN:
-	    MEMORY(ln->nd_vid);
-	    break;
-	  default:
-	    return 0;
-	}
-	lhsn = lhsn->nd_next;
-	llen++;
+        const NODE *ln = lhsn->nd_head;
+        switch (nd_type(ln)) {
+          case NODE_LASGN:
+            MEMORY(ln->nd_vid);
+            break;
+          case NODE_DASGN:
+          case NODE_IASGN:
+          case NODE_CVASGN:
+            MEMORY(ln->nd_vid);
+            break;
+          default:
+            return 0;
+        }
+        lhsn = lhsn->nd_next;
+        llen++;
     }
 
     while (rhsn) {
-	if (llen <= rlen) {
+        if (llen <= rlen) {
             NO_CHECK(COMPILE_POPPED(ret, "masgn val (popped)", rhsn->nd_head));
-	}
-	else {
+        }
+        else {
             NO_CHECK(COMPILE(ret, "masgn val", rhsn->nd_head));
-	}
-	rhsn = rhsn->nd_next;
-	rlen++;
+        }
+        rhsn = rhsn->nd_next;
+        rlen++;
     }
 
     if (llen > rlen) {
-	for (i=0; i<llen-rlen; i++) {
-	    ADD_INSN(ret, orig_lhsn, putnil);
-	}
+        for (i=0; i<llen-rlen; i++) {
+            ADD_INSN(ret, orig_lhsn, putnil);
+        }
     }
 
     compile_massign_opt_lhs(iseq, ret, orig_lhsn);
@@ -5099,32 +5361,55 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     return COMPILE_OK;
 }
 
+static VALUE
+collect_const_segments(rb_iseq_t *iseq, const NODE *node)
+{
+    VALUE arr = rb_ary_new();
+    for (;;) {
+        switch (nd_type(node)) {
+          case NODE_CONST:
+            rb_ary_unshift(arr, ID2SYM(node->nd_vid));
+            return arr;
+          case NODE_COLON3:
+            rb_ary_unshift(arr, ID2SYM(node->nd_mid));
+            rb_ary_unshift(arr, ID2SYM(idNULL));
+            return arr;
+          case NODE_COLON2:
+            rb_ary_unshift(arr, ID2SYM(node->nd_mid));
+            node = node->nd_head;
+            break;
+          default:
+            return Qfalse;
+        }
+    }
+}
+
 static int
 compile_const_prefix(rb_iseq_t *iseq, const NODE *const node,
-		     LINK_ANCHOR *const pref, LINK_ANCHOR *const body)
+                     LINK_ANCHOR *const pref, LINK_ANCHOR *const body)
 {
     switch (nd_type(node)) {
       case NODE_CONST:
-	debugi("compile_const_prefix - colon", node->nd_vid);
+        debugi("compile_const_prefix - colon", node->nd_vid);
         ADD_INSN1(body, node, putobject, Qtrue);
         ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_vid));
-	break;
+        break;
       case NODE_COLON3:
-	debugi("compile_const_prefix - colon3", node->nd_mid);
-	ADD_INSN(body, node, pop);
-	ADD_INSN1(body, node, putobject, rb_cObject);
+        debugi("compile_const_prefix - colon3", node->nd_mid);
+        ADD_INSN(body, node, pop);
+        ADD_INSN1(body, node, putobject, rb_cObject);
         ADD_INSN1(body, node, putobject, Qtrue);
         ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_mid));
-	break;
+        break;
       case NODE_COLON2:
-	CHECK(compile_const_prefix(iseq, node->nd_head, pref, body));
-	debugi("compile_const_prefix - colon2", node->nd_mid);
+        CHECK(compile_const_prefix(iseq, node->nd_head, pref, body));
+        debugi("compile_const_prefix - colon2", node->nd_mid);
         ADD_INSN1(body, node, putobject, Qfalse);
         ADD_INSN1(body, node, getconstant, ID2SYM(node->nd_mid));
-	break;
+        break;
       default:
-	CHECK(COMPILE(pref, "const colon2 prefix", node));
-	break;
+        CHECK(COMPILE(pref, "const colon2 prefix", node));
+        break;
     }
     return COMPILE_OK;
 }
@@ -5133,20 +5418,20 @@ static int
 compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const NODE *cpath)
 {
     if (nd_type_p(cpath, NODE_COLON3)) {
-	/* toplevel class ::Foo */
-	ADD_INSN1(ret, cpath, putobject, rb_cObject);
-	return VM_DEFINECLASS_FLAG_SCOPED;
+        /* toplevel class ::Foo */
+        ADD_INSN1(ret, cpath, putobject, rb_cObject);
+        return VM_DEFINECLASS_FLAG_SCOPED;
     }
     else if (cpath->nd_head) {
-	/* Bar::Foo */
+        /* Bar::Foo */
         NO_CHECK(COMPILE(ret, "nd_else->nd_head", cpath->nd_head));
-	return VM_DEFINECLASS_FLAG_SCOPED;
+        return VM_DEFINECLASS_FLAG_SCOPED;
     }
     else {
-	/* class at cbase Foo */
-	ADD_INSN1(ret, cpath, putspecialobject,
-		  INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-	return 0;
+        /* class at cbase Foo */
+        ADD_INSN1(ret, cpath, putspecialobject,
+                  INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+        return 0;
     }
 }
 
@@ -5162,7 +5447,7 @@ private_recv_p(const NODE *node)
 
 static void
 defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-	     const NODE *const node, LABEL **lfinish, VALUE needstr);
+             const NODE *const node, LABEL **lfinish, VALUE needstr);
 
 static int
 compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, const enum node_type type, const NODE *const line_node, int popped, bool assume_receiver);
@@ -5179,31 +5464,31 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 
     switch (type = nd_type(node)) {
 
-	/* easy literals */
+        /* easy literals */
       case NODE_NIL:
-	expr_type = DEFINED_NIL;
-	break;
+        expr_type = DEFINED_NIL;
+        break;
       case NODE_SELF:
-	expr_type = DEFINED_SELF;
-	break;
+        expr_type = DEFINED_SELF;
+        break;
       case NODE_TRUE:
-	expr_type = DEFINED_TRUE;
-	break;
+        expr_type = DEFINED_TRUE;
+        break;
       case NODE_FALSE:
-	expr_type = DEFINED_FALSE;
-	break;
+        expr_type = DEFINED_FALSE;
+        break;
 
       case NODE_LIST:{
-	const NODE *vals = node;
+        const NODE *vals = node;
 
-	do {
+        do {
             defined_expr0(iseq, ret, vals->nd_head, lfinish, Qfalse, false);
 
-	    if (!lfinish[1]) {
+            if (!lfinish[1]) {
                 lfinish[1] = NEW_LABEL(line);
-	    }
+            }
             ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
-	} while ((vals = vals->nd_next) != NULL);
+        } while ((vals = vals->nd_next) != NULL);
       }
         /* fall through */
       case NODE_STR:
@@ -5212,43 +5497,43 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
       case NODE_AND:
       case NODE_OR:
       default:
-	expr_type = DEFINED_EXPR;
-	break;
+        expr_type = DEFINED_EXPR;
+        break;
 
-	/* variables */
+        /* variables */
       case NODE_LVAR:
       case NODE_DVAR:
-	expr_type = DEFINED_LVAR;
-	break;
+        expr_type = DEFINED_LVAR;
+        break;
 
 #define PUSH_VAL(type) (needstr == Qfalse ? Qtrue : rb_iseq_defined_string(type))
       case NODE_IVAR:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_IVAR),
-		  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_IVAR));
+                  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_IVAR));
         return;
 
       case NODE_GVAR:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_GVAR),
-		  ID2SYM(node->nd_entry), PUSH_VAL(DEFINED_GVAR));
+                  ID2SYM(node->nd_entry), PUSH_VAL(DEFINED_GVAR));
         return;
 
       case NODE_CVAR:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_CVAR),
-		  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_CVAR));
+                  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_CVAR));
         return;
 
       case NODE_CONST:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_CONST),
-		  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_CONST));
+                  ID2SYM(node->nd_vid), PUSH_VAL(DEFINED_CONST));
         return;
       case NODE_COLON2:
-	if (!lfinish[1]) {
+        if (!lfinish[1]) {
             lfinish[1] = NEW_LABEL(line);
-	}
+        }
         defined_expr0(iseq, ret, node->nd_head, lfinish, Qfalse, false);
         ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
         NO_CHECK(COMPILE(ret, "defined/colon2#nd_head", node->nd_head));
@@ -5265,18 +5550,18 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
       case NODE_COLON3:
         ADD_INSN1(ret, line_node, putobject, rb_cObject);
         ADD_INSN3(ret, line_node, defined,
-		  INT2FIX(DEFINED_CONST_FROM), ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_CONST));
+                  INT2FIX(DEFINED_CONST_FROM), ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_CONST));
         return;
 
-	/* method dispatch */
+        /* method dispatch */
       case NODE_CALL:
       case NODE_OPCALL:
       case NODE_VCALL:
       case NODE_FCALL:
       case NODE_ATTRASGN:{
-	const int explicit_receiver =
-	    (type == NODE_CALL || type == NODE_OPCALL ||
-	     (type == NODE_ATTRASGN && !private_recv_p(node)));
+        const int explicit_receiver =
+            (type == NODE_CALL || type == NODE_OPCALL ||
+             (type == NODE_ATTRASGN && !private_recv_p(node)));
 
         if (node->nd_args || explicit_receiver) {
             if (!lfinish[1]) {
@@ -5286,11 +5571,11 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
                 lfinish[2] = NEW_LABEL(line);
             }
         }
-	if (node->nd_args) {
+        if (node->nd_args) {
             defined_expr0(iseq, ret, node->nd_args, lfinish, Qfalse, false);
             ADD_INSNL(ret, line_node, branchunless, lfinish[1]);
-	}
-	if (explicit_receiver) {
+        }
+        if (explicit_receiver) {
             defined_expr0(iseq, ret, node->nd_recv, lfinish, Qfalse, true);
             switch (nd_type(node->nd_recv)) {
               case NODE_CALL:
@@ -5310,38 +5595,38 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
                 ADD_INSN(ret, line_node, dup);
             }
             ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_METHOD),
-		      ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD));
-	}
-	else {
+                      ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD));
+        }
+        else {
             ADD_INSN(ret, line_node, putself);
             if (keep_result) {
                 ADD_INSN(ret, line_node, dup);
             }
             ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_FUNC),
-		      ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD));
-	}
+                      ID2SYM(node->nd_mid), PUSH_VAL(DEFINED_METHOD));
+        }
         return;
       }
 
       case NODE_YIELD:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_YIELD), 0,
-		  PUSH_VAL(DEFINED_YIELD));
+                  PUSH_VAL(DEFINED_YIELD));
         return;
 
       case NODE_BACK_REF:
       case NODE_NTH_REF:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_REF),
-		  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
-		  PUSH_VAL(DEFINED_GVAR));
+                  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
+                  PUSH_VAL(DEFINED_GVAR));
         return;
 
       case NODE_SUPER:
       case NODE_ZSUPER:
         ADD_INSN(ret, line_node, putnil);
         ADD_INSN3(ret, line_node, defined, INT2FIX(DEFINED_ZSUPER), 0,
-		  PUSH_VAL(DEFINED_ZSUPER));
+                  PUSH_VAL(DEFINED_ZSUPER));
         return;
 
 #undef PUSH_VAL
@@ -5356,8 +5641,8 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
       case NODE_IASGN:
       case NODE_CDECL:
       case NODE_CVASGN:
-	expr_type = DEFINED_ASGN;
-	break;
+        expr_type = DEFINED_ASGN;
+        break;
     }
 
     assert(expr_type != DEFINED_NOT_DEFINED);
@@ -5381,26 +5666,26 @@ build_defined_rescue_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const void *u
 
 static void
 defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-	     const NODE *const node, LABEL **lfinish, VALUE needstr)
+             const NODE *const node, LABEL **lfinish, VALUE needstr)
 {
     LINK_ELEMENT *lcur = ret->last;
     defined_expr0(iseq, ret, node, lfinish, needstr, false);
     if (lfinish[1]) {
-	int line = nd_line(node);
-	LABEL *lstart = NEW_LABEL(line);
-	LABEL *lend = NEW_LABEL(line);
-	const rb_iseq_t *rescue;
+        int line = nd_line(node);
+        LABEL *lstart = NEW_LABEL(line);
+        LABEL *lend = NEW_LABEL(line);
+        const rb_iseq_t *rescue;
         struct rb_iseq_new_with_callback_callback_func *ifunc =
             rb_iseq_new_with_callback_new_callback(build_defined_rescue_iseq, NULL);
         rescue = new_child_iseq_with_callback(iseq, ifunc,
                                               rb_str_concat(rb_str_new2("defined guard in "),
                                                             ISEQ_BODY(iseq)->location.label),
                                               iseq, ISEQ_TYPE_RESCUE, 0);
-	lstart->rescued = LABEL_RESCUE_BEG;
-	lend->rescued = LABEL_RESCUE_END;
-	APPEND_LABEL(ret, lcur, lstart);
-	ADD_LABEL(ret, lend);
-	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
+        lstart->rescued = LABEL_RESCUE_BEG;
+        lend->rescued = LABEL_RESCUE_END;
+        APPEND_LABEL(ret, lcur, lstart);
+        ADD_LABEL(ret, lend);
+        ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
     }
 }
 
@@ -5410,26 +5695,26 @@ compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const
     const int line = nd_line(node);
     const NODE *line_node = node;
     if (!node->nd_head) {
-	VALUE str = rb_iseq_defined_string(DEFINED_NIL);
-	ADD_INSN1(ret, line_node, putobject, str);
+        VALUE str = rb_iseq_defined_string(DEFINED_NIL);
+        ADD_INSN1(ret, line_node, putobject, str);
     }
     else {
         LABEL *lfinish[3];
-	LINK_ELEMENT *last = ret->last;
-	lfinish[0] = NEW_LABEL(line);
-	lfinish[1] = 0;
+        LINK_ELEMENT *last = ret->last;
+        lfinish[0] = NEW_LABEL(line);
+        lfinish[1] = 0;
         lfinish[2] = 0;
-	defined_expr(iseq, ret, node->nd_head, lfinish, needstr);
-	if (lfinish[1]) {
-	    ELEM_INSERT_NEXT(last, &new_insn_body(iseq, line_node, BIN(putnil), 0)->link);
-	    ADD_INSN(ret, line_node, swap);
+        defined_expr(iseq, ret, node->nd_head, lfinish, needstr);
+        if (lfinish[1]) {
+            ELEM_INSERT_NEXT(last, &new_insn_body(iseq, line_node, BIN(putnil), 0)->link);
+            ADD_INSN(ret, line_node, swap);
             if (lfinish[2]) {
                 ADD_LABEL(ret, lfinish[2]);
             }
-	    ADD_INSN(ret, line_node, pop);
-	    ADD_LABEL(ret, lfinish[1]);
-	}
-	ADD_LABEL(ret, lfinish[0]);
+            ADD_INSN(ret, line_node, pop);
+            ADD_LABEL(ret, lfinish[1]);
+        }
+        ADD_LABEL(ret, lfinish[0]);
     }
     return COMPILE_OK;
 }
@@ -5443,10 +5728,10 @@ make_name_for_block(const rb_iseq_t *orig_iseq)
     if (ISEQ_BODY(orig_iseq)->parent_iseq != 0) {
         while (ISEQ_BODY(orig_iseq)->local_iseq != iseq) {
             if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_BLOCK) {
-		level++;
-	    }
+                level++;
+            }
             iseq = ISEQ_BODY(iseq)->parent_iseq;
-	}
+        }
     }
 
     if (level == 1) {
@@ -5459,8 +5744,8 @@ make_name_for_block(const rb_iseq_t *orig_iseq)
 
 static void
 push_ensure_entry(rb_iseq_t *iseq,
-		  struct iseq_compile_data_ensure_node_stack *enl,
-		  struct ensure_range *er, const NODE *const node)
+                  struct iseq_compile_data_ensure_node_stack *enl,
+                  struct ensure_range *er, const NODE *const node)
 {
     enl->ensure_node = node;
     enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;	/* prev */
@@ -5470,13 +5755,13 @@ push_ensure_entry(rb_iseq_t *iseq,
 
 static void
 add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
-		 LABEL *lstart, LABEL *lend)
+                 LABEL *lstart, LABEL *lend)
 {
     struct ensure_range *ne =
-	compile_data_alloc(iseq, sizeof(struct ensure_range));
+        compile_data_alloc(iseq, sizeof(struct ensure_range));
 
     while (erange->next != 0) {
-	erange = erange->next;
+        erange = erange->next;
     }
     ne->next = 0;
     ne->begin = lend;
@@ -5505,32 +5790,32 @@ add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
     assert(can_add_ensure_iseq(iseq));
 
     struct iseq_compile_data_ensure_node_stack *enlp =
-	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
+        ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
     struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
     DECL_ANCHOR(ensure);
 
     INIT_ANCHOR(ensure);
     while (enlp) {
-	if (enlp->erange != NULL) {
-	    DECL_ANCHOR(ensure_part);
-	    LABEL *lstart = NEW_LABEL(0);
-	    LABEL *lend = NEW_LABEL(0);
-	    INIT_ANCHOR(ensure_part);
+        if (enlp->erange != NULL) {
+            DECL_ANCHOR(ensure_part);
+            LABEL *lstart = NEW_LABEL(0);
+            LABEL *lend = NEW_LABEL(0);
+            INIT_ANCHOR(ensure_part);
 
-	    add_ensure_range(iseq, enlp->erange, lstart, lend);
+            add_ensure_range(iseq, enlp->erange, lstart, lend);
 
-	    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev;
-	    ADD_LABEL(ensure_part, lstart);
+            ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev;
+            ADD_LABEL(ensure_part, lstart);
             NO_CHECK(COMPILE_POPPED(ensure_part, "ensure part", enlp->ensure_node));
-	    ADD_LABEL(ensure_part, lend);
-	    ADD_SEQ(ensure, ensure_part);
-	}
-	else {
-	    if (!is_return) {
-		break;
-	    }
-	}
-	enlp = enlp->prev;
+            ADD_LABEL(ensure_part, lend);
+            ADD_SEQ(ensure, ensure_part);
+        }
+        else {
+            if (!is_return) {
+                break;
+            }
+        }
+        enlp = enlp->prev;
     }
     ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = prev_enlp;
     ADD_SEQ(ret, ensure);
@@ -5613,7 +5898,7 @@ setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
 
 static VALUE
 setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
-	   unsigned int *flag, struct rb_callinfo_kwarg **keywords)
+           unsigned int *flag, struct rb_callinfo_kwarg **keywords)
 {
     VALUE ret;
     if (argn && nd_type_p(argn, NODE_BLOCK_PASS)) {
@@ -5675,44 +5960,44 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE
     ADD_INSNL(ret, line_node, branchunless, fail_label);
 
     for (vars = node; vars; vars = vars->nd_next) {
-	INSN *cap;
-	if (vars->nd_next) {
-	    ADD_INSN(ret, line_node, dup);
-	}
-	last = ret->last;
+        INSN *cap;
+        if (vars->nd_next) {
+            ADD_INSN(ret, line_node, dup);
+        }
+        last = ret->last;
         NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head));
-	last = last->next; /* putobject :var */
-	cap = new_insn_send(iseq, line_node, idAREF, INT2FIX(1),
-			    NULL, INT2FIX(0), NULL);
-	ELEM_INSERT_PREV(last->next, (LINK_ELEMENT *)cap);
+        last = last->next; /* putobject :var */
+        cap = new_insn_send(iseq, line_node, idAREF, INT2FIX(1),
+                            NULL, INT2FIX(0), NULL);
+        ELEM_INSERT_PREV(last->next, (LINK_ELEMENT *)cap);
 #if !defined(NAMED_CAPTURE_SINGLE_OPT) || NAMED_CAPTURE_SINGLE_OPT-0
-	if (!vars->nd_next && vars == node) {
-	    /* only one name */
-	    DECL_ANCHOR(nom);
+        if (!vars->nd_next && vars == node) {
+            /* only one name */
+            DECL_ANCHOR(nom);
 
-	    INIT_ANCHOR(nom);
-	    ADD_INSNL(nom, line_node, jump, end_label);
-	    ADD_LABEL(nom, fail_label);
+            INIT_ANCHOR(nom);
+            ADD_INSNL(nom, line_node, jump, end_label);
+            ADD_LABEL(nom, fail_label);
 # if 0				/* $~ must be MatchData or nil */
-	    ADD_INSN(nom, line_node, pop);
-	    ADD_INSN(nom, line_node, putnil);
+            ADD_INSN(nom, line_node, pop);
+            ADD_INSN(nom, line_node, putnil);
 # endif
-	    ADD_LABEL(nom, end_label);
-	    (nom->last->next = cap->link.next)->prev = nom->last;
-	    (cap->link.next = nom->anchor.next)->prev = &cap->link;
-	    return;
-	}
+            ADD_LABEL(nom, end_label);
+            (nom->last->next = cap->link.next)->prev = nom->last;
+            (cap->link.next = nom->anchor.next)->prev = &cap->link;
+            return;
+        }
 #endif
     }
     ADD_INSNL(ret, line_node, jump, end_label);
     ADD_LABEL(ret, fail_label);
     ADD_INSN(ret, line_node, pop);
     for (vars = node; vars; vars = vars->nd_next) {
-	last = ret->last;
+        last = ret->last;
         NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head));
-	last = last->next; /* putobject :var */
-	((INSN*)last)->insn_id = BIN(putnil);
-	((INSN*)last)->operand_size = 0;
+        last = last->next; /* putobject :var */
+        ((INSN*)last)->insn_id = BIN(putnil);
+        ((INSN*)last)->operand_size = 0;
     }
     ADD_LABEL(ret, end_label);
 }
@@ -5757,7 +6042,7 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
     end_label = 0;
 
     compile_branch_condition(iseq, cond_seq, node->nd_cond,
-			     then_label, else_label);
+                             then_label, else_label);
 
     ci_size = body->ci_size;
     CHECK(COMPILE_(then_seq, "then", node_body, popped));
@@ -5784,44 +6069,44 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
     ADD_SEQ(ret, cond_seq);
 
     if (then_label->refcnt && else_label->refcnt) {
-	branches = decl_branch_base(iseq, node, type == NODE_IF ? "if" : "unless");
+        branches = decl_branch_base(iseq, node, type == NODE_IF ? "if" : "unless");
     }
 
     if (then_label->refcnt) {
-	ADD_LABEL(ret, then_label);
-	if (else_label->refcnt) {
-	    add_trace_branch_coverage(
+        ADD_LABEL(ret, then_label);
+        if (else_label->refcnt) {
+            add_trace_branch_coverage(
                 iseq,
-		ret,
+                ret,
                 node_body ? node_body : node,
                 0,
-		type == NODE_IF ? "then" : "else",
-		branches);
-	    end_label = NEW_LABEL(line);
-	    ADD_INSNL(then_seq, line_node, jump, end_label);
+                type == NODE_IF ? "then" : "else",
+                branches);
+            end_label = NEW_LABEL(line);
+            ADD_INSNL(then_seq, line_node, jump, end_label);
             if (!popped) {
                 ADD_INSN(then_seq, line_node, pop);
             }
-	}
-	ADD_SEQ(ret, then_seq);
+        }
+        ADD_SEQ(ret, then_seq);
     }
 
     if (else_label->refcnt) {
-	ADD_LABEL(ret, else_label);
-	if (then_label->refcnt) {
-	    add_trace_branch_coverage(
+        ADD_LABEL(ret, else_label);
+        if (then_label->refcnt) {
+            add_trace_branch_coverage(
                 iseq,
-		ret,
+                ret,
                 node_else ? node_else : node,
                 1,
-		type == NODE_IF ? "else" : "then",
-		branches);
-	}
-	ADD_SEQ(ret, else_seq);
+                type == NODE_IF ? "else" : "then",
+                branches);
+        }
+        ADD_SEQ(ret, else_seq);
     }
 
     if (end_label) {
-	ADD_LABEL(ret, end_label);
+        ADD_LABEL(ret, end_label);
     }
 
     return COMPILE_OK;
@@ -5866,74 +6151,74 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
     ADD_SEQ(ret, head);	/* case VAL */
 
     while (type == NODE_WHEN) {
-	LABEL *l1;
+        LABEL *l1;
 
-	l1 = NEW_LABEL(line);
-	ADD_LABEL(body_seq, l1);
-	ADD_INSN(body_seq, line_node, pop);
-	add_trace_branch_coverage(
+        l1 = NEW_LABEL(line);
+        ADD_LABEL(body_seq, l1);
+        ADD_INSN(body_seq, line_node, pop);
+        add_trace_branch_coverage(
                 iseq,
-		body_seq,
+                body_seq,
                 node->nd_body ? node->nd_body : node,
                 branch_id++,
-		"when",
-		branches);
-	CHECK(COMPILE_(body_seq, "when body", node->nd_body, popped));
-	ADD_INSNL(body_seq, line_node, jump, endlabel);
-
-	vals = node->nd_head;
-	if (vals) {
-	    switch (nd_type(vals)) {
-	      case NODE_LIST:
-		only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
-		if (only_special_literals < 0) return COMPILE_NG;
-		break;
-	      case NODE_SPLAT:
-	      case NODE_ARGSCAT:
-	      case NODE_ARGSPUSH:
-		only_special_literals = 0;
-		CHECK(when_splat_vals(iseq, cond_seq, vals, l1, only_special_literals, literals));
-		break;
-	      default:
-		UNKNOWN_NODE("NODE_CASE", vals, COMPILE_NG);
-	    }
-	}
-	else {
-	    EXPECT_NODE_NONULL("NODE_CASE", node, NODE_LIST, COMPILE_NG);
-	}
-
-	node = node->nd_next;
-	if (!node) {
-	    break;
-	}
-	type = nd_type(node);
-	line = nd_line(node);
+                "when",
+                branches);
+        CHECK(COMPILE_(body_seq, "when body", node->nd_body, popped));
+        ADD_INSNL(body_seq, line_node, jump, endlabel);
+
+        vals = node->nd_head;
+        if (vals) {
+            switch (nd_type(vals)) {
+              case NODE_LIST:
+                only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
+                if (only_special_literals < 0) return COMPILE_NG;
+                break;
+              case NODE_SPLAT:
+              case NODE_ARGSCAT:
+              case NODE_ARGSPUSH:
+                only_special_literals = 0;
+                CHECK(when_splat_vals(iseq, cond_seq, vals, l1, only_special_literals, literals));
+                break;
+              default:
+                UNKNOWN_NODE("NODE_CASE", vals, COMPILE_NG);
+            }
+        }
+        else {
+            EXPECT_NODE_NONULL("NODE_CASE", node, NODE_LIST, COMPILE_NG);
+        }
+
+        node = node->nd_next;
+        if (!node) {
+            break;
+        }
+        type = nd_type(node);
+        line = nd_line(node);
         line_node = node;
     }
     /* else */
     if (node) {
-	ADD_LABEL(cond_seq, elselabel);
-	ADD_INSN(cond_seq, line_node, pop);
-	add_trace_branch_coverage(iseq, cond_seq, node, branch_id, "else", branches);
-	CHECK(COMPILE_(cond_seq, "else", node, popped));
-	ADD_INSNL(cond_seq, line_node, jump, endlabel);
+        ADD_LABEL(cond_seq, elselabel);
+        ADD_INSN(cond_seq, line_node, pop);
+        add_trace_branch_coverage(iseq, cond_seq, node, branch_id, "else", branches);
+        CHECK(COMPILE_(cond_seq, "else", node, popped));
+        ADD_INSNL(cond_seq, line_node, jump, endlabel);
     }
     else {
-	debugs("== else (implicit)\n");
-	ADD_LABEL(cond_seq, elselabel);
-	ADD_INSN(cond_seq, orig_node, pop);
-	add_trace_branch_coverage(iseq, cond_seq, orig_node, branch_id, "else", branches);
-	if (!popped) {
-	    ADD_INSN(cond_seq, orig_node, putnil);
-	}
-	ADD_INSNL(cond_seq, orig_node, jump, endlabel);
+        debugs("== else (implicit)\n");
+        ADD_LABEL(cond_seq, elselabel);
+        ADD_INSN(cond_seq, orig_node, pop);
+        add_trace_branch_coverage(iseq, cond_seq, orig_node, branch_id, "else", branches);
+        if (!popped) {
+            ADD_INSN(cond_seq, orig_node, putnil);
+        }
+        ADD_INSNL(cond_seq, orig_node, jump, endlabel);
     }
 
     if (only_special_literals && ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-	ADD_INSN(ret, orig_node, dup);
-	ADD_INSN2(ret, orig_node, opt_case_dispatch, literals, elselabel);
+        ADD_INSN(ret, orig_node, dup);
+        ADD_INSN2(ret, orig_node, opt_case_dispatch, literals, elselabel);
         RB_OBJ_WRITTEN(iseq, Qundef, literals);
-	LABEL_REF(elselabel);
+        LABEL_REF(elselabel);
     }
 
     ADD_SEQ(ret, cond_seq);
@@ -5959,56 +6244,56 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
     endlabel = NEW_LABEL(nd_line(node));
 
     while (node && nd_type_p(node, NODE_WHEN)) {
-	const int line = nd_line(node);
-	LABEL *l1 = NEW_LABEL(line);
-	ADD_LABEL(body_seq, l1);
-	add_trace_branch_coverage(
+        const int line = nd_line(node);
+        LABEL *l1 = NEW_LABEL(line);
+        ADD_LABEL(body_seq, l1);
+        add_trace_branch_coverage(
                 iseq,
-		body_seq,
-		node->nd_body ? node->nd_body : node,
+                body_seq,
+                node->nd_body ? node->nd_body : node,
                 branch_id++,
-		"when",
-		branches);
-	CHECK(COMPILE_(body_seq, "when", node->nd_body, popped));
-	ADD_INSNL(body_seq, node, jump, endlabel);
+                "when",
+                branches);
+        CHECK(COMPILE_(body_seq, "when", node->nd_body, popped));
+        ADD_INSNL(body_seq, node, jump, endlabel);
 
-	vals = node->nd_head;
-	if (!vals) {
+        vals = node->nd_head;
+        if (!vals) {
             EXPECT_NODE_NONULL("NODE_WHEN", node, NODE_LIST, COMPILE_NG);
-	}
-	switch (nd_type(vals)) {
-	  case NODE_LIST:
-	    while (vals) {
-		LABEL *lnext;
-		val = vals->nd_head;
-		lnext = NEW_LABEL(nd_line(val));
-		debug_compile("== when2\n", (void)0);
-		CHECK(compile_branch_condition(iseq, ret, val, l1, lnext));
-		ADD_LABEL(ret, lnext);
-		vals = vals->nd_next;
-	    }
-	    break;
-	  case NODE_SPLAT:
-	  case NODE_ARGSCAT:
-	  case NODE_ARGSPUSH:
-	    ADD_INSN(ret, vals, putnil);
-	    CHECK(COMPILE(ret, "when2/cond splat", vals));
-	    ADD_INSN1(ret, vals, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
-	    ADD_INSNL(ret, vals, branchif, l1);
-	    break;
-	  default:
-	    UNKNOWN_NODE("NODE_WHEN", vals, COMPILE_NG);
-	}
-	node = node->nd_next;
+        }
+        switch (nd_type(vals)) {
+          case NODE_LIST:
+            while (vals) {
+                LABEL *lnext;
+                val = vals->nd_head;
+                lnext = NEW_LABEL(nd_line(val));
+                debug_compile("== when2\n", (void)0);
+                CHECK(compile_branch_condition(iseq, ret, val, l1, lnext));
+                ADD_LABEL(ret, lnext);
+                vals = vals->nd_next;
+            }
+            break;
+          case NODE_SPLAT:
+          case NODE_ARGSCAT:
+          case NODE_ARGSPUSH:
+            ADD_INSN(ret, vals, putnil);
+            CHECK(COMPILE(ret, "when2/cond splat", vals));
+            ADD_INSN1(ret, vals, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
+            ADD_INSNL(ret, vals, branchif, l1);
+            break;
+          default:
+            UNKNOWN_NODE("NODE_WHEN", vals, COMPILE_NG);
+        }
+        node = node->nd_next;
     }
     /* else */
     add_trace_branch_coverage(
         iseq,
-	ret,
+        ret,
         node ? node : orig_node,
         branch_id,
-	"else",
-	branches);
+        "else",
+        branches);
     CHECK(COMPILE_(ret, "else", node, popped));
     ADD_INSNL(ret, orig_node, jump, endlabel);
 
@@ -7126,11 +7411,11 @@ compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     push_ensure_entry(iseq, &enl, NULL, NULL);
 
     if (node->nd_state == 1) {
-	ADD_INSNL(ret, line_node, jump, next_label);
+        ADD_INSNL(ret, line_node, jump, next_label);
     }
     else {
-	tmp_label = NEW_LABEL(line);
-	ADD_INSNL(ret, line_node, jump, tmp_label);
+        tmp_label = NEW_LABEL(line);
+        ADD_INSNL(ret, line_node, jump, tmp_label);
     }
     ADD_LABEL(ret, adjust_label);
     ADD_INSN(ret, line_node, putnil);
@@ -7143,48 +7428,48 @@ compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     branches = decl_branch_base(iseq, node, type == NODE_WHILE ? "while" : "until");
     add_trace_branch_coverage(
         iseq,
-	ret,
+        ret,
         node->nd_body ? node->nd_body : node,
         0,
-	"body",
-	branches);
+        "body",
+        branches);
     CHECK(COMPILE_POPPED(ret, "while body", node->nd_body));
     ADD_LABEL(ret, next_label);	/* next */
 
     if (type == NODE_WHILE) {
-	compile_branch_condition(iseq, ret, node->nd_cond,
-				 redo_label, end_label);
+        compile_branch_condition(iseq, ret, node->nd_cond,
+                                 redo_label, end_label);
     }
     else {
-	/* until */
-	compile_branch_condition(iseq, ret, node->nd_cond,
-				 end_label, redo_label);
+        /* until */
+        compile_branch_condition(iseq, ret, node->nd_cond,
+                                 end_label, redo_label);
     }
 
     ADD_LABEL(ret, end_label);
     ADD_ADJUST_RESTORE(ret, adjust_label);
 
-    if (node->nd_state == Qundef) {
-	/* ADD_INSN(ret, line_node, putundef); */
-	COMPILE_ERROR(ERROR_ARGS "unsupported: putundef");
-	return COMPILE_NG;
+    if (UNDEF_P(node->nd_state)) {
+        /* ADD_INSN(ret, line_node, putundef); */
+        COMPILE_ERROR(ERROR_ARGS "unsupported: putundef");
+        return COMPILE_NG;
     }
     else {
-	ADD_INSN(ret, line_node, putnil);
+        ADD_INSN(ret, line_node, putnil);
     }
 
     ADD_LABEL(ret, break_label);	/* break */
 
     if (popped) {
-	ADD_INSN(ret, line_node, pop);
+        ADD_INSN(ret, line_node, pop);
     }
 
     ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label, NULL,
-		    break_label);
+                    break_label);
     ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, NULL,
-		    next_catch_label);
+                    next_catch_label);
     ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, NULL,
-		    ISEQ_COMPILE_DATA(iseq)->redo_label);
+                    ISEQ_COMPILE_DATA(iseq)->redo_label);
 
     ISEQ_COMPILE_DATA(iseq)->start_label = prev_start_label;
     ISEQ_COMPILE_DATA(iseq)->end_label = prev_end_label;
@@ -7206,23 +7491,46 @@ compile_iter(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
 
     ADD_LABEL(ret, retry_label);
     if (nd_type_p(node, NODE_FOR)) {
-	CHECK(COMPILE(ret, "iter caller (for)", node->nd_iter));
+        CHECK(COMPILE(ret, "iter caller (for)", node->nd_iter));
 
-	ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
-	    NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
-			   ISEQ_TYPE_BLOCK, line);
-	ADD_SEND_WITH_BLOCK(ret, line_node, idEach, INT2FIX(0), child_iseq);
+        ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
+            NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+                           ISEQ_TYPE_BLOCK, line);
+        ADD_SEND_WITH_BLOCK(ret, line_node, idEach, INT2FIX(0), child_iseq);
     }
     else {
-	ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
-	    NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
-			   ISEQ_TYPE_BLOCK, line);
-	CHECK(COMPILE(ret, "iter caller", node->nd_iter));
+        ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
+            NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+                           ISEQ_TYPE_BLOCK, line);
+        CHECK(COMPILE(ret, "iter caller", node->nd_iter));
+    }
+
+    {
+        // 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;
+        }
     }
-    ADD_LABEL(ret, retry_end_l);
 
     if (popped) {
-	ADD_INSN(ret, line_node, pop);
+        ADD_INSN(ret, line_node, pop);
     }
 
     ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
@@ -7269,39 +7577,39 @@ compile_break(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     unsigned long throw_flag = 0;
 
     if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0 && can_add_ensure_iseq(iseq)) {
-	/* while/until */
-	LABEL *splabel = NEW_LABEL(0);
-	ADD_LABEL(ret, splabel);
-	ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	CHECK(COMPILE_(ret, "break val (while/until)", node->nd_stts,
-		       ISEQ_COMPILE_DATA(iseq)->loopval_popped));
-	add_ensure_iseq(ret, iseq, 0);
-	ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
-	ADD_ADJUST_RESTORE(ret, splabel);
-
-	if (!popped) {
-	    ADD_INSN(ret, line_node, putnil);
-	}
+        /* while/until */
+        LABEL *splabel = NEW_LABEL(0);
+        ADD_LABEL(ret, splabel);
+        ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
+        CHECK(COMPILE_(ret, "break val (while/until)", node->nd_stts,
+                       ISEQ_COMPILE_DATA(iseq)->loopval_popped));
+        add_ensure_iseq(ret, iseq, 0);
+        ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+        ADD_ADJUST_RESTORE(ret, splabel);
+
+        if (!popped) {
+            ADD_INSN(ret, line_node, putnil);
+        }
     }
     else {
         const rb_iseq_t *ip = iseq;
 
-	while (ip) {
-	    if (!ISEQ_COMPILE_DATA(ip)) {
-		ip = 0;
-		break;
-	    }
+        while (ip) {
+            if (!ISEQ_COMPILE_DATA(ip)) {
+                ip = 0;
+                break;
+            }
 
-	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+            if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
                 throw_flag = VM_THROW_NO_ESCAPE_FLAG;
-	    }
+            }
             else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_BLOCK) {
                 throw_flag = 0;
-	    }
+            }
             else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_EVAL) {
                 COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with break");
                 return COMPILE_NG;
-	    }
+            }
             else {
                 ip = ISEQ_BODY(ip)->parent_iseq;
                 continue;
@@ -7314,9 +7622,9 @@ compile_break(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
                 ADD_INSN(ret, line_node, pop);
             }
             return COMPILE_OK;
-	}
-	COMPILE_ERROR(ERROR_ARGS "Invalid break");
-	return COMPILE_NG;
+        }
+        COMPILE_ERROR(ERROR_ARGS "Invalid break");
+        return COMPILE_NG;
     }
     return COMPILE_OK;
 }
@@ -7328,69 +7636,68 @@ compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     unsigned long throw_flag = 0;
 
     if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0 && can_add_ensure_iseq(iseq)) {
-	LABEL *splabel = NEW_LABEL(0);
-	debugs("next in while loop\n");
-	ADD_LABEL(ret, splabel);
-	CHECK(COMPILE(ret, "next val/valid syntax?", node->nd_stts));
-	add_ensure_iseq(ret, iseq, 0);
-	ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
-	ADD_ADJUST_RESTORE(ret, splabel);
-	if (!popped) {
-	    ADD_INSN(ret, line_node, putnil);
-	}
+        LABEL *splabel = NEW_LABEL(0);
+        debugs("next in while loop\n");
+        ADD_LABEL(ret, splabel);
+        CHECK(COMPILE(ret, "next val/valid syntax?", node->nd_stts));
+        add_ensure_iseq(ret, iseq, 0);
+        ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
+        ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+        ADD_ADJUST_RESTORE(ret, splabel);
+        if (!popped) {
+            ADD_INSN(ret, line_node, putnil);
+        }
     }
     else if (ISEQ_COMPILE_DATA(iseq)->end_label && can_add_ensure_iseq(iseq)) {
-	LABEL *splabel = NEW_LABEL(0);
-	debugs("next in block\n");
-	ADD_LABEL(ret, splabel);
-	ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->start_label);
-	CHECK(COMPILE(ret, "next val", node->nd_stts));
-	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);
-	}
+        LABEL *splabel = NEW_LABEL(0);
+        debugs("next in block\n");
+        ADD_LABEL(ret, splabel);
+        ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->start_label);
+        CHECK(COMPILE(ret, "next val", node->nd_stts));
+        add_ensure_iseq(ret, iseq, 0);
+        ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+        ADD_ADJUST_RESTORE(ret, splabel);
+
+        if (!popped) {
+            ADD_INSN(ret, line_node, putnil);
+        }
     }
     else {
-	const rb_iseq_t *ip = iseq;
+        const rb_iseq_t *ip = iseq;
 
-	while (ip) {
-	    if (!ISEQ_COMPILE_DATA(ip)) {
-		ip = 0;
-		break;
-	    }
+        while (ip) {
+            if (!ISEQ_COMPILE_DATA(ip)) {
+                ip = 0;
+                break;
+            }
 
             throw_flag = VM_THROW_NO_ESCAPE_FLAG;
-	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		/* while loop */
-		break;
-	    }
+            if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+                /* while loop */
+                break;
+            }
             else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_BLOCK) {
-		break;
-	    }
+                break;
+            }
             else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_EVAL) {
                 COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
                 return COMPILE_NG;
-	    }
+            }
 
             ip = ISEQ_BODY(ip)->parent_iseq;
-	}
-	if (ip != 0) {
-	    CHECK(COMPILE(ret, "next val", node->nd_stts));
+        }
+        if (ip != 0) {
+            CHECK(COMPILE(ret, "next val", node->nd_stts));
             ADD_INSN1(ret, line_node, throw, INT2FIX(throw_flag | TAG_NEXT));
 
-	    if (popped) {
-		ADD_INSN(ret, line_node, pop);
-	    }
-	}
-	else {
-	    COMPILE_ERROR(ERROR_ARGS "Invalid next");
-	    return COMPILE_NG;
-	}
+            if (popped) {
+                ADD_INSN(ret, line_node, pop);
+            }
+        }
+        else {
+            COMPILE_ERROR(ERROR_ARGS "Invalid next");
+            return COMPILE_NG;
+        }
     }
     return COMPILE_OK;
 }
@@ -7401,65 +7708,65 @@ compile_redo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     const NODE *line_node = node;
 
     if (ISEQ_COMPILE_DATA(iseq)->redo_label && can_add_ensure_iseq(iseq)) {
-	LABEL *splabel = NEW_LABEL(0);
-	debugs("redo in while");
-	ADD_LABEL(ret, splabel);
-	ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	add_ensure_iseq(ret, iseq, 0);
-	ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	ADD_ADJUST_RESTORE(ret, splabel);
-	if (!popped) {
-	    ADD_INSN(ret, line_node, putnil);
-	}
+        LABEL *splabel = NEW_LABEL(0);
+        debugs("redo in while");
+        ADD_LABEL(ret, splabel);
+        ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->redo_label);
+        add_ensure_iseq(ret, iseq, 0);
+        ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
+        ADD_ADJUST_RESTORE(ret, splabel);
+        if (!popped) {
+            ADD_INSN(ret, line_node, putnil);
+        }
     }
     else if (ISEQ_BODY(iseq)->type != ISEQ_TYPE_EVAL && ISEQ_COMPILE_DATA(iseq)->start_label && can_add_ensure_iseq(iseq)) {
-	LABEL *splabel = NEW_LABEL(0);
+        LABEL *splabel = NEW_LABEL(0);
 
-	debugs("redo in block");
-	ADD_LABEL(ret, splabel);
-	add_ensure_iseq(ret, iseq, 0);
-	ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->start_label);
-	ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
-	ADD_ADJUST_RESTORE(ret, splabel);
+        debugs("redo in block");
+        ADD_LABEL(ret, splabel);
+        add_ensure_iseq(ret, iseq, 0);
+        ADD_ADJUST(ret, line_node, ISEQ_COMPILE_DATA(iseq)->start_label);
+        ADD_INSNL(ret, line_node, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+        ADD_ADJUST_RESTORE(ret, splabel);
 
-	if (!popped) {
-	    ADD_INSN(ret, line_node, putnil);
-	}
+        if (!popped) {
+            ADD_INSN(ret, line_node, putnil);
+        }
     }
     else {
-	const rb_iseq_t *ip = iseq;
+        const rb_iseq_t *ip = iseq;
 
-	while (ip) {
-	    if (!ISEQ_COMPILE_DATA(ip)) {
-		ip = 0;
-		break;
-	    }
+        while (ip) {
+            if (!ISEQ_COMPILE_DATA(ip)) {
+                ip = 0;
+                break;
+            }
 
-	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		break;
-	    }
+            if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+                break;
+            }
             else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_BLOCK) {
-		break;
-	    }
+                break;
+            }
             else if (ISEQ_BODY(ip)->type == ISEQ_TYPE_EVAL) {
                 COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
                 return COMPILE_NG;
-	    }
+            }
 
             ip = ISEQ_BODY(ip)->parent_iseq;
-	}
-	if (ip != 0) {
-	    ADD_INSN(ret, line_node, putnil);
+        }
+        if (ip != 0) {
+            ADD_INSN(ret, line_node, putnil);
             ADD_INSN1(ret, line_node, throw, INT2FIX(VM_THROW_NO_ESCAPE_FLAG | TAG_REDO));
 
-	    if (popped) {
-		ADD_INSN(ret, line_node, pop);
-	    }
-	}
-	else {
-	    COMPILE_ERROR(ERROR_ARGS "Invalid redo");
-	    return COMPILE_NG;
-	}
+            if (popped) {
+                ADD_INSN(ret, line_node, pop);
+            }
+        }
+        else {
+            COMPILE_ERROR(ERROR_ARGS "Invalid redo");
+            return COMPILE_NG;
+        }
     }
     return COMPILE_OK;
 }
@@ -7470,16 +7777,16 @@ compile_retry(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     const NODE *line_node = node;
 
     if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_RESCUE) {
-	ADD_INSN(ret, line_node, putnil);
-	ADD_INSN1(ret, line_node, throw, INT2FIX(TAG_RETRY));
+        ADD_INSN(ret, line_node, putnil);
+        ADD_INSN1(ret, line_node, throw, INT2FIX(TAG_RETRY));
 
-	if (popped) {
-	    ADD_INSN(ret, line_node, pop);
-	}
+        if (popped) {
+            ADD_INSN(ret, line_node, pop);
+        }
     }
     else {
-	COMPILE_ERROR(ERROR_ARGS "Invalid retry");
-	return COMPILE_NG;
+        COMPILE_ERROR(ERROR_ARGS "Invalid retry");
+        return COMPILE_NG;
     }
     return COMPILE_OK;
 }
@@ -7510,14 +7817,14 @@ compile_rescue(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 
     ADD_LABEL(ret, lend);
     if (node->nd_else) {
-	ADD_INSN(ret, line_node, pop);
-	CHECK(COMPILE(ret, "rescue else", node->nd_else));
+        ADD_INSN(ret, line_node, pop);
+        CHECK(COMPILE(ret, "rescue else", node->nd_else));
     }
     ADD_INSN(ret, line_node, nop);
     ADD_LABEL(ret, lcont);
 
     if (popped) {
-	ADD_INSN(ret, line_node, pop);
+        ADD_INSN(ret, line_node, pop);
     }
 
     /* register catch entry */
@@ -7536,48 +7843,48 @@ compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     LABEL *label_miss, *label_hit;
 
     while (resq) {
-	label_miss = NEW_LABEL(line);
-	label_hit = NEW_LABEL(line);
-
-	narg = resq->nd_args;
-	if (narg) {
-	    switch (nd_type(narg)) {
-	      case NODE_LIST:
-		while (narg) {
-		    ADD_GETLOCAL(ret, line_node, LVAR_ERRINFO, 0);
-		    CHECK(COMPILE(ret, "rescue arg", narg->nd_head));
-		    ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
-		    ADD_INSNL(ret, line_node, branchif, label_hit);
-		    narg = narg->nd_next;
-		}
-		break;
-	      case NODE_SPLAT:
-	      case NODE_ARGSCAT:
-	      case NODE_ARGSPUSH:
-		ADD_GETLOCAL(ret, line_node, LVAR_ERRINFO, 0);
-		CHECK(COMPILE(ret, "rescue/cond splat", narg));
-		ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY));
-		ADD_INSNL(ret, line_node, branchif, label_hit);
-		break;
-	      default:
-		UNKNOWN_NODE("NODE_RESBODY", narg, COMPILE_NG);
-	    }
-	}
-	else {
-	    ADD_GETLOCAL(ret, line_node, LVAR_ERRINFO, 0);
-	    ADD_INSN1(ret, line_node, putobject, rb_eStandardError);
-	    ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
-	    ADD_INSNL(ret, line_node, branchif, label_hit);
-	}
-	ADD_INSNL(ret, line_node, jump, label_miss);
-	ADD_LABEL(ret, label_hit);
-	CHECK(COMPILE(ret, "resbody body", resq->nd_body));
-	if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) {
-	    ADD_INSN(ret, line_node, nop);
-	}
-	ADD_INSN(ret, line_node, leave);
-	ADD_LABEL(ret, label_miss);
-	resq = resq->nd_head;
+        label_miss = NEW_LABEL(line);
+        label_hit = NEW_LABEL(line);
+
+        narg = resq->nd_args;
+        if (narg) {
+            switch (nd_type(narg)) {
+              case NODE_LIST:
+                while (narg) {
+                    ADD_GETLOCAL(ret, line_node, LVAR_ERRINFO, 0);
+                    CHECK(COMPILE(ret, "rescue arg", narg->nd_head));
+                    ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+                    ADD_INSNL(ret, line_node, branchif, label_hit);
+                    narg = narg->nd_next;
+                }
+                break;
+              case NODE_SPLAT:
+              case NODE_ARGSCAT:
+              case NODE_ARGSPUSH:
+                ADD_GETLOCAL(ret, line_node, LVAR_ERRINFO, 0);
+                CHECK(COMPILE(ret, "rescue/cond splat", narg));
+                ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY));
+                ADD_INSNL(ret, line_node, branchif, label_hit);
+                break;
+              default:
+                UNKNOWN_NODE("NODE_RESBODY", narg, COMPILE_NG);
+            }
+        }
+        else {
+            ADD_GETLOCAL(ret, line_node, LVAR_ERRINFO, 0);
+            ADD_INSN1(ret, line_node, putobject, rb_eStandardError);
+            ADD_INSN1(ret, line_node, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+            ADD_INSNL(ret, line_node, branchif, label_hit);
+        }
+        ADD_INSNL(ret, line_node, jump, label_miss);
+        ADD_LABEL(ret, label_hit);
+        CHECK(COMPILE(ret, "resbody body", resq->nd_body));
+        if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) {
+            ADD_INSN(ret, line_node, nop);
+        }
+        ADD_INSN(ret, line_node, leave);
+        ADD_LABEL(ret, label_miss);
+        resq = resq->nd_head;
     }
     return COMPILE_OK;
 }
@@ -7590,7 +7897,7 @@ compile_ensure(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     DECL_ANCHOR(ensr);
     const rb_iseq_t *ensure = NEW_CHILD_ISEQ(node->nd_ensr,
                                              rb_str_concat(rb_str_new2 ("ensure in "), ISEQ_BODY(iseq)->location.label),
-					     ISEQ_TYPE_ENSURE, line);
+                                             ISEQ_TYPE_ENSURE, line);
     LABEL *lstart = NEW_LABEL(line);
     LABEL *lend = NEW_LABEL(line);
     LABEL *lcont = NEW_LABEL(line);
@@ -7620,11 +7927,11 @@ compile_ensure(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 
     erange = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->erange;
     if (lstart->link.next != &lend->link) {
-	while (erange) {
-	    ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
-			    ensure, lcont);
-	    erange = erange->next;
-	}
+        while (erange) {
+            ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
+                            ensure, lcont);
+            erange = erange->next;
+        }
     }
 
     ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev;
@@ -7637,55 +7944,55 @@ compile_return(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     const NODE *line_node = node;
 
     if (iseq) {
-        enum iseq_type type = ISEQ_BODY(iseq)->type;
-	const rb_iseq_t *is = iseq;
-	enum iseq_type t = type;
-	const NODE *retval = node->nd_stts;
-	LABEL *splabel = 0;
+        enum rb_iseq_type type = ISEQ_BODY(iseq)->type;
+        const rb_iseq_t *is = iseq;
+        enum rb_iseq_type t = type;
+        const NODE *retval = node->nd_stts;
+        LABEL *splabel = 0;
 
-	while (t == ISEQ_TYPE_RESCUE || t == ISEQ_TYPE_ENSURE) {
+        while (t == ISEQ_TYPE_RESCUE || t == ISEQ_TYPE_ENSURE) {
             if (!(is = ISEQ_BODY(is)->parent_iseq)) break;
             t = ISEQ_BODY(is)->type;
-	}
-	switch (t) {
-	  case ISEQ_TYPE_TOP:
-	  case ISEQ_TYPE_MAIN:
+        }
+        switch (t) {
+          case ISEQ_TYPE_TOP:
+          case ISEQ_TYPE_MAIN:
             if (retval) {
                 rb_warn("argument of top-level return is ignored");
             }
-	    if (is == iseq) {
-		/* plain top-level, leave directly */
-		type = ISEQ_TYPE_METHOD;
-	    }
-	    break;
-	  default:
-	    break;
-	}
-
-	if (type == ISEQ_TYPE_METHOD) {
-	    splabel = NEW_LABEL(0);
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line_node, 0);
-	}
-
-	CHECK(COMPILE(ret, "return nd_stts (return val)", retval));
-
-	if (type == ISEQ_TYPE_METHOD && can_add_ensure_iseq(iseq)) {
-	    add_ensure_iseq(ret, iseq, 1);
-	    ADD_TRACE(ret, RUBY_EVENT_RETURN);
-	    ADD_INSN(ret, line_node, leave);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-
-	    if (!popped) {
-		ADD_INSN(ret, line_node, putnil);
-	    }
-	}
-	else {
-	    ADD_INSN1(ret, line_node, throw, INT2FIX(TAG_RETURN));
-	    if (popped) {
-		ADD_INSN(ret, line_node, pop);
-	    }
-	}
+            if (is == iseq) {
+                /* plain top-level, leave directly */
+                type = ISEQ_TYPE_METHOD;
+            }
+            break;
+          default:
+            break;
+        }
+
+        if (type == ISEQ_TYPE_METHOD) {
+            splabel = NEW_LABEL(0);
+            ADD_LABEL(ret, splabel);
+            ADD_ADJUST(ret, line_node, 0);
+        }
+
+        CHECK(COMPILE(ret, "return nd_stts (return val)", retval));
+
+        if (type == ISEQ_TYPE_METHOD && can_add_ensure_iseq(iseq)) {
+            add_ensure_iseq(ret, iseq, 1);
+            ADD_TRACE(ret, RUBY_EVENT_RETURN);
+            ADD_INSN(ret, line_node, leave);
+            ADD_ADJUST_RESTORE(ret, splabel);
+
+            if (!popped) {
+                ADD_INSN(ret, line_node, putnil);
+            }
+        }
+        else {
+            ADD_INSN1(ret, line_node, throw, INT2FIX(TAG_RETURN));
+            if (popped) {
+                ADD_INSN(ret, line_node, pop);
+            }
+        }
     }
     return COMPILE_OK;
 }
@@ -7697,7 +8004,7 @@ compile_evstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
 
     if (!popped && !all_string_result_p(node)) {
         const NODE *line_node = node;
-	const unsigned int flag = VM_CALL_FCALL;
+        const unsigned int flag = VM_CALL_FCALL;
 
         // Note, this dup could be removed if we are willing to change anytostring. It pops
         // two VALUEs off the stack when it could work by replacing the top most VALUE.
@@ -7992,7 +8299,7 @@ compile_builtin_mandatory_only_method(rb_iseq_t *iseq, const NODE *node, const N
     ISEQ_BODY(iseq)->mandatory_only_iseq =
       rb_iseq_new_with_opt(&ast, rb_iseq_base_label(iseq),
                            rb_iseq_path(iseq), rb_iseq_realpath(iseq),
-                           INT2FIX(nd_line(line_node)), NULL, 0,
+                           nd_line(line_node), NULL, 0,
                            ISEQ_TYPE_METHOD, ISEQ_COMPILE_DATA(iseq)->option);
 
     GET_VM()->builtin_inline_index = prev_inline_index;
@@ -8285,106 +8592,106 @@ compile_op_asgn1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
      */
 
     if (!popped) {
-	ADD_INSN(ret, node, putnil);
+        ADD_INSN(ret, node, putnil);
     }
     asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node);
     CHECK(asgnflag != -1);
     switch (nd_type(node->nd_args->nd_head)) {
       case NODE_ZLIST:
-	argc = INT2FIX(0);
-	break;
+        argc = INT2FIX(0);
+        break;
       case NODE_BLOCK_PASS:
-	boff = 1;
-	/* fall through */
+        boff = 1;
+        /* fall through */
       default:
-	argc = setup_args(iseq, ret, node->nd_args->nd_head, &flag, NULL);
-	CHECK(!NIL_P(argc));
+        argc = setup_args(iseq, ret, node->nd_args->nd_head, &flag, NULL);
+        CHECK(!NIL_P(argc));
     }
     ADD_INSN1(ret, node, dupn, FIXNUM_INC(argc, 1 + boff));
     flag |= asgnflag;
     ADD_SEND_WITH_FLAG(ret, node, idAREF, argc, INT2FIX(flag));
 
     if (id == idOROP || id == idANDOP) {
-	/* a[x] ||= y  or  a[x] &&= y
-
-	   unless/if a[x]
-	   a[x]= y
-	   else
-	   nil
-	   end
-	*/
-	LABEL *label = NEW_LABEL(line);
-	LABEL *lfin = NEW_LABEL(line);
-
-	ADD_INSN(ret, node, dup);
-	if (id == idOROP) {
-	    ADD_INSNL(ret, node, branchif, label);
-	}
-	else { /* idANDOP */
-	    ADD_INSNL(ret, node, branchunless, label);
-	}
-	ADD_INSN(ret, node, pop);
-
-	CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
-	if (!popped) {
-	    ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
-	}
-	if (flag & VM_CALL_ARGS_SPLAT) {
-	    ADD_INSN1(ret, node, newarray, INT2FIX(1));
-	    if (boff > 0) {
-		ADD_INSN1(ret, node, dupn, INT2FIX(3));
-		ADD_INSN(ret, node, swap);
-		ADD_INSN(ret, node, pop);
-	    }
-	    ADD_INSN(ret, node, concatarray);
-	    if (boff > 0) {
-		ADD_INSN1(ret, node, setn, INT2FIX(3));
-		ADD_INSN(ret, node, pop);
-		ADD_INSN(ret, node, pop);
-	    }
-	    ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag));
-	}
-	else {
-	    if (boff > 0)
-		ADD_INSN(ret, node, swap);
-	    ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
-	}
-	ADD_INSN(ret, node, pop);
-	ADD_INSNL(ret, node, jump, lfin);
-	ADD_LABEL(ret, label);
-	if (!popped) {
-	    ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
-	}
-	ADD_INSN1(ret, node, adjuststack, FIXNUM_INC(argc, 2+boff));
-	ADD_LABEL(ret, lfin);
+        /* a[x] ||= y  or  a[x] &&= y
+
+           unless/if a[x]
+           a[x]= y
+           else
+           nil
+           end
+        */
+        LABEL *label = NEW_LABEL(line);
+        LABEL *lfin = NEW_LABEL(line);
+
+        ADD_INSN(ret, node, dup);
+        if (id == idOROP) {
+            ADD_INSNL(ret, node, branchif, label);
+        }
+        else { /* idANDOP */
+            ADD_INSNL(ret, node, branchunless, label);
+        }
+        ADD_INSN(ret, node, pop);
+
+        CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+        if (!popped) {
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
+        }
+        if (flag & VM_CALL_ARGS_SPLAT) {
+            ADD_INSN1(ret, node, newarray, INT2FIX(1));
+            if (boff > 0) {
+                ADD_INSN1(ret, node, dupn, INT2FIX(3));
+                ADD_INSN(ret, node, swap);
+                ADD_INSN(ret, node, pop);
+            }
+            ADD_INSN(ret, node, concatarray);
+            if (boff > 0) {
+                ADD_INSN1(ret, node, setn, INT2FIX(3));
+                ADD_INSN(ret, node, pop);
+                ADD_INSN(ret, node, pop);
+            }
+            ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag));
+        }
+        else {
+            if (boff > 0)
+                ADD_INSN(ret, node, swap);
+            ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
+        }
+        ADD_INSN(ret, node, pop);
+        ADD_INSNL(ret, node, jump, lfin);
+        ADD_LABEL(ret, label);
+        if (!popped) {
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
+        }
+        ADD_INSN1(ret, node, adjuststack, FIXNUM_INC(argc, 2+boff));
+        ADD_LABEL(ret, lfin);
     }
     else {
-	CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
-	ADD_SEND(ret, node, id, INT2FIX(1));
-	if (!popped) {
-	    ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
-	}
-	if (flag & VM_CALL_ARGS_SPLAT) {
-	    ADD_INSN1(ret, node, newarray, INT2FIX(1));
-	    if (boff > 0) {
-		ADD_INSN1(ret, node, dupn, INT2FIX(3));
-		ADD_INSN(ret, node, swap);
-		ADD_INSN(ret, node, pop);
-	    }
-	    ADD_INSN(ret, node, concatarray);
-	    if (boff > 0) {
-		ADD_INSN1(ret, node, setn, INT2FIX(3));
-		ADD_INSN(ret, node, pop);
-		ADD_INSN(ret, node, pop);
-	    }
-	    ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag));
-	}
-	else {
-	    if (boff > 0)
-		ADD_INSN(ret, node, swap);
-	    ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
-	}
-	ADD_INSN(ret, node, pop);
+        CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+        ADD_SEND(ret, node, id, INT2FIX(1));
+        if (!popped) {
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2+boff));
+        }
+        if (flag & VM_CALL_ARGS_SPLAT) {
+            ADD_INSN1(ret, node, newarray, INT2FIX(1));
+            if (boff > 0) {
+                ADD_INSN1(ret, node, dupn, INT2FIX(3));
+                ADD_INSN(ret, node, swap);
+                ADD_INSN(ret, node, pop);
+            }
+            ADD_INSN(ret, node, concatarray);
+            if (boff > 0) {
+                ADD_INSN1(ret, node, setn, INT2FIX(3));
+                ADD_INSN(ret, node, pop);
+                ADD_INSN(ret, node, pop);
+            }
+            ADD_SEND_WITH_FLAG(ret, node, idASET, argc, INT2FIX(flag));
+        }
+        else {
+            if (boff > 0)
+                ADD_INSN(ret, node, swap);
+            ADD_SEND_WITH_FLAG(ret, node, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
+        }
+        ADD_INSN(ret, node, pop);
     }
     return COMPILE_OK;
 }
@@ -8424,6 +8731,17 @@ compile_op_asgn2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
       lfin:       # o ?
       pop       # o
 
+      # or (popped)
+      if lcfin  # r
+      eval v    # r v
+      send a=   # ?
+      jump lfin # ?
+
+      lcfin:      # r
+
+      lfin:       # ?
+      pop       #
+
       # and
       dup       # r o o
       unless lcfin
@@ -8444,56 +8762,56 @@ compile_op_asgn2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node);
     CHECK(asgnflag != -1);
     if (node->nd_next->nd_aid) {
-	lskip = NEW_LABEL(line);
-	ADD_INSN(ret, node, dup);
-	ADD_INSNL(ret, node, branchnil, lskip);
+        lskip = NEW_LABEL(line);
+        ADD_INSN(ret, node, dup);
+        ADD_INSNL(ret, node, branchnil, lskip);
     }
     ADD_INSN(ret, node, dup);
     ADD_SEND_WITH_FLAG(ret, node, vid, INT2FIX(0), INT2FIX(asgnflag));
 
     if (atype == idOROP || atype == idANDOP) {
-	ADD_INSN(ret, node, dup);
-	if (atype == idOROP) {
-	    ADD_INSNL(ret, node, branchif, lcfin);
-	}
-	else { /* idANDOP */
-	    ADD_INSNL(ret, node, branchunless, lcfin);
-	}
-	ADD_INSN(ret, node, pop);
-	CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
-	ADD_INSN(ret, node, swap);
-	ADD_INSN1(ret, node, topn, INT2FIX(1));
-	ADD_SEND_WITH_FLAG(ret, node, aid, INT2FIX(1), INT2FIX(asgnflag));
-	ADD_INSNL(ret, node, jump, lfin);
-
-	ADD_LABEL(ret, lcfin);
-	ADD_INSN(ret, node, swap);
-
-	ADD_LABEL(ret, lfin);
-	ADD_INSN(ret, node, pop);
-	if (lskip) {
-	    ADD_LABEL(ret, lskip);
-	}
-	if (popped) {
-	    /* we can apply more optimize */
-	    ADD_INSN(ret, node, pop);
-	}
+        if (!popped) {
+            ADD_INSN(ret, node, dup);
+        }
+        if (atype == idOROP) {
+            ADD_INSNL(ret, node, branchif, lcfin);
+        }
+        else { /* idANDOP */
+            ADD_INSNL(ret, node, branchunless, lcfin);
+        }
+        if (!popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
+        if (!popped) {
+            ADD_INSN(ret, node, swap);
+            ADD_INSN1(ret, node, topn, INT2FIX(1));
+        }
+        ADD_SEND_WITH_FLAG(ret, node, aid, INT2FIX(1), INT2FIX(asgnflag));
+        ADD_INSNL(ret, node, jump, lfin);
+
+        ADD_LABEL(ret, lcfin);
+        if (!popped) {
+            ADD_INSN(ret, node, swap);
+        }
+
+        ADD_LABEL(ret, lfin);
     }
     else {
-	CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
-	ADD_SEND(ret, node, atype, INT2FIX(1));
-	if (!popped) {
-	    ADD_INSN(ret, node, swap);
-	    ADD_INSN1(ret, node, topn, INT2FIX(1));
-	}
-	ADD_SEND_WITH_FLAG(ret, node, aid, INT2FIX(1), INT2FIX(asgnflag));
-	if (lskip && popped) {
-	    ADD_LABEL(ret, lskip);
-	}
-	ADD_INSN(ret, node, pop);
-	if (lskip && !popped) {
-	    ADD_LABEL(ret, lskip);
-	}
+        CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
+        ADD_SEND(ret, node, atype, INT2FIX(1));
+        if (!popped) {
+            ADD_INSN(ret, node, swap);
+            ADD_INSN1(ret, node, topn, INT2FIX(1));
+        }
+        ADD_SEND_WITH_FLAG(ret, node, aid, INT2FIX(1), INT2FIX(asgnflag));
+    }
+    if (lskip && popped) {
+        ADD_LABEL(ret, lskip);
+    }
+    ADD_INSN(ret, node, pop);
+    if (lskip && !popped) {
+        ADD_LABEL(ret, lskip);
     }
     return COMPILE_OK;
 }
@@ -8508,63 +8826,63 @@ compile_op_cdecl(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
 
     switch (nd_type(node->nd_head)) {
       case NODE_COLON3:
-	ADD_INSN1(ret, node, putobject, rb_cObject);
-	break;
+        ADD_INSN1(ret, node, putobject, rb_cObject);
+        break;
       case NODE_COLON2:
-	CHECK(COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head));
-	break;
+        CHECK(COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head));
+        break;
       default:
-	COMPILE_ERROR(ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
-		      ruby_node_name(nd_type(node->nd_head)));
-	return COMPILE_NG;
+        COMPILE_ERROR(ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
+                      ruby_node_name(nd_type(node->nd_head)));
+        return COMPILE_NG;
     }
     mid = node->nd_head->nd_mid;
     /* cref */
     if (node->nd_aid == idOROP) {
-	lassign = NEW_LABEL(line);
-	ADD_INSN(ret, node, dup); /* cref cref */
-	ADD_INSN3(ret, node, defined, INT2FIX(DEFINED_CONST_FROM),
-		  ID2SYM(mid), Qtrue); /* cref bool */
-	ADD_INSNL(ret, node, branchunless, lassign); /* cref */
+        lassign = NEW_LABEL(line);
+        ADD_INSN(ret, node, dup); /* cref cref */
+        ADD_INSN3(ret, node, defined, INT2FIX(DEFINED_CONST_FROM),
+                  ID2SYM(mid), Qtrue); /* cref bool */
+        ADD_INSNL(ret, node, branchunless, lassign); /* cref */
     }
     ADD_INSN(ret, node, dup); /* cref cref */
     ADD_INSN1(ret, node, putobject, Qtrue);
     ADD_INSN1(ret, node, getconstant, ID2SYM(mid)); /* cref obj */
 
     if (node->nd_aid == idOROP || node->nd_aid == idANDOP) {
-	lfin = NEW_LABEL(line);
-	if (!popped) ADD_INSN(ret, node, dup); /* cref [obj] obj */
-	if (node->nd_aid == idOROP)
-	    ADD_INSNL(ret, node, branchif, lfin);
-	else /* idANDOP */
-	    ADD_INSNL(ret, node, branchunless, lfin);
-	/* cref [obj] */
-	if (!popped) ADD_INSN(ret, node, pop); /* cref */
-	if (lassign) ADD_LABEL(ret, lassign);
-	CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
-	/* cref value */
-	if (popped)
-	    ADD_INSN1(ret, node, topn, INT2FIX(1)); /* cref value cref */
-	else {
-	    ADD_INSN1(ret, node, dupn, INT2FIX(2)); /* cref value cref value */
-	    ADD_INSN(ret, node, swap); /* cref value value cref */
-	}
-	ADD_INSN1(ret, node, setconstant, ID2SYM(mid)); /* cref [value] */
-	ADD_LABEL(ret, lfin);			    /* cref [value] */
-	if (!popped) ADD_INSN(ret, node, swap); /* [value] cref */
-	ADD_INSN(ret, node, pop); /* [value] */
+        lfin = NEW_LABEL(line);
+        if (!popped) ADD_INSN(ret, node, dup); /* cref [obj] obj */
+        if (node->nd_aid == idOROP)
+            ADD_INSNL(ret, node, branchif, lfin);
+        else /* idANDOP */
+            ADD_INSNL(ret, node, branchunless, lfin);
+        /* cref [obj] */
+        if (!popped) ADD_INSN(ret, node, pop); /* cref */
+        if (lassign) ADD_LABEL(ret, lassign);
+        CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+        /* cref value */
+        if (popped)
+            ADD_INSN1(ret, node, topn, INT2FIX(1)); /* cref value cref */
+        else {
+            ADD_INSN1(ret, node, dupn, INT2FIX(2)); /* cref value cref value */
+            ADD_INSN(ret, node, swap); /* cref value value cref */
+        }
+        ADD_INSN1(ret, node, setconstant, ID2SYM(mid)); /* cref [value] */
+        ADD_LABEL(ret, lfin);			    /* cref [value] */
+        if (!popped) ADD_INSN(ret, node, swap); /* [value] cref */
+        ADD_INSN(ret, node, pop); /* [value] */
     }
     else {
-	CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
-	/* cref obj value */
-	ADD_CALL(ret, node, node->nd_aid, INT2FIX(1));
-	/* cref value */
-	ADD_INSN(ret, node, swap); /* value cref */
-	if (!popped) {
-	    ADD_INSN1(ret, node, topn, INT2FIX(1)); /* value cref value */
-	    ADD_INSN(ret, node, swap); /* value value cref */
-	}
-	ADD_INSN1(ret, node, setconstant, ID2SYM(mid));
+        CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+        /* cref obj value */
+        ADD_CALL(ret, node, node->nd_aid, INT2FIX(1));
+        /* cref value */
+        ADD_INSN(ret, node, swap); /* value cref */
+        if (!popped) {
+            ADD_INSN1(ret, node, topn, INT2FIX(1)); /* value cref value */
+            ADD_INSN(ret, node, swap); /* value value cref */
+        }
+        ADD_INSN1(ret, node, setconstant, ID2SYM(mid));
     }
     return COMPILE_OK;
 }
@@ -8577,39 +8895,40 @@ compile_op_log(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     LABEL *lassign;
 
     if (type == NODE_OP_ASGN_OR && !nd_type_p(node->nd_head, NODE_IVAR)) {
-	LABEL *lfinish[2];
-	lfinish[0] = lfin;
-	lfinish[1] = 0;
-	defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
-	lassign = lfinish[1];
-	if (!lassign) {
-	    lassign = NEW_LABEL(line);
-	}
-	ADD_INSNL(ret, node, branchunless, lassign);
+        LABEL *lfinish[2];
+        lfinish[0] = lfin;
+        lfinish[1] = 0;
+        defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
+        lassign = lfinish[1];
+        if (!lassign) {
+            lassign = NEW_LABEL(line);
+        }
+        ADD_INSNL(ret, node, branchunless, lassign);
     }
     else {
-	lassign = NEW_LABEL(line);
+        lassign = NEW_LABEL(line);
     }
 
     CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head));
-    ADD_INSN(ret, node, dup);
+
+    if (!popped) {
+        ADD_INSN(ret, node, dup);
+    }
 
     if (type == NODE_OP_ASGN_AND) {
-	ADD_INSNL(ret, node, branchunless, lfin);
+        ADD_INSNL(ret, node, branchunless, lfin);
     }
     else {
-	ADD_INSNL(ret, node, branchif, lfin);
+        ADD_INSNL(ret, node, branchif, lfin);
+    }
+
+    if (!popped) {
+        ADD_INSN(ret, node, pop);
     }
 
-    ADD_INSN(ret, node, pop);
     ADD_LABEL(ret, lassign);
-    CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value));
+    CHECK(COMPILE_(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value, popped));
     ADD_LABEL(ret, lfin);
-
-    if (popped) {
-	/* we can apply more optimize */
-	ADD_INSN(ret, node, pop);
-    }
     return COMPILE_OK;
 }
 
@@ -8626,115 +8945,115 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     INIT_ANCHOR(args);
     ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
     if (type == NODE_SUPER) {
-	VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
-	CHECK(!NIL_P(vargc));
-	argc = FIX2INT(vargc);
+        VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+        CHECK(!NIL_P(vargc));
+        argc = FIX2INT(vargc);
     }
     else {
-	/* NODE_ZSUPER */
-	int i;
-	const rb_iseq_t *liseq = body->local_iseq;
+        /* NODE_ZSUPER */
+        int i;
+        const rb_iseq_t *liseq = body->local_iseq;
         const struct rb_iseq_constant_body *const local_body = ISEQ_BODY(liseq);
-	const struct rb_iseq_param_keyword *const local_kwd = local_body->param.keyword;
-	int lvar_level = get_lvar_level(iseq);
-
-	argc = local_body->param.lead_num;
-
-	/* normal arguments */
-	for (i = 0; i < local_body->param.lead_num; i++) {
-	    int idx = local_body->local_table_size - i;
-	    ADD_GETLOCAL(args, node, idx, lvar_level);
-	}
-
-	if (local_body->param.flags.has_opt) {
-	    /* optional arguments */
-	    int j;
-	    for (j = 0; j < local_body->param.opt_num; j++) {
-		int idx = local_body->local_table_size - (i + j);
-		ADD_GETLOCAL(args, node, idx, lvar_level);
-	    }
-	    i += j;
-	    argc = i;
-	}
-	if (local_body->param.flags.has_rest) {
-	    /* rest argument */
-	    int idx = local_body->local_table_size - local_body->param.rest_start;
-	    ADD_GETLOCAL(args, node, idx, lvar_level);
-	    ADD_INSN1(args, node, splatarray, Qfalse);
-
-	    argc = local_body->param.rest_start + 1;
-	    flag |= VM_CALL_ARGS_SPLAT;
-	}
-	if (local_body->param.flags.has_post) {
-	    /* post arguments */
-	    int post_len = local_body->param.post_num;
-	    int post_start = local_body->param.post_start;
-
-	    if (local_body->param.flags.has_rest) {
-		int j;
-		for (j=0; j<post_len; j++) {
-		    int idx = local_body->local_table_size - (post_start + j);
-		    ADD_GETLOCAL(args, node, idx, lvar_level);
-		}
-		ADD_INSN1(args, node, newarray, INT2FIX(j));
-		ADD_INSN (args, node, concatarray);
-		/* argc is settled at above */
-	    }
-	    else {
-		int j;
-		for (j=0; j<post_len; j++) {
-		    int idx = local_body->local_table_size - (post_start + j);
-		    ADD_GETLOCAL(args, node, idx, lvar_level);
-		}
-		argc = post_len + post_start;
-	    }
-	}
-
-	if (local_body->param.flags.has_kw) { /* TODO: support keywords */
-	    int local_size = local_body->local_table_size;
-	    argc++;
-
-	    ADD_INSN1(args, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-
-	    if (local_body->param.flags.has_kwrest) {
-		int idx = local_body->local_table_size - local_kwd->rest_start;
-		ADD_GETLOCAL(args, node, idx, lvar_level);
+        const struct rb_iseq_param_keyword *const local_kwd = local_body->param.keyword;
+        int lvar_level = get_lvar_level(iseq);
+
+        argc = local_body->param.lead_num;
+
+        /* normal arguments */
+        for (i = 0; i < local_body->param.lead_num; i++) {
+            int idx = local_body->local_table_size - i;
+            ADD_GETLOCAL(args, node, idx, lvar_level);
+        }
+
+        if (local_body->param.flags.has_opt) {
+            /* optional arguments */
+            int j;
+            for (j = 0; j < local_body->param.opt_num; j++) {
+                int idx = local_body->local_table_size - (i + j);
+                ADD_GETLOCAL(args, node, idx, lvar_level);
+            }
+            i += j;
+            argc = i;
+        }
+        if (local_body->param.flags.has_rest) {
+            /* rest argument */
+            int idx = local_body->local_table_size - local_body->param.rest_start;
+            ADD_GETLOCAL(args, node, idx, lvar_level);
+            ADD_INSN1(args, node, splatarray, Qfalse);
+
+            argc = local_body->param.rest_start + 1;
+            flag |= VM_CALL_ARGS_SPLAT;
+        }
+        if (local_body->param.flags.has_post) {
+            /* post arguments */
+            int post_len = local_body->param.post_num;
+            int post_start = local_body->param.post_start;
+
+            if (local_body->param.flags.has_rest) {
+                int j;
+                for (j=0; j<post_len; j++) {
+                    int idx = local_body->local_table_size - (post_start + j);
+                    ADD_GETLOCAL(args, node, idx, lvar_level);
+                }
+                ADD_INSN1(args, node, newarray, INT2FIX(j));
+                ADD_INSN (args, node, concatarray);
+                /* argc is settled at above */
+            }
+            else {
+                int j;
+                for (j=0; j<post_len; j++) {
+                    int idx = local_body->local_table_size - (post_start + j);
+                    ADD_GETLOCAL(args, node, idx, lvar_level);
+                }
+                argc = post_len + post_start;
+            }
+        }
+
+        if (local_body->param.flags.has_kw) { /* TODO: support keywords */
+            int local_size = local_body->local_table_size;
+            argc++;
+
+            ADD_INSN1(args, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+            if (local_body->param.flags.has_kwrest) {
+                int idx = local_body->local_table_size - local_kwd->rest_start;
+                ADD_GETLOCAL(args, node, idx, lvar_level);
                 if (local_kwd->num > 0) {
                     ADD_SEND (args, node, rb_intern("dup"), INT2FIX(0));
                     flag |= VM_CALL_KW_SPLAT_MUT;
                 }
-	    }
-	    else {
-		ADD_INSN1(args, node, newhash, INT2FIX(0));
+            }
+            else {
+                ADD_INSN1(args, node, newhash, INT2FIX(0));
                 flag |= VM_CALL_KW_SPLAT_MUT;
-	    }
-	    for (i = 0; i < local_kwd->num; ++i) {
-		ID id = local_kwd->table[i];
-		int idx = local_size - get_local_var_idx(liseq, id);
-		ADD_INSN1(args, node, putobject, ID2SYM(id));
-		ADD_GETLOCAL(args, node, idx, lvar_level);
-	    }
-	    ADD_SEND(args, node, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
-	    if (local_body->param.flags.has_rest) {
-		ADD_INSN1(args, node, newarray, INT2FIX(1));
-		ADD_INSN (args, node, concatarray);
-		--argc;
-	    }
+            }
+            for (i = 0; i < local_kwd->num; ++i) {
+                ID id = local_kwd->table[i];
+                int idx = local_size - get_local_var_idx(liseq, id);
+                ADD_INSN1(args, node, putobject, ID2SYM(id));
+                ADD_GETLOCAL(args, node, idx, lvar_level);
+            }
+            ADD_SEND(args, node, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
+            if (local_body->param.flags.has_rest) {
+                ADD_INSN1(args, node, newarray, INT2FIX(1));
+                ADD_INSN (args, node, concatarray);
+                --argc;
+            }
             flag |= VM_CALL_KW_SPLAT;
-	}
-	else if (local_body->param.flags.has_kwrest) {
-	    int idx = local_body->local_table_size - local_kwd->rest_start;
-	    ADD_GETLOCAL(args, node, idx, lvar_level);
-
-	    if (local_body->param.flags.has_rest) {
-		ADD_INSN1(args, node, newarray, INT2FIX(1));
-		ADD_INSN (args, node, concatarray);
-	    }
-	    else {
-		argc++;
-	    }
+        }
+        else if (local_body->param.flags.has_kwrest) {
+            int idx = local_body->local_table_size - local_kwd->rest_start;
+            ADD_GETLOCAL(args, node, idx, lvar_level);
+
+            if (local_body->param.flags.has_rest) {
+                ADD_INSN1(args, node, newarray, INT2FIX(1));
+                ADD_INSN (args, node, concatarray);
+            }
+            else {
+                argc++;
+            }
             flag |= VM_CALL_KW_SPLAT;
-	}
+        }
     }
 
     flag |= VM_CALL_SUPER | VM_CALL_FCALL;
@@ -8742,11 +9061,11 @@ compile_super(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     ADD_INSN(ret, node, putself);
     ADD_SEQ(ret, args);
     ADD_INSN2(ret, node, invokesuper,
-	      new_callinfo(iseq, 0, argc, flag, keywords, parent_block != NULL),
-	      parent_block);
+              new_callinfo(iseq, 0, argc, flag, keywords, parent_block != NULL),
+              parent_block);
 
     if (popped) {
-	ADD_INSN(ret, node, pop);
+        ADD_INSN(ret, node, pop);
     }
     return COMPILE_OK;
 }
@@ -8765,24 +9084,24 @@ compile_yield(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
       case ISEQ_TYPE_TOP:
       case ISEQ_TYPE_MAIN:
       case ISEQ_TYPE_CLASS:
-	COMPILE_ERROR(ERROR_ARGS "Invalid yield");
-	return COMPILE_NG;
+        COMPILE_ERROR(ERROR_ARGS "Invalid yield");
+        return COMPILE_NG;
       default: /* valid */;
     }
 
     if (node->nd_head) {
-	argc = setup_args(iseq, args, node->nd_head, &flag, &keywords);
-	CHECK(!NIL_P(argc));
+        argc = setup_args(iseq, args, node->nd_head, &flag, &keywords);
+        CHECK(!NIL_P(argc));
     }
     else {
-	argc = INT2FIX(0);
+        argc = INT2FIX(0);
     }
 
     ADD_SEQ(ret, args);
     ADD_INSN1(ret, node, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE));
 
     if (popped) {
-	ADD_INSN(ret, node, pop);
+        ADD_INSN(ret, node, pop);
     }
 
     int level = 0;
@@ -8805,18 +9124,18 @@ compile_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     INIT_ANCHOR(val);
     switch ((int)type) {
       case NODE_MATCH:
-	ADD_INSN1(recv, node, putobject, node->nd_lit);
-	ADD_INSN2(val, node, getspecial, INT2FIX(0),
-		  INT2FIX(0));
-	break;
+        ADD_INSN1(recv, node, putobject, node->nd_lit);
+        ADD_INSN2(val, node, getspecial, INT2FIX(0),
+                  INT2FIX(0));
+        break;
       case NODE_MATCH2:
-	CHECK(COMPILE(recv, "receiver", node->nd_recv));
-	CHECK(COMPILE(val, "value", node->nd_value));
-	break;
+        CHECK(COMPILE(recv, "receiver", node->nd_recv));
+        CHECK(COMPILE(val, "value", node->nd_value));
+        break;
       case NODE_MATCH3:
-	CHECK(COMPILE(recv, "receiver", node->nd_value));
-	CHECK(COMPILE(val, "value", node->nd_recv));
-	break;
+        CHECK(COMPILE(recv, "receiver", node->nd_value));
+        CHECK(COMPILE(val, "value", node->nd_recv));
+        break;
     }
 
     ADD_SEQ(ret, recv);
@@ -8824,11 +9143,11 @@ compile_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
     ADD_SEND(ret, node, idEqTilde, INT2FIX(1));
 
     if (node->nd_args) {
-	compile_named_capture_assign(iseq, ret, node->nd_args);
+        compile_named_capture_assign(iseq, ret, node->nd_args);
     }
 
     if (popped) {
-	ADD_INSN(ret, node, pop);
+        ADD_INSN(ret, node, pop);
     }
     return COMPILE_OK;
 }
@@ -8836,46 +9155,41 @@ compile_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
 static int
 compile_colon2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    const int line = nd_line(node);
     if (rb_is_const_id(node->nd_mid)) {
-	/* constant */
-	LABEL *lend = NEW_LABEL(line);
-        int ic_index = ISEQ_BODY(iseq)->is_size++;
-
-	DECL_ANCHOR(pref);
-	DECL_ANCHOR(body);
-
-	INIT_ANCHOR(pref);
-	INIT_ANCHOR(body);
-	CHECK(compile_const_prefix(iseq, node, pref, body));
-	if (LIST_INSN_SIZE_ZERO(pref)) {
-	    if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-		ADD_INSN2(ret, node, opt_getinlinecache, lend, INT2FIX(ic_index));
-	    }
-	    else {
-		ADD_INSN(ret, node, putnil);
-	    }
-
-	    ADD_SEQ(ret, body);
-
-	    if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-		ADD_INSN1(ret, node, opt_setinlinecache, INT2FIX(ic_index));
-		ADD_LABEL(ret, lend);
-	    }
-	}
-	else {
-	    ADD_SEQ(ret, pref);
-	    ADD_SEQ(ret, body);
-	}
+        /* constant */
+        VALUE segments;
+        if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache &&
+                (segments = collect_const_segments(iseq, node))) {
+            ISEQ_BODY(iseq)->ic_size++;
+            ADD_INSN1(ret, node, opt_getconstant_path, segments);
+            RB_OBJ_WRITTEN(iseq, Qundef, segments);
+        }
+        else {
+            /* constant */
+            DECL_ANCHOR(pref);
+            DECL_ANCHOR(body);
+
+            INIT_ANCHOR(pref);
+            INIT_ANCHOR(body);
+            CHECK(compile_const_prefix(iseq, node, pref, body));
+            if (LIST_INSN_SIZE_ZERO(pref)) {
+                ADD_INSN(ret, node, putnil);
+                ADD_SEQ(ret, body);
+            }
+            else {
+                ADD_SEQ(ret, pref);
+                ADD_SEQ(ret, body);
+            }
+        }
     }
     else {
-	/* function call */
-	ADD_CALL_RECEIVER(ret, node);
-	CHECK(COMPILE(ret, "colon2#nd_head", node->nd_head));
-	ADD_CALL(ret, node, node->nd_mid, INT2FIX(1));
+        /* function call */
+        ADD_CALL_RECEIVER(ret, node);
+        CHECK(COMPILE(ret, "colon2#nd_head", node->nd_head));
+        ADD_CALL(ret, node, node->nd_mid, INT2FIX(1));
     }
     if (popped) {
-	ADD_INSN(ret, node, pop);
+        ADD_INSN(ret, node, pop);
     }
     return COMPILE_OK;
 }
@@ -8883,29 +9197,23 @@ compile_colon2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 static int
 compile_colon3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    const int line = nd_line(node);
-    LABEL *lend = NEW_LABEL(line);
-    int ic_index = ISEQ_BODY(iseq)->is_size++;
-
     debugi("colon3#nd_mid", node->nd_mid);
 
     /* add cache insn */
     if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-	ADD_INSN2(ret, node, opt_getinlinecache, lend, INT2FIX(ic_index));
-	ADD_INSN(ret, node, pop);
+        ISEQ_BODY(iseq)->ic_size++;
+        VALUE segments = rb_ary_new_from_args(2, ID2SYM(idNULL), ID2SYM(node->nd_mid));
+        ADD_INSN1(ret, node, opt_getconstant_path, segments);
+        RB_OBJ_WRITTEN(iseq, Qundef, segments);
     }
-
-    ADD_INSN1(ret, node, putobject, rb_cObject);
-    ADD_INSN1(ret, node, putobject, Qtrue);
-    ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_mid));
-
-    if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-	ADD_INSN1(ret, node, opt_setinlinecache, INT2FIX(ic_index));
-	ADD_LABEL(ret, lend);
+    else {
+        ADD_INSN1(ret, node, putobject, rb_cObject);
+        ADD_INSN1(ret, node, putobject, Qtrue);
+        ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_mid));
     }
 
     if (popped) {
-	ADD_INSN(ret, node, pop);
+        ADD_INSN(ret, node, pop);
     }
     return COMPILE_OK;
 }
@@ -8918,20 +9226,20 @@ compile_dots(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
     const NODE *e = node->nd_end;
 
     if (optimizable_range_item_p(b) && optimizable_range_item_p(e)) {
-	if (!popped) {
+        if (!popped) {
             VALUE bv = nd_type_p(b, NODE_LIT) ? b->nd_lit : Qnil;
             VALUE ev = nd_type_p(e, NODE_LIT) ? e->nd_lit : Qnil;
-	    VALUE val = rb_range_new(bv, ev, excl);
-	    ADD_INSN1(ret, node, putobject, val);
-	    RB_OBJ_WRITTEN(iseq, Qundef, val);
-	}
+            VALUE val = rb_range_new(bv, ev, excl);
+            ADD_INSN1(ret, node, putobject, val);
+            RB_OBJ_WRITTEN(iseq, Qundef, val);
+        }
     }
     else {
-	CHECK(COMPILE_(ret, "min", b, popped));
-	CHECK(COMPILE_(ret, "max", e, popped));
-	if (!popped) {
-	    ADD_INSN1(ret, node, newrange, flag);
-	}
+        CHECK(COMPILE_(ret, "min", b, popped));
+        CHECK(COMPILE_(ret, "max", e, popped));
+        if (!popped) {
+            ADD_INSN1(ret, node, newrange, flag);
+        }
     }
     return COMPILE_OK;
 }
@@ -8941,25 +9249,25 @@ compile_errinfo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
 {
     if (!popped) {
         if (ISEQ_BODY(iseq)->type == ISEQ_TYPE_RESCUE) {
-	    ADD_GETLOCAL(ret, node, LVAR_ERRINFO, 0);
-	}
-	else {
-	    const rb_iseq_t *ip = iseq;
-	    int level = 0;
-	    while (ip) {
+            ADD_GETLOCAL(ret, node, LVAR_ERRINFO, 0);
+        }
+        else {
+            const rb_iseq_t *ip = iseq;
+            int level = 0;
+            while (ip) {
                 if (ISEQ_BODY(ip)->type == ISEQ_TYPE_RESCUE) {
-		    break;
-		}
+                    break;
+                }
                 ip = ISEQ_BODY(ip)->parent_iseq;
-		level++;
-	    }
-	    if (ip) {
-		ADD_GETLOCAL(ret, node, LVAR_ERRINFO, level);
-	    }
-	    else {
-		ADD_INSN(ret, node, putnil);
-	    }
-	}
+                level++;
+            }
+            if (ip) {
+                ADD_GETLOCAL(ret, node, LVAR_ERRINFO, level);
+            }
+            else {
+                ADD_INSN(ret, node, putnil);
+            }
+        }
     }
     return COMPILE_OK;
 }
@@ -8972,29 +9280,29 @@ compile_kw_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
     const NODE *default_value = node->nd_body->nd_value;
 
     if (default_value == NODE_SPECIAL_REQUIRED_KEYWORD) {
-	/* required argument. do nothing */
-	COMPILE_ERROR(ERROR_ARGS "unreachable");
-	return COMPILE_NG;
+        /* required argument. do nothing */
+        COMPILE_ERROR(ERROR_ARGS "unreachable");
+        return COMPILE_NG;
     }
     else if (nd_type_p(default_value, NODE_LIT) ||
-	     nd_type_p(default_value, NODE_NIL) ||
-	     nd_type_p(default_value, NODE_TRUE) ||
-	     nd_type_p(default_value, NODE_FALSE)) {
-	COMPILE_ERROR(ERROR_ARGS "unreachable");
-	return COMPILE_NG;
+             nd_type_p(default_value, NODE_NIL) ||
+             nd_type_p(default_value, NODE_TRUE) ||
+             nd_type_p(default_value, NODE_FALSE)) {
+        COMPILE_ERROR(ERROR_ARGS "unreachable");
+        return COMPILE_NG;
     }
     else {
-	/* if keywordcheck(_kw_bits, nth_keyword)
-	 *   kw = default_value
-	 * end
-	 */
-	int kw_bits_idx = body->local_table_size - body->param.keyword->bits_start;
-	int keyword_idx = body->param.keyword->num;
-
-	ADD_INSN2(ret, node, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx));
-	ADD_INSNL(ret, node, branchif, end_label);
-	CHECK(COMPILE_POPPED(ret, "keyword default argument", node->nd_body));
-	ADD_LABEL(ret, end_label);
+        /* if keywordcheck(_kw_bits, nth_keyword)
+         *   kw = default_value
+         * end
+         */
+        int kw_bits_idx = body->local_table_size - body->param.keyword->bits_start;
+        int keyword_idx = body->param.keyword->num;
+
+        ADD_INSN2(ret, node, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx));
+        ADD_INSNL(ret, node, branchif, end_label);
+        CHECK(COMPILE_POPPED(ret, "keyword default argument", node->nd_body));
+        ADD_LABEL(ret, end_label);
     }
     return COMPILE_OK;
 }
@@ -9013,25 +9321,26 @@ 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 &&
-	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 &&
-	!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
-	ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
+    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 &&
+        !ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
     {
-	VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
-	CHECK(COMPILE(ret, "recv", node->nd_recv));
-	CHECK(COMPILE(ret, "value", node->nd_args->nd_next->nd_head));
-	if (!popped) {
-	    ADD_INSN(ret, node, swap);
-	    ADD_INSN1(ret, node, topn, INT2FIX(1));
-	}
-	ADD_INSN2(ret, node, opt_aset_with, str,
-		  new_callinfo(iseq, idASET, 2, 0, NULL, FALSE));
-	RB_OBJ_WRITTEN(iseq, Qundef, str);
-	ADD_INSN(ret, node, pop);
-	return COMPILE_OK;
+        VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
+        CHECK(COMPILE(ret, "recv", node->nd_recv));
+        CHECK(COMPILE(ret, "value", node->nd_args->nd_next->nd_head));
+        if (!popped) {
+            ADD_INSN(ret, node, swap);
+            ADD_INSN1(ret, node, topn, INT2FIX(1));
+        }
+        ADD_INSN2(ret, node, opt_aset_with, str,
+                  new_callinfo(iseq, idASET, 2, 0, NULL, FALSE));
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
+        ADD_INSN(ret, node, pop);
+        return COMPILE_OK;
     }
 
     INIT_ANCHOR(recv);
@@ -9047,38 +9356,38 @@ compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
     debugp_param("nd_mid", ID2SYM(mid));
 
     if (!rb_is_attrset_id(mid)) {
-	/* safe nav attr */
-	mid = rb_id_attrset(mid);
-	else_label = qcall_branch_start(iseq, recv, &branches, node, node);
+        /* safe nav attr */
+        mid = rb_id_attrset(mid);
+        else_label = qcall_branch_start(iseq, recv, &branches, node, node);
     }
     if (!popped) {
-	ADD_INSN(ret, node, putnil);
-	ADD_SEQ(ret, recv);
-	ADD_SEQ(ret, args);
-
-	if (flag & VM_CALL_ARGS_BLOCKARG) {
-	    ADD_INSN1(ret, node, topn, INT2FIX(1));
-	    if (flag & VM_CALL_ARGS_SPLAT) {
-		ADD_INSN1(ret, node, putobject, INT2FIX(-1));
-		ADD_SEND_WITH_FLAG(ret, node, idAREF, INT2FIX(1), INT2FIX(asgnflag));
-	    }
-	    ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 3));
-	    ADD_INSN (ret, node, pop);
-	}
-	else if (flag & VM_CALL_ARGS_SPLAT) {
-	    ADD_INSN(ret, node, dup);
-	    ADD_INSN1(ret, node, putobject, INT2FIX(-1));
-	    ADD_SEND_WITH_FLAG(ret, node, idAREF, INT2FIX(1), INT2FIX(asgnflag));
-	    ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2));
-	    ADD_INSN (ret, node, pop);
-	}
-	else {
-	    ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 1));
-	}
+        ADD_INSN(ret, node, putnil);
+        ADD_SEQ(ret, recv);
+        ADD_SEQ(ret, args);
+
+        if (flag & VM_CALL_ARGS_BLOCKARG) {
+            ADD_INSN1(ret, node, topn, INT2FIX(1));
+            if (flag & VM_CALL_ARGS_SPLAT) {
+                ADD_INSN1(ret, node, putobject, INT2FIX(-1));
+                ADD_SEND_WITH_FLAG(ret, node, idAREF, INT2FIX(1), INT2FIX(asgnflag));
+            }
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 3));
+            ADD_INSN (ret, node, pop);
+        }
+        else if (flag & VM_CALL_ARGS_SPLAT) {
+            ADD_INSN(ret, node, dup);
+            ADD_INSN1(ret, node, putobject, INT2FIX(-1));
+            ADD_SEND_WITH_FLAG(ret, node, idAREF, INT2FIX(1), INT2FIX(asgnflag));
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 2));
+            ADD_INSN (ret, node, pop);
+        }
+        else {
+            ADD_INSN1(ret, node, setn, FIXNUM_INC(argc, 1));
+        }
     }
     else {
-	ADD_SEQ(ret, recv);
-	ADD_SEQ(ret, args);
+        ADD_SEQ(ret, recv);
+        ADD_SEQ(ret, args);
     }
     ADD_SEND_WITH_FLAG(ret, node, mid, argc, INT2FIX(flag));
     qcall_branch_end(iseq, ret, else_label, branches, node, node);
@@ -9118,17 +9427,17 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
     struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
 
     if (ISEQ_COMPILE_DATA(iseq)->last_line == line) {
-	/* ignore */
+        /* ignore */
     }
     else {
-	if (node->flags & NODE_FL_NEWLINE) {
-	    int event = RUBY_EVENT_LINE;
-	    ISEQ_COMPILE_DATA(iseq)->last_line = line;
-	    if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
-		event |= RUBY_EVENT_COVERAGE_LINE;
-	    }
-	    ADD_TRACE(ret, event);
-	}
+        if (node->flags & NODE_FL_NEWLINE) {
+            int event = RUBY_EVENT_LINE;
+            ISEQ_COMPILE_DATA(iseq)->last_line = line;
+            if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+                event |= RUBY_EVENT_COVERAGE_LINE;
+            }
+            ADD_TRACE(ret, event);
+        }
     }
 
     debug_node_start(node);
@@ -9138,134 +9447,137 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
     switch (type) {
       case NODE_BLOCK:
         CHECK(compile_block(iseq, ret, node, popped));
-	break;
+        break;
       case NODE_IF:
       case NODE_UNLESS:
-	CHECK(compile_if(iseq, ret, node, popped, type));
-	break;
+        CHECK(compile_if(iseq, ret, node, popped, type));
+        break;
       case NODE_CASE:
-	CHECK(compile_case(iseq, ret, node, popped));
-	break;
+        CHECK(compile_case(iseq, ret, node, popped));
+        break;
       case NODE_CASE2:
-	CHECK(compile_case2(iseq, ret, node, popped));
-	break;
+        CHECK(compile_case2(iseq, ret, node, popped));
+        break;
       case NODE_CASE3:
         CHECK(compile_case3(iseq, ret, node, popped));
         break;
       case NODE_WHILE:
       case NODE_UNTIL:
-	CHECK(compile_loop(iseq, ret, node, popped, type));
-	break;
+        CHECK(compile_loop(iseq, ret, node, popped, type));
+        break;
       case NODE_FOR:
       case NODE_ITER:
-	CHECK(compile_iter(iseq, ret, node, popped));
-	break;
+        CHECK(compile_iter(iseq, ret, node, popped));
+        break;
       case NODE_FOR_MASGN:
-	CHECK(compile_for_masgn(iseq, ret, node, popped));
-	break;
+        CHECK(compile_for_masgn(iseq, ret, node, popped));
+        break;
       case NODE_BREAK:
-	CHECK(compile_break(iseq, ret, node, popped));
-	break;
+        CHECK(compile_break(iseq, ret, node, popped));
+        break;
       case NODE_NEXT:
-	CHECK(compile_next(iseq, ret, node, popped));
-	break;
+        CHECK(compile_next(iseq, ret, node, popped));
+        break;
       case NODE_REDO:
-	CHECK(compile_redo(iseq, ret, node, popped));
-	break;
+        CHECK(compile_redo(iseq, ret, node, popped));
+        break;
       case NODE_RETRY:
-	CHECK(compile_retry(iseq, ret, node, popped));
-	break;
+        CHECK(compile_retry(iseq, ret, node, popped));
+        break;
       case NODE_BEGIN:{
-	CHECK(COMPILE_(ret, "NODE_BEGIN", node->nd_body, popped));
-	break;
+        CHECK(COMPILE_(ret, "NODE_BEGIN", node->nd_body, popped));
+        break;
       }
       case NODE_RESCUE:
-	CHECK(compile_rescue(iseq, ret, node, popped));
-	break;
+        CHECK(compile_rescue(iseq, ret, node, popped));
+        break;
       case NODE_RESBODY:
-	CHECK(compile_resbody(iseq, ret, node, popped));
-	break;
+        CHECK(compile_resbody(iseq, ret, node, popped));
+        break;
       case NODE_ENSURE:
-	CHECK(compile_ensure(iseq, ret, node, popped));
-	break;
+        CHECK(compile_ensure(iseq, ret, node, popped));
+        break;
 
       case NODE_AND:
       case NODE_OR:{
-	LABEL *end_label = NEW_LABEL(line);
-	CHECK(COMPILE(ret, "nd_1st", node->nd_1st));
-	if (!popped) {
-	    ADD_INSN(ret, node, dup);
-	}
-	if (type == NODE_AND) {
-	    ADD_INSNL(ret, node, branchunless, end_label);
-	}
-	else {
-	    ADD_INSNL(ret, node, branchif, end_label);
-	}
-	if (!popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	CHECK(COMPILE_(ret, "nd_2nd", node->nd_2nd, popped));
-	ADD_LABEL(ret, end_label);
-	break;
+        LABEL *end_label = NEW_LABEL(line);
+        CHECK(COMPILE(ret, "nd_1st", node->nd_1st));
+        if (!popped) {
+            ADD_INSN(ret, node, dup);
+        }
+        if (type == NODE_AND) {
+            ADD_INSNL(ret, node, branchunless, end_label);
+        }
+        else {
+            ADD_INSNL(ret, node, branchif, end_label);
+        }
+        if (!popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        CHECK(COMPILE_(ret, "nd_2nd", node->nd_2nd, popped));
+        ADD_LABEL(ret, end_label);
+        break;
       }
 
       case NODE_MASGN:{
-	compile_massign(iseq, ret, node, popped);
-	break;
+        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;
       }
 
       case NODE_LASGN:{
-	ID id = node->nd_vid;
+        ID id = node->nd_vid;
         int idx = ISEQ_BODY(body->local_iseq)->local_table_size - get_local_var_idx(iseq, id);
 
-	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
-	CHECK(COMPILE(ret, "rvalue", node->nd_value));
+        debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
+        CHECK(COMPILE(ret, "rvalue", node->nd_value));
 
-	if (!popped) {
-	    ADD_INSN(ret, node, dup);
-	}
-	ADD_SETLOCAL(ret, node, idx, get_lvar_level(iseq));
-	break;
+        if (!popped) {
+            ADD_INSN(ret, node, dup);
+        }
+        ADD_SETLOCAL(ret, node, idx, get_lvar_level(iseq));
+        break;
       }
       case NODE_DASGN: {
-	int idx, lv, ls;
-	ID id = node->nd_vid;
-	CHECK(COMPILE(ret, "dvalue", node->nd_value));
-	debugi("dassn id", rb_id2str(id) ? id : '*');
-
-	if (!popped) {
-	    ADD_INSN(ret, node, dup);
-	}
-
-	idx = get_dyna_var_idx(iseq, id, &lv, &ls);
-
-	if (idx < 0) {
-	    COMPILE_ERROR(ERROR_ARGS "NODE_DASGN: unknown id (%"PRIsVALUE")",
-			  rb_id2str(id));
-	    goto ng;
-	}
-	ADD_SETLOCAL(ret, node, ls - idx, lv);
-	break;
+        int idx, lv, ls;
+        ID id = node->nd_vid;
+        CHECK(COMPILE(ret, "dvalue", node->nd_value));
+        debugi("dassn id", rb_id2str(id) ? id : '*');
+
+        if (!popped) {
+            ADD_INSN(ret, node, dup);
+        }
+
+        idx = get_dyna_var_idx(iseq, id, &lv, &ls);
+
+        if (idx < 0) {
+            COMPILE_ERROR(ERROR_ARGS "NODE_DASGN: unknown id (%"PRIsVALUE")",
+                          rb_id2str(id));
+            goto ng;
+        }
+        ADD_SETLOCAL(ret, node, ls - idx, lv);
+        break;
       }
       case NODE_GASGN:{
-	CHECK(COMPILE(ret, "lvalue", node->nd_value));
+        CHECK(COMPILE(ret, "lvalue", node->nd_value));
 
-	if (!popped) {
-	    ADD_INSN(ret, node, dup);
-	}
-	ADD_INSN1(ret, node, setglobal, ID2SYM(node->nd_entry));
-	break;
+        if (!popped) {
+            ADD_INSN(ret, node, dup);
+        }
+        ADD_INSN1(ret, node, setglobal, ID2SYM(node->nd_entry));
+        break;
       }
       case NODE_IASGN:{
-	CHECK(COMPILE(ret, "lvalue", node->nd_value));
-	if (!popped) {
-	    ADD_INSN(ret, node, dup);
-	}
-	ADD_INSN2(ret, node, setinstancevariable,
-		  ID2SYM(node->nd_vid),
-		  get_ivar_ic_value(iseq,node->nd_vid));
-	break;
+        CHECK(COMPILE(ret, "lvalue", node->nd_value));
+        if (!popped) {
+            ADD_INSN(ret, node, dup);
+        }
+        ADD_INSN2(ret, node, setinstancevariable,
+                  ID2SYM(node->nd_vid),
+                  get_ivar_ic_value(iseq,node->nd_vid));
+        break;
       }
       case NODE_CDECL:{
         if (node->nd_vid) {
@@ -9275,12 +9587,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
                 ADD_INSN(ret, node, dup);
             }
 
-	    ADD_INSN1(ret, node, putspecialobject,
-		      INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+            ADD_INSN1(ret, node, putspecialobject,
+                      INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
             ADD_INSN1(ret, node, setconstant, ID2SYM(node->nd_vid));
-	}
-	else {
-	    compile_cpath(ret, iseq, node->nd_else);
+        }
+        else {
+            compile_cpath(ret, iseq, node->nd_else);
             CHECK(COMPILE(ret, "lvalue", node->nd_value));
             ADD_INSN(ret, node, swap);
 
@@ -9290,32 +9602,32 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
             }
 
             ADD_INSN1(ret, node, setconstant, ID2SYM(node->nd_else->nd_mid));
-	}
-	break;
+        }
+        break;
       }
       case NODE_CVASGN:{
-	CHECK(COMPILE(ret, "cvasgn val", node->nd_value));
-	if (!popped) {
-	    ADD_INSN(ret, node, dup);
-	}
+        CHECK(COMPILE(ret, "cvasgn val", node->nd_value));
+        if (!popped) {
+            ADD_INSN(ret, node, dup);
+        }
         ADD_INSN2(ret, node, setclassvariable,
                   ID2SYM(node->nd_vid),
-                  get_ivar_ic_value(iseq,node->nd_vid));
-	break;
+                  get_cvar_ic_value(iseq,node->nd_vid));
+        break;
       }
       case NODE_OP_ASGN1:
-	CHECK(compile_op_asgn1(iseq, ret, node, popped));
-	break;
+        CHECK(compile_op_asgn1(iseq, ret, node, popped));
+        break;
       case NODE_OP_ASGN2:
-	CHECK(compile_op_asgn2(iseq, ret, node, popped));
-	break;
+        CHECK(compile_op_asgn2(iseq, ret, node, popped));
+        break;
       case NODE_OP_CDECL:
-	CHECK(compile_op_cdecl(iseq, ret, node, popped));
-	break;
+        CHECK(compile_op_cdecl(iseq, ret, node, popped));
+        break;
       case NODE_OP_ASGN_AND:
       case NODE_OP_ASGN_OR:
-	CHECK(compile_op_log(iseq, ret, node, popped, type));
-	break;
+        CHECK(compile_op_log(iseq, ret, node, popped, type));
+        break;
       case NODE_CALL:   /* obj.foo */
       case NODE_OPCALL: /* foo[] */
         if (compile_call_precheck_freeze(iseq, ret, node, node, popped) == TRUE) {
@@ -9330,271 +9642,272 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         break;
       case NODE_SUPER:
       case NODE_ZSUPER:
-	CHECK(compile_super(iseq, ret, node, popped, type));
-	break;
+        CHECK(compile_super(iseq, ret, node, popped, type));
+        break;
       case NODE_LIST:{
         CHECK(compile_array(iseq, ret, node, popped) >= 0);
-	break;
+        break;
       }
       case NODE_ZLIST:{
-	if (!popped) {
-	    ADD_INSN1(ret, node, newarray, INT2FIX(0));
-	}
-	break;
+        if (!popped) {
+            ADD_INSN1(ret, node, newarray, INT2FIX(0));
+        }
+        break;
       }
       case NODE_VALUES:{
-	const NODE *n = node;
-	if (popped) {
-	    COMPILE_ERROR(ERROR_ARGS "NODE_VALUES: must not be popped");
-	}
-	while (n) {
-	    CHECK(COMPILE(ret, "values item", n->nd_head));
-	    n = n->nd_next;
-	}
-	ADD_INSN1(ret, node, newarray, INT2FIX(node->nd_alen));
-	break;
+        const NODE *n = node;
+        if (popped) {
+            COMPILE_ERROR(ERROR_ARGS "NODE_VALUES: must not be popped");
+        }
+        while (n) {
+            CHECK(COMPILE(ret, "values item", n->nd_head));
+            n = n->nd_next;
+        }
+        ADD_INSN1(ret, node, newarray, INT2FIX(node->nd_alen));
+        break;
       }
       case NODE_HASH:
         CHECK(compile_hash(iseq, ret, node, FALSE, popped) >= 0);
         break;
       case NODE_RETURN:
-	CHECK(compile_return(iseq, ret, node, popped));
-	break;
+        CHECK(compile_return(iseq, ret, node, popped));
+        break;
       case NODE_YIELD:
-	CHECK(compile_yield(iseq, ret, node, popped));
-	break;
+        CHECK(compile_yield(iseq, ret, node, popped));
+        break;
       case NODE_LVAR:{
-	if (!popped) {
-	    compile_lvar(iseq, ret, node, node->nd_vid);
-	}
-	break;
+        if (!popped) {
+            compile_lvar(iseq, ret, node, node->nd_vid);
+        }
+        break;
       }
       case NODE_DVAR:{
-	int lv, idx, ls;
-	debugi("nd_vid", node->nd_vid);
-	if (!popped) {
-	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
-	    if (idx < 0) {
-		COMPILE_ERROR(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
-			      rb_id2str(node->nd_vid));
-		goto ng;
-	    }
-	    ADD_GETLOCAL(ret, node, ls - idx, lv);
-	}
-	break;
+        int lv, idx, ls;
+        debugi("nd_vid", node->nd_vid);
+        if (!popped) {
+            idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+            if (idx < 0) {
+                COMPILE_ERROR(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
+                              rb_id2str(node->nd_vid));
+                goto ng;
+            }
+            ADD_GETLOCAL(ret, node, ls - idx, lv);
+        }
+        break;
       }
       case NODE_GVAR:{
-	ADD_INSN1(ret, node, getglobal, ID2SYM(node->nd_entry));
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        ADD_INSN1(ret, node, getglobal, ID2SYM(node->nd_entry));
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_IVAR:{
-	debugi("nd_vid", node->nd_vid);
-	if (!popped) {
-	    ADD_INSN2(ret, node, getinstancevariable,
-		      ID2SYM(node->nd_vid),
-		      get_ivar_ic_value(iseq,node->nd_vid));
-	}
-	break;
+        debugi("nd_vid", node->nd_vid);
+        if (!popped) {
+            ADD_INSN2(ret, node, getinstancevariable,
+                      ID2SYM(node->nd_vid),
+                      get_ivar_ic_value(iseq,node->nd_vid));
+        }
+        break;
       }
       case NODE_CONST:{
-	debugi("nd_vid", node->nd_vid);
+        debugi("nd_vid", node->nd_vid);
 
-	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-	    LABEL *lend = NEW_LABEL(line);
-	    int ic_index = body->is_size++;
-
-            ADD_INSN2(ret, node, opt_getinlinecache, lend, INT2FIX(ic_index));
-            ADD_INSN1(ret, node, putobject, Qtrue);
-            ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_vid));
-            ADD_INSN1(ret, node, opt_setinlinecache, INT2FIX(ic_index));
-	    ADD_LABEL(ret, lend);
-	}
-	else {
-	    ADD_INSN(ret, node, putnil);
+        if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+            body->ic_size++;
+            VALUE segments = rb_ary_new_from_args(1, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, node, opt_getconstant_path, segments);
+            RB_OBJ_WRITTEN(iseq, Qundef, segments);
+        }
+        else {
+            ADD_INSN(ret, node, putnil);
             ADD_INSN1(ret, node, putobject, Qtrue);
             ADD_INSN1(ret, node, getconstant, ID2SYM(node->nd_vid));
-	}
+        }
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_CVAR:{
-	if (!popped) {
-	    ADD_INSN2(ret, node, getclassvariable,
-		      ID2SYM(node->nd_vid),
-		      get_ivar_ic_value(iseq,node->nd_vid));
-	}
-	break;
+        if (!popped) {
+            ADD_INSN2(ret, node, getclassvariable,
+                      ID2SYM(node->nd_vid),
+                      get_cvar_ic_value(iseq,node->nd_vid));
+        }
+        break;
       }
       case NODE_NTH_REF:{
         if (!popped) {
-	    if (!node->nd_nth) {
-		ADD_INSN(ret, node, putnil);
-		break;
-	    }
-	    ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~'  */,
-		      INT2FIX(node->nd_nth << 1));
-	}
-	break;
+            if (!node->nd_nth) {
+                ADD_INSN(ret, node, putnil);
+                break;
+            }
+            ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~'  */,
+                      INT2FIX(node->nd_nth << 1));
+        }
+        break;
       }
       case NODE_BACK_REF:{
-	if (!popped) {
-	    ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~' */,
-		      INT2FIX(0x01 | (node->nd_nth << 1)));
-	}
-	break;
+        if (!popped) {
+            ADD_INSN2(ret, node, getspecial, INT2FIX(1) /* '~' */,
+                      INT2FIX(0x01 | (node->nd_nth << 1)));
+        }
+        break;
       }
       case NODE_MATCH:
       case NODE_MATCH2:
       case NODE_MATCH3:
-	CHECK(compile_match(iseq, ret, node, popped, type));
-	break;
+        CHECK(compile_match(iseq, ret, node, popped, type));
+        break;
       case NODE_LIT:{
-	debugp_param("lit", node->nd_lit);
-	if (!popped) {
-	    ADD_INSN1(ret, node, putobject, node->nd_lit);
+        debugp_param("lit", node->nd_lit);
+        if (!popped) {
+            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;
+        }
+        break;
       }
       case NODE_STR:{
-	debugp_param("nd_lit", node->nd_lit);
-	if (!popped) {
-	    VALUE lit = node->nd_lit;
-	    if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-		lit = rb_fstring(lit);
-		ADD_INSN1(ret, node, putstring, lit);
+        debugp_param("nd_lit", node->nd_lit);
+        if (!popped) {
+            VALUE lit = node->nd_lit;
+            if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
+                lit = rb_fstring(lit);
+                ADD_INSN1(ret, node, putstring, lit);
                 RB_OBJ_WRITTEN(iseq, Qundef, lit);
-	    }
-	    else {
-		if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-		    VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX(line));
-		    lit = rb_str_dup(lit);
-		    rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
-		    lit = rb_str_freeze(lit);
-		}
-		else {
-		    lit = rb_fstring(lit);
-		}
-		ADD_INSN1(ret, node, putobject, lit);
+            }
+            else {
+                if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
+                    VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX(line));
+                    lit = rb_str_dup(lit);
+                    rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
+                    lit = rb_str_freeze(lit);
+                }
+                else {
+                    lit = rb_fstring(lit);
+                }
+                ADD_INSN1(ret, node, putobject, lit);
                 RB_OBJ_WRITTEN(iseq, Qundef, lit);
-	    }
-	}
-	break;
+            }
+        }
+        break;
       }
       case NODE_DSTR:{
-	compile_dstr(iseq, ret, node);
+        compile_dstr(iseq, ret, node);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_XSTR:{
-	ADD_CALL_RECEIVER(ret, node);
+        ADD_CALL_RECEIVER(ret, node);
         VALUE str = rb_fstring(node->nd_lit);
-	ADD_INSN1(ret, node, putobject, str);
+        ADD_INSN1(ret, node, putobject, str);
         RB_OBJ_WRITTEN(iseq, Qundef, str);
-	ADD_CALL(ret, node, idBackquote, INT2FIX(1));
+        ADD_CALL(ret, node, idBackquote, INT2FIX(1));
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_DXSTR:{
-	ADD_CALL_RECEIVER(ret, node);
-	compile_dstr(iseq, ret, node);
-	ADD_CALL(ret, node, idBackquote, INT2FIX(1));
-
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        ADD_CALL_RECEIVER(ret, node);
+        compile_dstr(iseq, ret, node);
+        ADD_CALL(ret, node, idBackquote, INT2FIX(1));
+
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_EVSTR:
-	CHECK(compile_evstr(iseq, ret, node->nd_body, popped));
-	break;
+        CHECK(compile_evstr(iseq, ret, node->nd_body, popped));
+        break;
       case NODE_DREGX:{
-	compile_dregx(iseq, ret, node);
+        compile_dregx(iseq, ret, node);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_ONCE:{
-	int ic_index = body->is_size++;
-	const rb_iseq_t *block_iseq;
-	block_iseq = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, line);
+        int ic_index = body->ise_size++;
+        const rb_iseq_t *block_iseq;
+        block_iseq = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, line);
 
-	ADD_INSN2(ret, node, once, block_iseq, INT2FIX(ic_index));
+        ADD_INSN2(ret, node, once, block_iseq, INT2FIX(ic_index));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block_iseq);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_ARGSCAT:{
-	if (popped) {
-	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
-	    ADD_INSN1(ret, node, splatarray, Qfalse);
-	    ADD_INSN(ret, node, pop);
-	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
-	    ADD_INSN1(ret, node, splatarray, Qfalse);
-	    ADD_INSN(ret, node, pop);
-	}
-	else {
-	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
-	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
-	    ADD_INSN(ret, node, concatarray);
-	}
-	break;
+        if (popped) {
+            CHECK(COMPILE(ret, "argscat head", node->nd_head));
+            ADD_INSN1(ret, node, splatarray, Qfalse);
+            ADD_INSN(ret, node, pop);
+            CHECK(COMPILE(ret, "argscat body", node->nd_body));
+            ADD_INSN1(ret, node, splatarray, Qfalse);
+            ADD_INSN(ret, node, pop);
+        }
+        else {
+            CHECK(COMPILE(ret, "argscat head", node->nd_head));
+            CHECK(COMPILE(ret, "argscat body", node->nd_body));
+            ADD_INSN(ret, node, concatarray);
+        }
+        break;
       }
       case NODE_ARGSPUSH:{
-	if (popped) {
-	    CHECK(COMPILE(ret, "argspush head", node->nd_head));
-	    ADD_INSN1(ret, node, splatarray, Qfalse);
-	    ADD_INSN(ret, node, pop);
-	    CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
-	}
-	else {
-	    CHECK(COMPILE(ret, "argspush head", node->nd_head));
-	    CHECK(compile_array_1(iseq, ret, node->nd_body));
-	    ADD_INSN(ret, node, concatarray);
-	}
-	break;
+        if (popped) {
+            CHECK(COMPILE(ret, "argspush head", node->nd_head));
+            ADD_INSN1(ret, node, splatarray, Qfalse);
+            ADD_INSN(ret, node, pop);
+            CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
+        }
+        else {
+            CHECK(COMPILE(ret, "argspush head", node->nd_head));
+            CHECK(compile_array_1(iseq, ret, node->nd_body));
+            ADD_INSN(ret, node, concatarray);
+        }
+        break;
       }
       case NODE_SPLAT:{
-	CHECK(COMPILE(ret, "splat", node->nd_head));
-	ADD_INSN1(ret, node, splatarray, Qtrue);
+        CHECK(COMPILE(ret, "splat", node->nd_head));
+        ADD_INSN1(ret, node, splatarray, Qtrue);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_DEFN:{
         ID mid = node->nd_mid;
-	const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn,
+        const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn,
                                                 rb_id2str(mid),
-						ISEQ_TYPE_METHOD, line);
+                                                ISEQ_TYPE_METHOD, line);
 
-	debugp_param("defn/iseq", rb_iseqw_new(method_iseq));
+        debugp_param("defn/iseq", rb_iseqw_new(method_iseq));
         ADD_INSN2(ret, node, definemethod, ID2SYM(mid), method_iseq);
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)method_iseq);
 
         if (!popped) {
             ADD_INSN1(ret, node, putobject, ID2SYM(mid));
-	}
+        }
 
-	break;
+        break;
       }
       case NODE_DEFS:{
         ID mid = node->nd_mid;
@@ -9610,206 +9923,206 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         if (!popped) {
             ADD_INSN1(ret, node, putobject, ID2SYM(mid));
         }
-	break;
+        break;
       }
       case NODE_ALIAS:{
-	ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	CHECK(COMPILE(ret, "alias arg1", node->nd_1st));
-	CHECK(COMPILE(ret, "alias arg2", node->nd_2nd));
-	ADD_SEND(ret, node, id_core_set_method_alias, INT2FIX(3));
-
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+        CHECK(COMPILE(ret, "alias arg1", node->nd_1st));
+        CHECK(COMPILE(ret, "alias arg2", node->nd_2nd));
+        ADD_SEND(ret, node, id_core_set_method_alias, INT2FIX(3));
+
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_VALIAS:{
-	ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_alias));
-	ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_orig));
-	ADD_SEND(ret, node, id_core_set_variable_alias, INT2FIX(2));
-
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_alias));
+        ADD_INSN1(ret, node, putobject, ID2SYM(node->nd_orig));
+        ADD_SEND(ret, node, id_core_set_variable_alias, INT2FIX(2));
+
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_UNDEF:{
-	ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	CHECK(COMPILE(ret, "undef arg", node->nd_undef));
-	ADD_SEND(ret, node, id_core_undef_method, INT2FIX(2));
-
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+        CHECK(COMPILE(ret, "undef arg", node->nd_undef));
+        ADD_SEND(ret, node, id_core_undef_method, INT2FIX(2));
+
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_CLASS:{
-	const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(node->nd_body,
-						     rb_str_freeze(rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid))),
-						     ISEQ_TYPE_CLASS, line);
-	const int flags = VM_DEFINECLASS_TYPE_CLASS |
-	    (node->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
-	    compile_cpath(ret, iseq, node->nd_cpath);
-
-	CHECK(COMPILE(ret, "super", node->nd_super));
-	ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags));
+        const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(node->nd_body,
+                                                     rb_str_freeze(rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid))),
+                                                     ISEQ_TYPE_CLASS, line);
+        const int flags = VM_DEFINECLASS_TYPE_CLASS |
+            (node->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
+            compile_cpath(ret, iseq, node->nd_cpath);
+
+        CHECK(COMPILE(ret, "super", node->nd_super));
+        ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)class_iseq);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_MODULE:{
         const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(node->nd_body,
-						      rb_str_freeze(rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid))),
-						      ISEQ_TYPE_CLASS, line);
-	const int flags = VM_DEFINECLASS_TYPE_MODULE |
-	    compile_cpath(ret, iseq, node->nd_cpath);
+                                                      rb_str_freeze(rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid))),
+                                                      ISEQ_TYPE_CLASS, line);
+        const int flags = VM_DEFINECLASS_TYPE_MODULE |
+            compile_cpath(ret, iseq, node->nd_cpath);
 
-	ADD_INSN (ret, node, putnil); /* dummy */
-	ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags));
+        ADD_INSN (ret, node, putnil); /* dummy */
+        ADD_INSN3(ret, node, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)module_iseq);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_SCLASS:{
-	ID singletonclass;
-	const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_fstring_lit("singleton class"),
-						    ISEQ_TYPE_CLASS, line);
-
-	CHECK(COMPILE(ret, "sclass#recv", node->nd_recv));
-	ADD_INSN (ret, node, putnil);
-	CONST_ID(singletonclass, "singletonclass");
-	ADD_INSN3(ret, node, defineclass,
-		  ID2SYM(singletonclass), singleton_class,
-		  INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
+        ID singletonclass;
+        const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_fstring_lit("singleton class"),
+                                                    ISEQ_TYPE_CLASS, line);
+
+        CHECK(COMPILE(ret, "sclass#recv", node->nd_recv));
+        ADD_INSN (ret, node, putnil);
+        CONST_ID(singletonclass, "singletonclass");
+        ADD_INSN3(ret, node, defineclass,
+                  ID2SYM(singletonclass), singleton_class,
+                  INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_class);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_COLON2:
-	CHECK(compile_colon2(iseq, ret, node, popped));
-	break;
+        CHECK(compile_colon2(iseq, ret, node, popped));
+        break;
       case NODE_COLON3:
-	CHECK(compile_colon3(iseq, ret, node, popped));
-	break;
+        CHECK(compile_colon3(iseq, ret, node, popped));
+        break;
       case NODE_DOT2:
-	CHECK(compile_dots(iseq, ret, node, popped, FALSE));
-	break;
+        CHECK(compile_dots(iseq, ret, node, popped, FALSE));
+        break;
       case NODE_DOT3:
-	CHECK(compile_dots(iseq, ret, node, popped, TRUE));
-	break;
+        CHECK(compile_dots(iseq, ret, node, popped, TRUE));
+        break;
       case NODE_FLIP2:
       case NODE_FLIP3:{
-	LABEL *lend = NEW_LABEL(line);
-	LABEL *ltrue = NEW_LABEL(line);
-	LABEL *lfalse = NEW_LABEL(line);
-	CHECK(compile_flip_flop(iseq, ret, node, type == NODE_FLIP2,
-				ltrue, lfalse));
-	ADD_LABEL(ret, ltrue);
-	ADD_INSN1(ret, node, putobject, Qtrue);
-	ADD_INSNL(ret, node, jump, lend);
-	ADD_LABEL(ret, lfalse);
-	ADD_INSN1(ret, node, putobject, Qfalse);
-	ADD_LABEL(ret, lend);
-	break;
+        LABEL *lend = NEW_LABEL(line);
+        LABEL *ltrue = NEW_LABEL(line);
+        LABEL *lfalse = NEW_LABEL(line);
+        CHECK(compile_flip_flop(iseq, ret, node, type == NODE_FLIP2,
+                                ltrue, lfalse));
+        ADD_LABEL(ret, ltrue);
+        ADD_INSN1(ret, node, putobject, Qtrue);
+        ADD_INSNL(ret, node, jump, lend);
+        ADD_LABEL(ret, lfalse);
+        ADD_INSN1(ret, node, putobject, Qfalse);
+        ADD_LABEL(ret, lend);
+        break;
       }
       case NODE_SELF:{
-	if (!popped) {
-	    ADD_INSN(ret, node, putself);
-	}
-	break;
+        if (!popped) {
+            ADD_INSN(ret, node, putself);
+        }
+        break;
       }
       case NODE_NIL:{
-	if (!popped) {
-	    ADD_INSN(ret, node, putnil);
-	}
-	break;
+        if (!popped) {
+            ADD_INSN(ret, node, putnil);
+        }
+        break;
       }
       case NODE_TRUE:{
-	if (!popped) {
-	    ADD_INSN1(ret, node, putobject, Qtrue);
-	}
-	break;
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, Qtrue);
+        }
+        break;
       }
       case NODE_FALSE:{
-	if (!popped) {
-	    ADD_INSN1(ret, node, putobject, Qfalse);
-	}
-	break;
+        if (!popped) {
+            ADD_INSN1(ret, node, putobject, Qfalse);
+        }
+        break;
       }
       case NODE_ERRINFO:
-	CHECK(compile_errinfo(iseq, ret, node, popped));
-	break;
+        CHECK(compile_errinfo(iseq, ret, node, popped));
+        break;
       case NODE_DEFINED:
-	if (!popped) {
-	    CHECK(compile_defined_expr(iseq, ret, node, Qtrue));
-	}
-	break;
+        if (!popped) {
+            CHECK(compile_defined_expr(iseq, ret, node, Qtrue));
+        }
+        break;
       case NODE_POSTEXE:{
-	/* compiled to:
-	 *   ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }
-	 */
-	int is_index = body->is_size++;
+        /* compiled to:
+         *   ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }
+         */
+        int is_index = body->ise_size++;
         struct rb_iseq_new_with_callback_callback_func *ifunc =
             rb_iseq_new_with_callback_new_callback(build_postexe_iseq, node->nd_body);
-	const rb_iseq_t *once_iseq =
+        const rb_iseq_t *once_iseq =
             new_child_iseq_with_callback(iseq, ifunc,
-				 rb_fstring(make_name_for_block(iseq)), iseq, ISEQ_TYPE_BLOCK, line);
+                                 rb_fstring(make_name_for_block(iseq)), iseq, ISEQ_TYPE_BLOCK, line);
 
-	ADD_INSN2(ret, node, once, once_iseq, INT2FIX(is_index));
+        ADD_INSN2(ret, node, once, once_iseq, INT2FIX(is_index));
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)once_iseq);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_KW_ARG:
-	CHECK(compile_kw_arg(iseq, ret, node, popped));
-	break;
+        CHECK(compile_kw_arg(iseq, ret, node, popped));
+        break;
       case NODE_DSYM:{
-	compile_dstr(iseq, ret, node);
-	if (!popped) {
-	    ADD_INSN(ret, node, intern);
-	}
-	else {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        compile_dstr(iseq, ret, node);
+        if (!popped) {
+            ADD_INSN(ret, node, intern);
+        }
+        else {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       case NODE_ATTRASGN:
-	CHECK(compile_attrasgn(iseq, ret, node, popped));
-	break;
+        CHECK(compile_attrasgn(iseq, ret, node, popped));
+        break;
       case NODE_LAMBDA:{
-	/* compile same as lambda{...} */
-	const rb_iseq_t *block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
-	VALUE argc = INT2FIX(0);
+        /* compile same as lambda{...} */
+        const rb_iseq_t *block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+        VALUE argc = INT2FIX(0);
 
-	ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_CALL_WITH_BLOCK(ret, node, idLambda, argc, block);
+        ADD_INSN1(ret, node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_CALL_WITH_BLOCK(ret, node, idLambda, argc, block);
         RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block);
 
-	if (popped) {
-	    ADD_INSN(ret, node, pop);
-	}
-	break;
+        if (popped) {
+            ADD_INSN(ret, node, pop);
+        }
+        break;
       }
       default:
-	UNKNOWN_NODE("iseq_compile_each", node, COMPILE_NG);
+        UNKNOWN_NODE("iseq_compile_each", node, COMPILE_NG);
       ng:
-	debug_node_end();
-	return COMPILE_NG;
+        debug_node_end();
+        return COMPILE_NG;
     }
 
     debug_node_end();
@@ -9837,15 +10150,15 @@ opobj_inspect(VALUE obj)
 {
     if (!SPECIAL_CONST_P(obj) && !RBASIC_CLASS(obj)) {
         switch (BUILTIN_TYPE(obj)) {
-	  case T_STRING:
-	    obj = rb_str_new_cstr(RSTRING_PTR(obj));
-	    break;
-	  case T_ARRAY:
-	    obj = rb_ary_dup(obj);
-	    break;
+          case T_STRING:
+            obj = rb_str_new_cstr(RSTRING_PTR(obj));
+            break;
+          case T_ARRAY:
+            obj = rb_ary_dup(obj);
+            break;
           default:
             break;
-	}
+        }
     }
     return rb_inspect(obj);
 }
@@ -9858,86 +10171,92 @@ insn_data_to_s_detail(INSN *iobj)
     VALUE str = rb_sprintf("%-20s ", insn_name(iobj->insn_id));
 
     if (iobj->operands) {
-	const char *types = insn_op_types(iobj->insn_id);
-	int j;
-
-	for (j = 0; types[j]; j++) {
-	    char type = types[j];
-
-	    switch (type) {
-	      case TS_OFFSET:	/* label(destination position) */
-		{
-		    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
-		    rb_str_catf(str, LABEL_FORMAT, lobj->label_no);
-		    break;
-		}
-		break;
-	      case TS_ISEQ:	/* iseq */
-		{
-		    rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
-		    VALUE val = Qnil;
-		    if (0 && iseq) { /* TODO: invalidate now */
-			val = (VALUE)iseq;
-		    }
-		    rb_str_concat(str, opobj_inspect(val));
-		}
-		break;
-	      case TS_LINDEX:
-	      case TS_NUM:	/* ulong */
-	      case TS_VALUE:	/* VALUE */
-		{
-		    VALUE v = OPERAND_AT(iobj, j);
+        const char *types = insn_op_types(iobj->insn_id);
+        int j;
+
+        for (j = 0; types[j]; j++) {
+            char type = types[j];
+
+            switch (type) {
+              case TS_OFFSET:	/* label(destination position) */
+                {
+                    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
+                    rb_str_catf(str, LABEL_FORMAT, lobj->label_no);
+                    break;
+                }
+                break;
+              case TS_ISEQ:	/* iseq */
+                {
+                    rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
+                    VALUE val = Qnil;
+                    if (0 && iseq) { /* TODO: invalidate now */
+                        val = (VALUE)iseq;
+                    }
+                    rb_str_concat(str, opobj_inspect(val));
+                }
+                break;
+              case TS_LINDEX:
+              case TS_NUM:	/* ulong */
+              case TS_VALUE:	/* VALUE */
+                {
+                    VALUE v = OPERAND_AT(iobj, j);
                     if (!CLASS_OF(v))
                         rb_str_cat2(str, "<hidden>");
                     else {
                         rb_str_concat(str, opobj_inspect(v));
                     }
-		    break;
-		}
-	      case TS_ID:	/* ID */
-		rb_str_concat(str, opobj_inspect(OPERAND_AT(iobj, j)));
-		break;
-	      case TS_IC:	/* inline cache */
-	      case TS_IVC:	/* inline ivar cache */
-	      case TS_ICVARC:   /* inline cvar cache */
-	      case TS_ISE:	/* inline storage entry */
-		rb_str_catf(str, "<ic:%d>", FIX2INT(OPERAND_AT(iobj, j)));
-		break;
+                    break;
+                }
+              case TS_ID:	/* ID */
+                rb_str_concat(str, opobj_inspect(OPERAND_AT(iobj, j)));
+                break;
+              case TS_IC:	/* inline cache */
+                rb_str_concat(str, opobj_inspect(OPERAND_AT(iobj, j)));
+                break;
+              case TS_IVC:	/* inline ivar cache */
+                rb_str_catf(str, "<ivc:%d>", FIX2INT(OPERAND_AT(iobj, j)));
+                break;
+              case TS_ICVARC:   /* inline cvar cache */
+                rb_str_catf(str, "<icvarc:%d>", FIX2INT(OPERAND_AT(iobj, j)));
+                break;
+              case TS_ISE:	/* inline storage entry */
+                rb_str_catf(str, "<ise:%d>", FIX2INT(OPERAND_AT(iobj, j)));
+                break;
               case TS_CALLDATA: /* we store these as call infos at compile time */
-		{
+                {
                     const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, j);
                     rb_str_cat2(str, "<calldata:");
                     if (vm_ci_mid(ci)) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(vm_ci_mid(ci)));
                     rb_str_catf(str, ", %d>", vm_ci_argc(ci));
-		    break;
-		}
-	      case TS_CDHASH:	/* case/when condition cache */
-		rb_str_cat2(str, "<ch>");
-		break;
-	      case TS_FUNCPTR:
-		{
-		    void *func = (void *)OPERAND_AT(iobj, j);
+                    break;
+                }
+              case TS_CDHASH:	/* case/when condition cache */
+                rb_str_cat2(str, "<ch>");
+                break;
+              case TS_FUNCPTR:
+                {
+                    void *func = (void *)OPERAND_AT(iobj, j);
 #ifdef HAVE_DLADDR
-		    Dl_info info;
-		    if (dladdr(func, &info) && info.dli_sname) {
-			rb_str_cat2(str, info.dli_sname);
-			break;
-		    }
+                    Dl_info info;
+                    if (dladdr(func, &info) && info.dli_sname) {
+                        rb_str_cat2(str, info.dli_sname);
+                        break;
+                    }
 #endif
-		    rb_str_catf(str, "<%p>", func);
-		}
-		break;
+                    rb_str_catf(str, "<%p>", func);
+                }
+                break;
               case TS_BUILTIN:
                 rb_str_cat2(str, "<TS_BUILTIN>");
                 break;
-	      default:{
-		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
-	      }
-	    }
-	    if (types[j + 1]) {
-		rb_str_cat2(str, ", ");
-	    }
-	}
+              default:{
+                rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
+              }
+            }
+            if (types[j + 1]) {
+                rb_str_cat2(str, ", ");
+            }
+        }
     }
     return str;
 }
@@ -9959,40 +10278,40 @@ dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr,
     printf("-- raw disasm--------\n");
 
     while (link) {
-	if (curr) printf(curr == link ? "*" : " ");
-	switch (link->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		iobj = (INSN *)link;
-		str = insn_data_to_s_detail(iobj);
-		printf("  %04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->insn_info.line_no);
-		pos += insn_data_length(iobj);
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		lobj = (LABEL *)link;
-		printf(LABEL_FORMAT" [sp: %d]%s\n", lobj->label_no, lobj->sp,
-		       dest == lobj ? " <---" : "");
-		break;
-	    }
-	  case ISEQ_ELEMENT_TRACE:
-	    {
-		TRACE *trace = (TRACE *)link;
-		printf("  trace: %0x\n", trace->event);
-		break;
-	    }
-	  case ISEQ_ELEMENT_ADJUST:
-	    {
-		ADJUST *adjust = (ADJUST *)link;
-		printf("  adjust: [label: %d]\n", adjust->label ? adjust->label->label_no : -1);
-		break;
-	    }
-	  default:
-	    /* ignore */
-	    rb_raise(rb_eSyntaxError, "dump_disasm_list error: %ld\n", FIX2LONG(link->type));
-	}
-	link = link->next;
+        if (curr) printf(curr == link ? "*" : " ");
+        switch (link->type) {
+          case ISEQ_ELEMENT_INSN:
+            {
+                iobj = (INSN *)link;
+                str = insn_data_to_s_detail(iobj);
+                printf("  %04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->insn_info.line_no);
+                pos += insn_data_length(iobj);
+                break;
+            }
+          case ISEQ_ELEMENT_LABEL:
+            {
+                lobj = (LABEL *)link;
+                printf(LABEL_FORMAT" [sp: %d]%s\n", lobj->label_no, lobj->sp,
+                       dest == lobj ? " <---" : "");
+                break;
+            }
+          case ISEQ_ELEMENT_TRACE:
+            {
+                TRACE *trace = (TRACE *)link;
+                printf("  trace: %0x\n", trace->event);
+                break;
+            }
+          case ISEQ_ELEMENT_ADJUST:
+            {
+                ADJUST *adjust = (ADJUST *)link;
+                printf("  adjust: [label: %d]\n", adjust->label ? adjust->label->label_no : -1);
+                break;
+            }
+          default:
+            /* ignore */
+            rb_raise(rb_eSyntaxError, "dump_disasm_list error: %ld\n", FIX2LONG(link->type));
+        }
+        link = link->next;
     }
     printf("---------------------\n");
     fflush(stdout);
@@ -10010,7 +10329,7 @@ rb_insns_name_array(void)
     VALUE ary = rb_ary_new_capa(VM_INSTRUCTION_SIZE);
     int i;
     for (i = 0; i < VM_INSTRUCTION_SIZE; i++) {
-	rb_ary_push(ary, rb_fstring_cstr(insn_name(i)));
+        rb_ary_push(ary, rb_fstring_cstr(insn_name(i)));
     }
     return rb_obj_freeze(ary);
 }
@@ -10023,11 +10342,11 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
     obj = rb_to_symbol_type(obj);
 
     if (st_lookup(labels_table, obj, &tmp) == 0) {
-	label = NEW_LABEL(0);
-	st_insert(labels_table, obj, (st_data_t)label);
+        label = NEW_LABEL(0);
+        st_insert(labels_table, obj, (st_data_t)label);
     }
     else {
-	label = (LABEL *)tmp;
+        label = (LABEL *)tmp;
     }
     LABEL_REF(label);
     return label;
@@ -10040,12 +10359,12 @@ get_exception_sym2type(VALUE sym)
     static VALUE symBreak, symRedo, symNext;
 
     if (symRescue == 0) {
-	symRescue = ID2SYM(rb_intern_const("rescue"));
-	symEnsure = ID2SYM(rb_intern_const("ensure"));
-	symRetry  = ID2SYM(rb_intern_const("retry"));
-	symBreak  = ID2SYM(rb_intern_const("break"));
-	symRedo   = ID2SYM(rb_intern_const("redo"));
-	symNext   = ID2SYM(rb_intern_const("next"));
+        symRescue = ID2SYM(rb_intern_const("rescue"));
+        symEnsure = ID2SYM(rb_intern_const("ensure"));
+        symRetry  = ID2SYM(rb_intern_const("retry"));
+        symBreak  = ID2SYM(rb_intern_const("break"));
+        symRedo   = ID2SYM(rb_intern_const("redo"));
+        symNext   = ID2SYM(rb_intern_const("next"));
     }
 
     if (sym == symRescue) return CATCH_TYPE_RESCUE;
@@ -10060,25 +10379,25 @@ get_exception_sym2type(VALUE sym)
 
 static int
 iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
-		     VALUE exception)
+                     VALUE exception)
 {
     int i;
 
     for (i=0; i<RARRAY_LEN(exception); i++) {
-	const rb_iseq_t *eiseq;
-	VALUE v, type;
-	LABEL *lstart, *lend, *lcont;
-	unsigned int sp;
-
-	v = rb_to_array_type(RARRAY_AREF(exception, i));
-	if (RARRAY_LEN(v) != 6) {
-	    rb_raise(rb_eSyntaxError, "wrong exception entry");
-	}
+        const rb_iseq_t *eiseq;
+        VALUE v, type;
+        LABEL *lstart, *lend, *lcont;
+        unsigned int sp;
+
+        v = rb_to_array_type(RARRAY_AREF(exception, i));
+        if (RARRAY_LEN(v) != 6) {
+            rb_raise(rb_eSyntaxError, "wrong exception entry");
+        }
         type = get_exception_sym2type(RARRAY_AREF(v, 0));
         if (NIL_P(RARRAY_AREF(v, 1))) {
-	    eiseq = NULL;
-	}
-	else {
+            eiseq = NULL;
+        }
+        else {
             eiseq = rb_iseqw_to_iseq(rb_iseq_load(RARRAY_AREF(v, 1), (VALUE)iseq, Qnil));
         }
 
@@ -10087,18 +10406,18 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
         lcont  = register_label(iseq, labels_table, RARRAY_AREF(v, 4));
         sp     = NUM2UINT(RARRAY_AREF(v, 5));
 
-	/* TODO: Dirty Hack!  Fix me */
-	if (type == CATCH_TYPE_RESCUE ||
-	    type == CATCH_TYPE_BREAK ||
-	    type == CATCH_TYPE_NEXT) {
-	    ++sp;
-	}
+        /* TODO: Dirty Hack!  Fix me */
+        if (type == CATCH_TYPE_RESCUE ||
+            type == CATCH_TYPE_BREAK ||
+            type == CATCH_TYPE_NEXT) {
+            ++sp;
+        }
 
-	lcont->sp = sp;
+        lcont->sp = sp;
 
-	ADD_CATCH_ENTRY(type, lstart, lend, eiseq, lcont);
+        ADD_CATCH_ENTRY(type, lstart, lend, eiseq, lcont);
 
-	RB_GC_GUARD(v);
+        RB_GC_GUARD(v);
     }
     return COMPILE_OK;
 }
@@ -10111,7 +10430,7 @@ insn_make_insn_table(void)
     table = st_init_numtable_with_size(VM_INSTRUCTION_SIZE);
 
     for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
-	st_insert(table, ID2SYM(rb_intern_const(insn_name(i))), i);
+        st_insert(table, ID2SYM(rb_intern_const(insn_name(i))), i);
     }
 
     return table;
@@ -10124,13 +10443,13 @@ iseq_build_load_iseq(const rb_iseq_t *iseq, VALUE op)
     const rb_iseq_t *loaded_iseq;
 
     if (RB_TYPE_P(op, T_ARRAY)) {
-	iseqw = rb_iseq_load(op, (VALUE)iseq, Qnil);
+        iseqw = rb_iseq_load(op, (VALUE)iseq, Qnil);
     }
     else if (CLASS_OF(op) == rb_cISeq) {
-	iseqw = op;
+        iseqw = op;
     }
     else {
-	rb_raise(rb_eSyntaxError, "ISEQ is required");
+        rb_raise(rb_eSyntaxError, "ISEQ is required");
     }
 
     loaded_iseq = rb_iseqw_to_iseq(iseqw);
@@ -10146,28 +10465,28 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op)
     struct rb_callinfo_kwarg *kw_arg = 0;
 
     if (!NIL_P(op)) {
-	VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern_const("mid")));
-	VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern_const("flag")));
-	VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern_const("orig_argc")));
-	VALUE vkw_arg = rb_hash_aref(op, ID2SYM(rb_intern_const("kw_arg")));
-
-	if (!NIL_P(vmid)) mid = SYM2ID(vmid);
-	if (!NIL_P(vflag)) flag = NUM2UINT(vflag);
-	if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc);
-
-	if (!NIL_P(vkw_arg)) {
-	    int i;
-	    int len = RARRAY_LENINT(vkw_arg);
-	    size_t n = rb_callinfo_kwarg_bytes(len);
-
-	    kw_arg = xmalloc(n);
-	    kw_arg->keyword_len = len;
-	    for (i = 0; i < len; i++) {
-		VALUE kw = RARRAY_AREF(vkw_arg, i);
-		SYM2ID(kw);	/* make immortal */
-		kw_arg->keywords[i] = kw;
-	    }
-	}
+        VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern_const("mid")));
+        VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern_const("flag")));
+        VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern_const("orig_argc")));
+        VALUE vkw_arg = rb_hash_aref(op, ID2SYM(rb_intern_const("kw_arg")));
+
+        if (!NIL_P(vmid)) mid = SYM2ID(vmid);
+        if (!NIL_P(vflag)) flag = NUM2UINT(vflag);
+        if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc);
+
+        if (!NIL_P(vkw_arg)) {
+            int i;
+            int len = RARRAY_LENINT(vkw_arg);
+            size_t n = rb_callinfo_kwarg_bytes(len);
+
+            kw_arg = xmalloc(n);
+            kw_arg->keyword_len = len;
+            for (i = 0; i < len; i++) {
+                VALUE kw = RARRAY_AREF(vkw_arg, i);
+                SYM2ID(kw);	/* make immortal */
+                kw_arg->keywords[i] = kw;
+            }
+        }
     }
 
     const struct rb_callinfo *ci = new_callinfo(iseq, mid, orig_argc, flag, kw_arg, (flag & VM_CALL_ARGS_SIMPLE) == 0);
@@ -10179,20 +10498,20 @@ static rb_event_flag_t
 event_name_to_flag(VALUE sym)
 {
 #define CHECK_EVENT(ev) if (sym == ID2SYM(rb_intern_const(#ev))) return ev;
-		CHECK_EVENT(RUBY_EVENT_LINE);
-		CHECK_EVENT(RUBY_EVENT_CLASS);
-		CHECK_EVENT(RUBY_EVENT_END);
-		CHECK_EVENT(RUBY_EVENT_CALL);
-		CHECK_EVENT(RUBY_EVENT_RETURN);
-		CHECK_EVENT(RUBY_EVENT_B_CALL);
-		CHECK_EVENT(RUBY_EVENT_B_RETURN);
+                CHECK_EVENT(RUBY_EVENT_LINE);
+                CHECK_EVENT(RUBY_EVENT_CLASS);
+                CHECK_EVENT(RUBY_EVENT_END);
+                CHECK_EVENT(RUBY_EVENT_CALL);
+                CHECK_EVENT(RUBY_EVENT_RETURN);
+                CHECK_EVENT(RUBY_EVENT_B_CALL);
+                CHECK_EVENT(RUBY_EVENT_B_RETURN);
 #undef CHECK_EVENT
     return RUBY_EVENT_NONE;
 }
 
 static int
 iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
-			 VALUE body, VALUE node_ids, VALUE labels_wrapper)
+                         VALUE body, VALUE node_ids, VALUE labels_wrapper)
 {
     /* TODO: body should be frozen */
     long i, len = RARRAY_LEN(body);
@@ -10207,52 +10526,52 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
     static struct st_table *insn_table;
 
     if (insn_table == 0) {
-	insn_table = insn_make_insn_table();
+        insn_table = insn_make_insn_table();
     }
 
     for (i=0; i<len; i++) {
         VALUE obj = RARRAY_AREF(body, i);
 
-	if (SYMBOL_P(obj)) {
-	    rb_event_flag_t event;
-	    if ((event = event_name_to_flag(obj)) != RUBY_EVENT_NONE) {
-		ADD_TRACE(anchor, event);
-	    }
-	    else {
-		LABEL *label = register_label(iseq, labels_table, obj);
-		ADD_LABEL(anchor, label);
-	    }
-	}
-	else if (FIXNUM_P(obj)) {
-	    line_no = NUM2INT(obj);
-	}
-	else if (RB_TYPE_P(obj, T_ARRAY)) {
-	    VALUE *argv = 0;
-	    int argc = RARRAY_LENINT(obj) - 1;
-	    st_data_t insn_id;
-	    VALUE insn;
+        if (SYMBOL_P(obj)) {
+            rb_event_flag_t event;
+            if ((event = event_name_to_flag(obj)) != RUBY_EVENT_NONE) {
+                ADD_TRACE(anchor, event);
+            }
+            else {
+                LABEL *label = register_label(iseq, labels_table, obj);
+                ADD_LABEL(anchor, label);
+            }
+        }
+        else if (FIXNUM_P(obj)) {
+            line_no = NUM2INT(obj);
+        }
+        else if (RB_TYPE_P(obj, T_ARRAY)) {
+            VALUE *argv = 0;
+            int argc = RARRAY_LENINT(obj) - 1;
+            st_data_t insn_id;
+            VALUE insn;
 
             if (node_ids) {
                 node_id = NUM2INT(rb_ary_entry(node_ids, insn_idx++));
             }
 
-	    insn = (argc < 0) ? Qnil : RARRAY_AREF(obj, 0);
-	    if (st_lookup(insn_table, (st_data_t)insn, &insn_id) == 0) {
-		/* TODO: exception */
-		COMPILE_ERROR(iseq, line_no,
-			      "unknown instruction: %+"PRIsVALUE, insn);
-		ret = COMPILE_NG;
-		break;
-	    }
+            insn = (argc < 0) ? Qnil : RARRAY_AREF(obj, 0);
+            if (st_lookup(insn_table, (st_data_t)insn, &insn_id) == 0) {
+                /* TODO: exception */
+                COMPILE_ERROR(iseq, line_no,
+                              "unknown instruction: %+"PRIsVALUE, insn);
+                ret = COMPILE_NG;
+                break;
+            }
 
-	    if (argc != insn_len((VALUE)insn_id)-1) {
-		COMPILE_ERROR(iseq, line_no,
-			      "operand size mismatch");
-		ret = COMPILE_NG;
-		break;
-	    }
+            if (argc != insn_len((VALUE)insn_id)-1) {
+                COMPILE_ERROR(iseq, line_no,
+                              "operand size mismatch");
+                ret = COMPILE_NG;
+                break;
+            }
 
-	    if (argc > 0) {
+            if (argc > 0) {
                 argv = compile_data_calloc2(iseq, sizeof(VALUE), argc);
 
                 // add element before operand setup to make GC root
@@ -10261,95 +10580,120 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
                          (LINK_ELEMENT*)new_insn_core(iseq, &dummy_line_node,
                                                       (enum ruby_vminsn_type)insn_id, argc, argv));
 
-		for (j=0; j<argc; j++) {
-		    VALUE op = rb_ary_entry(obj, j+1);
-		    switch (insn_op_type((VALUE)insn_id, j)) {
-		      case TS_OFFSET: {
-			LABEL *label = register_label(iseq, labels_table, op);
-			argv[j] = (VALUE)label;
-			break;
-		      }
-		      case TS_LINDEX:
-		      case TS_NUM:
-			(void)NUM2INT(op);
-			argv[j] = op;
-			break;
-		      case TS_VALUE:
-			argv[j] = op;
-			RB_OBJ_WRITTEN(iseq, Qundef, op);
-			break;
-		      case TS_ISEQ:
-			{
-			    if (op != Qnil) {
-				VALUE v = (VALUE)iseq_build_load_iseq(iseq, op);
-				argv[j] = v;
-				RB_OBJ_WRITTEN(iseq, Qundef, v);
-			    }
-			    else {
-				argv[j] = 0;
-			    }
-			}
-			break;
-		      case TS_ISE:
-		      case TS_IC:
+                for (j=0; j<argc; j++) {
+                    VALUE op = rb_ary_entry(obj, j+1);
+                    switch (insn_op_type((VALUE)insn_id, j)) {
+                      case TS_OFFSET: {
+                        LABEL *label = register_label(iseq, labels_table, op);
+                        argv[j] = (VALUE)label;
+                        break;
+                      }
+                      case TS_LINDEX:
+                      case TS_NUM:
+                        (void)NUM2INT(op);
+                        argv[j] = op;
+                        break;
+                      case TS_VALUE:
+                        argv[j] = op;
+                        RB_OBJ_WRITTEN(iseq, Qundef, op);
+                        break;
+                      case TS_ISEQ:
+                        {
+                            if (op != Qnil) {
+                                VALUE v = (VALUE)iseq_build_load_iseq(iseq, op);
+                                argv[j] = v;
+                                RB_OBJ_WRITTEN(iseq, Qundef, v);
+                            }
+                            else {
+                                argv[j] = 0;
+                            }
+                        }
+                        break;
+                      case TS_ISE:
+                        argv[j] = op;
+                        if (NUM2UINT(op) >= ISEQ_BODY(iseq)->ise_size) {
+                            ISEQ_BODY(iseq)->ise_size = NUM2INT(op) + 1;
+                        }
+                        break;
+                      case TS_IC:
+                        {
+                            VALUE segments = rb_ary_new();
+                            op = rb_to_array_type(op);
+
+                            for (int i = 0; i < RARRAY_LEN(op); i++) {
+                                VALUE sym = RARRAY_AREF(op, i);
+                                sym = rb_to_symbol_type(sym);
+                                rb_ary_push(segments, sym);
+                            }
+
+                            RB_GC_GUARD(op);
+                            argv[j] = segments;
+                            RB_OBJ_WRITTEN(iseq, Qundef, segments);
+                            ISEQ_BODY(iseq)->ic_size++;
+                        }
+                        break;
                       case TS_IVC:  /* inline ivar cache */
+                        argv[j] = op;
+                        if (NUM2UINT(op) >= ISEQ_BODY(iseq)->ivc_size) {
+                            ISEQ_BODY(iseq)->ivc_size = NUM2INT(op) + 1;
+                        }
+                        break;
                       case TS_ICVARC:  /* inline cvar cache */
-			argv[j] = op;
-                        if (NUM2UINT(op) >= ISEQ_BODY(iseq)->is_size) {
-                            ISEQ_BODY(iseq)->is_size = NUM2INT(op) + 1;
+                        argv[j] = op;
+                        if (NUM2UINT(op) >= ISEQ_BODY(iseq)->icvarc_size) {
+                            ISEQ_BODY(iseq)->icvarc_size = NUM2INT(op) + 1;
                         }
-                        FL_SET((VALUE)iseq, ISEQ_MARKABLE_ISEQ);
-			break;
+                        break;
                       case TS_CALLDATA:
-			argv[j] = iseq_build_callinfo_from_hash(iseq, op);
-			break;
-		      case TS_ID:
-			argv[j] = rb_to_symbol_type(op);
-			break;
-		      case TS_CDHASH:
-			{
-			    int i;
-			    VALUE map = rb_hash_new_with_size(RARRAY_LEN(op)/2);
+                        argv[j] = iseq_build_callinfo_from_hash(iseq, op);
+                        break;
+                      case TS_ID:
+                        argv[j] = rb_to_symbol_type(op);
+                        break;
+                      case TS_CDHASH:
+                        {
+                            int i;
+                            VALUE map = rb_hash_new_with_size(RARRAY_LEN(op)/2);
 
                             RHASH_TBL_RAW(map)->type = &cdhash_type;
-			    op = rb_to_array_type(op);
-			    for (i=0; i<RARRAY_LEN(op); i+=2) {
-				VALUE key = RARRAY_AREF(op, i);
-				VALUE sym = RARRAY_AREF(op, i+1);
-				LABEL *label =
-				  register_label(iseq, labels_table, sym);
-				rb_hash_aset(map, key, (VALUE)label | 1);
-			    }
-			    RB_GC_GUARD(op);
-			    argv[j] = map;
-			    RB_OBJ_WRITTEN(iseq, Qundef, map);
-			}
-			break;
-		      case TS_FUNCPTR:
-			{
+                            op = rb_to_array_type(op);
+                            for (i=0; i<RARRAY_LEN(op); i+=2) {
+                                VALUE key = RARRAY_AREF(op, i);
+                                VALUE sym = RARRAY_AREF(op, i+1);
+                                LABEL *label =
+                                  register_label(iseq, labels_table, sym);
+                                rb_hash_aset(map, key, (VALUE)label | 1);
+                            }
+                            RB_GC_GUARD(op);
+                            argv[j] = map;
+                            RB_OBJ_WRITTEN(iseq, Qundef, map);
+                        }
+                        break;
+                      case TS_FUNCPTR:
+                        {
 #if SIZEOF_VALUE <= SIZEOF_LONG
-			    long funcptr = NUM2LONG(op);
+                            long funcptr = NUM2LONG(op);
 #else
-			    LONG_LONG funcptr = NUM2LL(op);
+                            LONG_LONG funcptr = NUM2LL(op);
 #endif
-			    argv[j] = (VALUE)funcptr;
-			}
-			break;
-		      default:
-			rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type((VALUE)insn_id, j));
-		    }
-		}
-	    }
+                            argv[j] = (VALUE)funcptr;
+                        }
+                        break;
+                      default:
+                        rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type((VALUE)insn_id, j));
+                    }
+                }
+            }
             else {
                 NODE dummy_line_node = generate_dummy_line_node(line_no, node_id);
                 ADD_ELEM(anchor,
                          (LINK_ELEMENT*)new_insn_core(iseq, &dummy_line_node,
                                                       (enum ruby_vminsn_type)insn_id, argc, NULL));
             }
-	}
-	else {
-	    rb_raise(rb_eTypeError, "unexpected object for instruction");
-	}
+        }
+        else {
+            rb_raise(rb_eTypeError, "unexpected object for instruction");
+        }
     }
     DATA_PTR(labels_wrapper) = 0;
     validate_labels(iseq, labels_table);
@@ -10365,12 +10709,12 @@ int_param(int *dst, VALUE param, VALUE sym)
 {
     VALUE val = rb_hash_aref(param, sym);
     if (FIXNUM_P(val)) {
-	*dst = FIX2INT(val);
-	return TRUE;
+        *dst = FIX2INT(val);
+        return TRUE;
     }
     else if (!NIL_P(val)) {
-	rb_raise(rb_eTypeError, "invalid %+"PRIsVALUE" Fixnum: %+"PRIsVALUE,
-		 sym, val);
+        rb_raise(rb_eTypeError, "invalid %+"PRIsVALUE" Fixnum: %+"PRIsVALUE,
+                 sym, val);
     }
     return FALSE;
 }
@@ -10397,20 +10741,20 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
 
     /* required args */
     for (i = 0; i < len; i++) {
-	VALUE val = RARRAY_AREF(keywords, i);
+        VALUE val = RARRAY_AREF(keywords, i);
 
-	if (!SYMBOL_P(val)) {
-	    goto default_values;
-	}
-	ids[i] = SYM2ID(val);
-	keyword->required_num++;
+        if (!SYMBOL_P(val)) {
+            goto default_values;
+        }
+        ids[i] = SYM2ID(val);
+        keyword->required_num++;
     }
 
   default_values: /* note: we intentionally preserve `i' from previous loop */
     default_len = len - i;
     if (default_len == 0) {
-	keyword->table = ids;
-	return keyword;
+        keyword->table = ids;
+        return keyword;
     }
     else if (default_len < 0) {
         UNREACHABLE;
@@ -10419,23 +10763,23 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
     dvs = ALLOC_N(VALUE, (unsigned int)default_len);
 
     for (j = 0; i < len; i++, j++) {
-	key = RARRAY_AREF(keywords, i);
-	CHECK_ARRAY(key);
-
-	switch (RARRAY_LEN(key)) {
-	  case 1:
-	    sym = RARRAY_AREF(key, 0);
-	    default_val = Qundef;
-	    break;
-	  case 2:
-	    sym = RARRAY_AREF(key, 0);
-	    default_val = RARRAY_AREF(key, 1);
-	    break;
-	  default:
-	    rb_raise(rb_eTypeError, "keyword default has unsupported len %+"PRIsVALUE, key);
-	}
-	ids[i] = SYM2ID(sym);
-	dvs[j] = default_val;
+        key = RARRAY_AREF(keywords, i);
+        CHECK_ARRAY(key);
+
+        switch (RARRAY_LEN(key)) {
+          case 1:
+            sym = RARRAY_AREF(key, 0);
+            default_val = Qundef;
+            break;
+          case 2:
+            sym = RARRAY_AREF(key, 0);
+            default_val = RARRAY_AREF(key, 1);
+            break;
+          default:
+            rb_raise(rb_eTypeError, "keyword default has unsupported len %+"PRIsVALUE, key);
+        }
+        ids[i] = SYM2ID(sym);
+        dvs[j] = default_val;
     }
 
     keyword->table = ids;
@@ -10444,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)
 {
@@ -10470,28 +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_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;
         }
@@ -10500,7 +10829,7 @@ rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *storage)
 
 void
 rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
-			 VALUE exception, VALUE body)
+                         VALUE exception, VALUE body)
 {
 #define SYM(s) ID2SYM(rb_intern_const(#s))
     int i, len;
@@ -10519,14 +10848,14 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
     ISEQ_BODY(iseq)->local_table = tbl = len > 0 ? (ID *)ALLOC_N(ID, ISEQ_BODY(iseq)->local_table_size) : NULL;
 
     for (i = 0; i < len; i++) {
-	VALUE lv = RARRAY_AREF(locals, i);
+        VALUE lv = RARRAY_AREF(locals, i);
 
-	if (sym_arg_rest == lv) {
-	    tbl[i] = 0;
-	}
-	else {
-	    tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
-	}
+        if (sym_arg_rest == lv) {
+            tbl[i] = 0;
+        }
+        else {
+            tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
+        }
     }
 
 #define INT_PARAM(F) int_param(&ISEQ_BODY(iseq)->param.F, params, SYM(F))
@@ -10540,10 +10869,10 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 #undef INT_PARAM
     {
 #define INT_PARAM(F) F = (int_param(&x, misc, SYM(F)) ? (unsigned int)x : 0)
-	int x;
-	INT_PARAM(arg_size);
-	INT_PARAM(local_size);
-	INT_PARAM(stack_max);
+        int x;
+        INT_PARAM(arg_size);
+        INT_PARAM(local_size);
+        INT_PARAM(stack_max);
 #undef INT_PARAM
     }
 
@@ -10551,38 +10880,38 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 #ifdef USE_ISEQ_NODE_ID
     node_ids = rb_hash_aref(misc, ID2SYM(rb_intern("node_ids")));
     if (!RB_TYPE_P(node_ids, T_ARRAY)) {
-	rb_raise(rb_eTypeError, "node_ids is not an array");
+        rb_raise(rb_eTypeError, "node_ids is not an array");
     }
 #endif
 
     if (RB_TYPE_P(arg_opt_labels, T_ARRAY)) {
-	len = RARRAY_LENINT(arg_opt_labels);
+        len = RARRAY_LENINT(arg_opt_labels);
         ISEQ_BODY(iseq)->param.flags.has_opt = !!(len - 1 >= 0);
 
         if (ISEQ_BODY(iseq)->param.flags.has_opt) {
-	    VALUE *opt_table = ALLOC_N(VALUE, len);
+            VALUE *opt_table = ALLOC_N(VALUE, len);
 
-	    for (i = 0; i < len; i++) {
-		VALUE ent = RARRAY_AREF(arg_opt_labels, i);
-		LABEL *label = register_label(iseq, labels_table, ent);
-		opt_table[i] = (VALUE)label;
-	    }
+            for (i = 0; i < len; i++) {
+                VALUE ent = RARRAY_AREF(arg_opt_labels, i);
+                LABEL *label = register_label(iseq, labels_table, ent);
+                opt_table[i] = (VALUE)label;
+            }
 
             ISEQ_BODY(iseq)->param.opt_num = len - 1;
             ISEQ_BODY(iseq)->param.opt_table = opt_table;
-	}
+        }
     }
     else if (!NIL_P(arg_opt_labels)) {
-	rb_raise(rb_eTypeError, ":opt param is not an array: %+"PRIsVALUE,
-		 arg_opt_labels);
+        rb_raise(rb_eTypeError, ":opt param is not an array: %+"PRIsVALUE,
+                 arg_opt_labels);
     }
 
     if (RB_TYPE_P(keywords, T_ARRAY)) {
         ISEQ_BODY(iseq)->param.keyword = iseq_build_kw(iseq, params, keywords);
     }
     else if (!NIL_P(keywords)) {
-	rb_raise(rb_eTypeError, ":keywords param is not an array: %+"PRIsVALUE,
-		 keywords);
+        rb_raise(rb_eTypeError, ":keywords param is not an array: %+"PRIsVALUE,
+                 keywords);
     }
 
     if (Qtrue == rb_hash_aref(params, SYM(ambiguous_param0))) {
@@ -10591,10 +10920,10 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 
     if (int_param(&i, params, SYM(kwrest))) {
         struct rb_iseq_param_keyword *keyword = (struct rb_iseq_param_keyword *)ISEQ_BODY(iseq)->param.keyword;
-	if (keyword == NULL) {
+        if (keyword == NULL) {
             ISEQ_BODY(iseq)->param.keyword = keyword = ZALLOC(struct rb_iseq_param_keyword);
-	}
-	keyword->rest_start = i;
+        }
+        keyword->rest_start = i;
         ISEQ_BODY(iseq)->param.flags.has_kwrest = TRUE;
     }
 #undef SYM
@@ -10618,22 +10947,22 @@ rb_dvar_defined(ID id, const rb_iseq_t *iseq)
 {
     if (iseq) {
         const struct rb_iseq_constant_body *body = ISEQ_BODY(iseq);
-	while (body->type == ISEQ_TYPE_BLOCK ||
-	       body->type == ISEQ_TYPE_RESCUE ||
-	       body->type == ISEQ_TYPE_ENSURE ||
-	       body->type == ISEQ_TYPE_EVAL ||
-	       body->type == ISEQ_TYPE_MAIN
-	       ) {
-	    unsigned int i;
-
-	    for (i = 0; i < body->local_table_size; i++) {
-		if (body->local_table[i] == id) {
-		    return 1;
-		}
-	    }
-	    iseq = body->parent_iseq;
+        while (body->type == ISEQ_TYPE_BLOCK ||
+               body->type == ISEQ_TYPE_RESCUE ||
+               body->type == ISEQ_TYPE_ENSURE ||
+               body->type == ISEQ_TYPE_EVAL ||
+               body->type == ISEQ_TYPE_MAIN
+               ) {
+            unsigned int i;
+
+            for (i = 0; i < body->local_table_size; i++) {
+                if (body->local_table[i] == id) {
+                    return 1;
+                }
+            }
+            iseq = body->parent_iseq;
             body = ISEQ_BODY(iseq);
-	}
+        }
     }
     return 0;
 }
@@ -10642,14 +10971,14 @@ int
 rb_local_defined(ID id, const rb_iseq_t *iseq)
 {
     if (iseq) {
-	unsigned int i;
+        unsigned int i;
         const struct rb_iseq_constant_body *const body = ISEQ_BODY(ISEQ_BODY(iseq)->local_iseq);
 
-	for (i=0; i<body->local_table_size; i++) {
-	    if (body->local_table[i] == id) {
-		return 1;
-	    }
-	}
+        for (i=0; i<body->local_table_size; i++) {
+            if (body->local_table[i] == id) {
+                return 1;
+            }
+        }
     }
     return 0;
 }
@@ -10668,8 +10997,8 @@ typedef unsigned int ibf_offset_t;
 #define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr))
 
 #define IBF_MAJOR_VERSION ISEQ_MAJOR_VERSION
-#if RUBY_DEVEL
-#define IBF_DEVEL_VERSION 3
+#ifdef RUBY_DEVEL
+#define IBF_DEVEL_VERSION 4
 #define IBF_MINOR_VERSION (ISEQ_MINOR_VERSION * 10000 + IBF_DEVEL_VERSION)
 #else
 #define IBF_MINOR_VERSION ISEQ_MINOR_VERSION
@@ -10699,8 +11028,6 @@ struct ibf_dump {
     struct ibf_dump_buffer *current_buffer;
 };
 
-rb_iseq_t * iseq_alloc(void);
-
 struct ibf_load_buffer {
     const char *buff;
     ibf_offset_t size;
@@ -11109,17 +11436,18 @@ ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq)
                 wv = (VALUE)ibf_dump_iseq(dump, (const rb_iseq_t *)op);
                 break;
               case TS_IC:
+                {
+                    IC ic = (IC)op;
+                    VALUE arr = idlist_to_array(ic->segments);
+                    wv = ibf_dump_object(dump, arr);
+                }
+                break;
+              case TS_ISE:
               case TS_IVC:
               case TS_ICVARC:
-              case TS_ISE:
                 {
-                    unsigned int i;
-                    for (i=0; i<body->is_size; i++) {
-                        if (op == (VALUE)&body->is_entries[i]) {
-                            break;
-                        }
-                    }
-                    wv = (VALUE)i;
+                    union iseq_inline_storage_entry *is = (union iseq_inline_storage_entry *)op;
+                    wv = is - ISEQ_IS_ENTRY_START(body, types[op_index]);
                 }
                 break;
               case TS_CALLDATA:
@@ -11158,12 +11486,23 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
 
     struct rb_iseq_constant_body *load_body = ISEQ_BODY(iseq);
     struct rb_call_data *cd_entries = load_body->call_data;
-    union iseq_inline_storage_entry *is_entries = load_body->is_entries;
+    int ic_index = 0;
+
+    iseq_bits_t * mark_offset_bits;
+
+    iseq_bits_t tmp[1] = {0};
+
+    if (ISEQ_MBITS_BUFLEN(iseq_size) == 1) {
+        mark_offset_bits = tmp;
+    }
+    else {
+        mark_offset_bits = ZALLOC_N(iseq_bits_t, ISEQ_MBITS_BUFLEN(iseq_size));
+    }
+    bool needs_bitmap = false;
 
     for (code_index=0; code_index<iseq_size;) {
         /* opcode */
         const VALUE insn = code[code_index] = ibf_load_small_value(load, &reading_pos);
-        const unsigned int insn_index = code_index;
         const char *types = insn_op_types(insn);
         int op_index;
 
@@ -11180,7 +11519,8 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
                     code[code_index] = v;
                     if (!SPECIAL_CONST_P(v)) {
                         RB_OBJ_WRITTEN(iseqv, Qundef, v);
-                        FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
+                        ISEQ_MBITS_SET(mark_offset_bits, code_index);
+                        needs_bitmap = true;
                     }
                     break;
                 }
@@ -11199,8 +11539,9 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
                     pinned_list_store(load->current_buffer->obj_list, (long)op, v);
 
                     code[code_index] = v;
+                    ISEQ_MBITS_SET(mark_offset_bits, code_index);
                     RB_OBJ_WRITTEN(iseqv, Qundef, v);
-                    FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
+                    needs_bitmap = true;
                     break;
                 }
               case TS_ISEQ:
@@ -11210,25 +11551,46 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
                     code[code_index] = v;
                     if (!SPECIAL_CONST_P(v)) {
                         RB_OBJ_WRITTEN(iseqv, Qundef, v);
-                        FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
+                        ISEQ_MBITS_SET(mark_offset_bits, code_index);
+                        needs_bitmap = true;
                     }
                     break;
                 }
-              case TS_ISE:
               case TS_IC:
-              case TS_IVC:
-              case TS_ICVARC:
                 {
                     VALUE op = ibf_load_small_value(load, &reading_pos);
-                    code[code_index] = (VALUE)&is_entries[op];
+                    VALUE arr = ibf_load_object(load, op);
+
+                    IC ic = &ISEQ_IS_IC_ENTRY(load_body, ic_index++);
+                    ic->segments = array_to_idlist(arr);
+
+                    code[code_index] = (VALUE)ic;
+                }
+                break;
+              case TS_ISE:
+              case TS_ICVARC:
+              case TS_IVC:
+                {
+                    unsigned int op = (unsigned int)ibf_load_small_value(load, &reading_pos);
+
+                    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(opt_getinlinecache) && operand_type == TS_IC) {
-                        // Store the instruction index for opt_getinlinecache on the IC for
-                        // YJIT to invalidate code when opt_setinlinecache runs.
-                        is_entries[op].ic_cache.get_insn_idx = insn_index;
+                        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);
                     }
+
                 }
-                FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
                 break;
               case TS_CALLDATA:
                 {
@@ -11256,9 +11618,23 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
             rb_raise(rb_eRuntimeError, "operand size mismatch");
         }
     }
+
     load_body->iseq_encoded = code;
     load_body->iseq_size = code_index;
 
+    if (ISEQ_MBITS_BUFLEN(load_body->iseq_size) == 1) {
+        load_body->mark_bits.single = mark_offset_bits[0];
+    }
+    else {
+        if (needs_bitmap) {
+            load_body->mark_bits.list = mark_offset_bits;
+        }
+        else {
+            load_body->mark_bits.list = 0;
+            ruby_xfree(mark_offset_bits);
+        }
+    }
+
     assert(code_index == iseq_size);
     assert(reading_pos == bytecode_offset + bytecode_size);
     return code;
@@ -11484,7 +11860,7 @@ ibf_load_catch_table(const struct ibf_load *load, ibf_offset_t catch_table_offse
         unsigned int i;
         for (i=0; i<table->size; i++) {
             int iseq_index = (int)ibf_load_small_value(load, &reading_pos);
-            table->entries[i].type = (enum catch_type)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].type = (enum rb_catch_type)ibf_load_small_value(load, &reading_pos);
             table->entries[i].start = (unsigned int)ibf_load_small_value(load, &reading_pos);
             table->entries[i].end = (unsigned int)ibf_load_small_value(load, &reading_pos);
             table->entries[i].cont = (unsigned int)ibf_load_small_value(load, &reading_pos);
@@ -11739,7 +12115,10 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
     ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(outer_variables_offset));
     ibf_dump_write_small_value(dump, body->variable.flip_count);
     ibf_dump_write_small_value(dump, body->local_table_size);
-    ibf_dump_write_small_value(dump, body->is_size);
+    ibf_dump_write_small_value(dump, body->ivc_size);
+    ibf_dump_write_small_value(dump, body->icvarc_size);
+    ibf_dump_write_small_value(dump, body->ise_size);
+    ibf_dump_write_small_value(dump, body->ic_size);
     ibf_dump_write_small_value(dump, body->ci_size);
     ibf_dump_write_small_value(dump, body->stack_max);
     ibf_dump_write_small_value(dump, body->catch_except_p);
@@ -11828,7 +12207,7 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     const VALUE location_pathobj_index = ibf_load_small_value(load, &reading_pos);
     const VALUE location_base_label_index = ibf_load_small_value(load, &reading_pos);
     const VALUE location_label_index = ibf_load_small_value(load, &reading_pos);
-    const VALUE location_first_lineno = ibf_load_small_value(load, &reading_pos);
+    const int location_first_lineno = (int)ibf_load_small_value(load, &reading_pos);
     const int location_node_id = (int)ibf_load_small_value(load, &reading_pos);
     const int location_code_location_beg_pos_lineno = (int)ibf_load_small_value(load, &reading_pos);
     const int location_code_location_beg_pos_column = (int)ibf_load_small_value(load, &reading_pos);
@@ -11847,12 +12226,51 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     const ibf_offset_t outer_variables_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
     const rb_snum_t variable_flip_count = (rb_snum_t)ibf_load_small_value(load, &reading_pos);
     const unsigned int local_table_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
-    const unsigned int is_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+
+    const unsigned int ivc_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int icvarc_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int ise_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int ic_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+
     const unsigned int ci_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
     const unsigned int stack_max = (unsigned int)ibf_load_small_value(load, &reading_pos);
     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;
@@ -11875,7 +12293,6 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load_body->param.post_num = param_post_num;
     load_body->param.block_start = param_block_start;
     load_body->local_table_size = local_table_size;
-    load_body->is_size = is_size;
     load_body->ci_size = ci_size;
     load_body->insns_info.size = insns_info_size;
 
@@ -11893,7 +12310,11 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load_body->catch_except_p = catch_except_p;
     load_body->builtin_inline_p = builtin_inline_p;
 
-    load_body->is_entries           = ZALLOC_N(union iseq_inline_storage_entry, is_size);
+    load_body->ivc_size             = ivc_size;
+    load_body->icvarc_size          = icvarc_size;
+    load_body->ise_size             = ise_size;
+    load_body->ic_size              = ic_size;
+    load_body->is_entries           = ZALLOC_N(union iseq_inline_storage_entry, ISEQ_IS_SIZE(load_body));
                                       ibf_load_ci_entries(load, ci_entries_offset, ci_size, &load_body->call_data);
     load_body->outer_variables      = ibf_load_outer_variables(load, outer_variables_offset);
     load_body->param.opt_table      = ibf_load_param_opt_table(load, param_opt_table_offset, param_opt_num);
@@ -11918,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));
 
@@ -11952,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
@@ -11975,7 +12372,7 @@ ibf_dump_iseq_list_i(st_data_t key, st_data_t val, st_data_t ptr)
 static void
 ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header)
 {
-    VALUE offset_list = rb_ary_tmp_new(dump->iseq_table->num_entries);
+    VALUE offset_list = rb_ary_hidden_new(dump->iseq_table->num_entries);
 
     struct ibf_dump_iseq_list_arg args;
     args.dump = dump;
@@ -12064,7 +12461,7 @@ static const void *
 ibf_load_check_offset(const struct ibf_load *load, size_t offset)
 {
     if (offset >= load->current_buffer->size) {
-	rb_raise(rb_eIndexError, "object offset out of range: %"PRIdSIZE, offset);
+        rb_raise(rb_eIndexError, "object offset out of range: %"PRIdSIZE, offset);
     }
     return load->current_buffer->buff + offset;
 }
@@ -12125,11 +12522,11 @@ ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_heade
 
     switch (cindex) {
       case IBF_OBJECT_CLASS_OBJECT:
-	return rb_cObject;
+        return rb_cObject;
       case IBF_OBJECT_CLASS_ARRAY:
-	return rb_cArray;
+        return rb_cArray;
       case IBF_OBJECT_CLASS_STANDARD_ERROR:
-	return rb_eStandardError;
+        return rb_eStandardError;
       case IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR:
         return rb_eNoMatchingPatternError;
       case IBF_OBJECT_CLASS_TYPE_ERROR:
@@ -12247,7 +12644,7 @@ ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_heade
 
     const long len = (long)ibf_load_small_value(load, &reading_pos);
 
-    VALUE ary = rb_ary_new_capa(len);
+    VALUE ary = header->internal ? rb_ary_hidden_new(len) : rb_ary_new_capa(len);
     int i;
 
     for (i=0; i<len; i++) {
@@ -12255,8 +12652,7 @@ ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_heade
         rb_ary_push(ary, ibf_load_object(load, index));
     }
 
-    if (header->internal) rb_obj_hide(ary);
-    if (header->frozen)   rb_obj_freeze(ary);
+    if (header->frozen) rb_obj_freeze(ary);
 
     return ary;
 }
@@ -12359,7 +12755,7 @@ ibf_load_object_bignum(const struct ibf_load *load, const struct ibf_object_head
     int sign = bignum->slen > 0;
     ssize_t len = sign > 0 ? bignum->slen : -1 * bignum->slen;
     VALUE obj = rb_integer_unpack(bignum->digits, len * 2, 2, 0,
-				  INTEGER_PACK_LITTLE_ENDIAN | (sign == 0 ? INTEGER_PACK_NEGATIVE : 0));
+                                  INTEGER_PACK_LITTLE_ENDIAN | (sign == 0 ? INTEGER_PACK_NEGATIVE : 0));
     if (header->internal) rb_obj_hide(obj);
     if (header->frozen)   rb_obj_freeze(obj);
     return obj;
@@ -12643,7 +13039,7 @@ static void
 ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size)
 {
     st_table *obj_table = dump->current_buffer->obj_table;
-    VALUE offset_list = rb_ary_tmp_new(obj_table->num_entries);
+    VALUE offset_list = rb_ary_hidden_new(obj_table->num_entries);
 
     struct ibf_dump_object_list_arg args;
     args.dump = dump;
@@ -12703,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
@@ -12786,8 +13182,8 @@ rb_ibf_load_iseq_complete(rb_iseq_t *iseq)
     load->iseq = iseq;
 #if IBF_ISEQ_DEBUG
     fprintf(stderr, "rb_ibf_load_iseq_complete: index=%#x offset=%#x size=%#x\n",
-	    iseq->aux.loader.index, offset,
-	    load->header->size);
+            iseq->aux.loader.index, offset,
+            load->header->size);
 #endif
     ibf_load_iseq_each(load, iseq, offset);
     ISEQ_COMPILE_DATA_CLEAR(iseq);
@@ -12812,37 +13208,37 @@ ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq)
 
 #if IBF_ISEQ_DEBUG
     fprintf(stderr, "ibf_load_iseq: index_iseq=%p iseq_list=%p\n",
-	    (void *)index_iseq, (void *)load->iseq_list);
+            (void *)index_iseq, (void *)load->iseq_list);
 #endif
     if (iseq_index == -1) {
-	return NULL;
+        return NULL;
     }
     else {
-	VALUE iseqv = pinned_list_fetch(load->iseq_list, iseq_index);
+        VALUE iseqv = pinned_list_fetch(load->iseq_list, iseq_index);
 
 #if IBF_ISEQ_DEBUG
-	fprintf(stderr, "ibf_load_iseq: iseqv=%p\n", (void *)iseqv);
+        fprintf(stderr, "ibf_load_iseq: iseqv=%p\n", (void *)iseqv);
 #endif
-	if (iseqv) {
-	    return (rb_iseq_t *)iseqv;
-	}
-	else {
-	    rb_iseq_t *iseq = iseq_imemo_alloc();
+        if (iseqv) {
+            return (rb_iseq_t *)iseqv;
+        }
+        else {
+            rb_iseq_t *iseq = iseq_imemo_alloc();
 #if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: new iseq=%p\n", (void *)iseq);
+            fprintf(stderr, "ibf_load_iseq: new iseq=%p\n", (void *)iseq);
 #endif
-	    FL_SET((VALUE)iseq, ISEQ_NOT_LOADED_YET);
-	    iseq->aux.loader.obj = load->loader_obj;
-	    iseq->aux.loader.index = iseq_index;
+            FL_SET((VALUE)iseq, ISEQ_NOT_LOADED_YET);
+            iseq->aux.loader.obj = load->loader_obj;
+            iseq->aux.loader.index = iseq_index;
 #if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: iseq=%p loader_obj=%p index=%d\n",
-		    (void *)iseq, (void *)load->loader_obj, iseq_index);
+            fprintf(stderr, "ibf_load_iseq: iseq=%p loader_obj=%p index=%d\n",
+                    (void *)iseq, (void *)load->loader_obj, iseq_index);
 #endif
-	    pinned_list_store(load->iseq_list, iseq_index, (VALUE)iseq);
+            pinned_list_store(load->iseq_list, iseq_index, (VALUE)iseq);
 
 #if !USE_LAZY_LOAD
 #if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", (void *)iseq);
+            fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", (void *)iseq);
 #endif
             rb_ibf_load_iseq_complete(iseq);
 #else
@@ -12852,11 +13248,11 @@ ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq)
 #endif /* !USE_LAZY_LOAD */
 
 #if IBF_ISEQ_DEBUG
-	    fprintf(stderr, "ibf_load_iseq: iseq=%p loaded %p\n",
-		    (void *)iseq, (void *)load->iseq);
+            fprintf(stderr, "ibf_load_iseq: iseq=%p loaded %p\n",
+                    (void *)iseq, (void *)load->iseq);
 #endif
-	    return iseq;
-	}
+            return iseq;
+        }
     }
 }
 
@@ -12876,18 +13272,18 @@ ibf_load_setup_bytes(struct ibf_load *load, VALUE loader_obj, const char *bytes,
     load->current_buffer = &load->global_buffer;
 
     if (size < load->header->size) {
-	rb_raise(rb_eRuntimeError, "broken binary format");
+        rb_raise(rb_eRuntimeError, "broken binary format");
     }
     if (strncmp(load->header->magic, "YARB", 4) != 0) {
-	rb_raise(rb_eRuntimeError, "unknown binary format");
+        rb_raise(rb_eRuntimeError, "unknown binary format");
     }
     if (load->header->major_version != IBF_MAJOR_VERSION ||
-	load->header->minor_version != IBF_MINOR_VERSION) {
-	rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)",
-		 load->header->major_version, load->header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION);
+        load->header->minor_version != IBF_MINOR_VERSION) {
+        rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)",
+                 load->header->major_version, load->header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION);
     }
     if (strcmp(load->global_buffer.buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) {
-	rb_raise(rb_eRuntimeError, "unmatched platform");
+        rb_raise(rb_eRuntimeError, "unmatched platform");
     }
     if (load->header->iseq_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
         rb_raise(rb_eArgError, "unaligned iseq list offset: %u",
diff --git a/complex.c b/complex.c
index 92f4e812d6..a227cb0a58 100644
--- a/complex.c
+++ b/complex.c
@@ -97,7 +97,7 @@ inline static VALUE
 f_div(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y) && FIX2LONG(y) == 1)
-	return x;
+        return x;
     return rb_funcall(x, '/', 1, y);
 }
 
@@ -152,7 +152,7 @@ f_sub(VALUE x, VALUE y)
 {
     if (FIXNUM_ZERO_P(y) &&
         LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMINUS))) {
-	return x;
+        return x;
     }
     return rb_funcall(x, '-', 1, y);
 }
@@ -262,7 +262,7 @@ inline static VALUE
 f_to_i(VALUE x)
 {
     if (RB_TYPE_P(x, T_STRING))
-	return rb_str_to_inum(x, 10, 0);
+        return rb_str_to_inum(x, 10, 0);
     return rb_funcall(x, id_to_i, 0);
 }
 
@@ -270,7 +270,7 @@ inline static VALUE
 f_to_f(VALUE x)
 {
     if (RB_TYPE_P(x, T_STRING))
-	return DBL2NUM(rb_str_to_dbl(x, 0));
+        return DBL2NUM(rb_str_to_dbl(x, 0));
     return rb_funcall(x, id_to_f, 0);
 }
 
@@ -280,9 +280,9 @@ inline static int
 f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
-	return x == y;
+        return x == y;
     else if (RB_FLOAT_TYPE_P(x) || RB_FLOAT_TYPE_P(y))
-	return NUM2DBL(x) == NUM2DBL(y);
+        return NUM2DBL(x) == NUM2DBL(y);
     return (int)rb_equal(x, y);
 }
 
@@ -316,7 +316,7 @@ f_negative_p(VALUE x)
 
 #define f_positive_p(x) (!f_negative_p(x))
 
-inline static int
+inline static bool
 f_zero_p(VALUE x)
 {
     if (RB_FLOAT_TYPE_P(x)) {
@@ -329,7 +329,7 @@ f_zero_p(VALUE x)
         const VALUE num = RRATIONAL(x)->num;
         return FIXNUM_ZERO_P(num);
     }
-    return (int)rb_equal(x, ZERO);
+    return rb_equal(x, ZERO) != 0;
 }
 
 #define f_nonzero_p(x) (!f_zero_p(x))
@@ -349,7 +349,7 @@ f_finite_p(VALUE x)
         return TRUE;
     }
     else if (RB_FLOAT_TYPE_P(x)) {
-	return isfinite(RFLOAT_VALUE(x));
+        return isfinite(RFLOAT_VALUE(x));
     }
     return RTEST(rb_funcallv(x, id_finite_p, 0, 0));
 }
@@ -361,7 +361,7 @@ f_infinite_p(VALUE x)
         return FALSE;
     }
     else if (RB_FLOAT_TYPE_P(x)) {
-	return isinf(RFLOAT_VALUE(x));
+        return isinf(RFLOAT_VALUE(x));
     }
     return RTEST(rb_funcallv(x, id_infinite_p, 0, 0));
 }
@@ -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 (!k_numeric_p(num) || !f_real_p(num))
-	    rb_raise(rb_eTypeError, "not a real");
+        !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
@@ -439,28 +446,28 @@ nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
     complex_r = RB_TYPE_P(real, T_COMPLEX);
     complex_i = RB_TYPE_P(imag, T_COMPLEX);
     if (!complex_r && !complex_i) {
-	return nucomp_s_new_internal(klass, real, imag);
+        return nucomp_s_new_internal(klass, real, imag);
     }
     else if (!complex_r) {
-	get_dat1(imag);
+        get_dat1(imag);
 
-	return nucomp_s_new_internal(klass,
-				     f_sub(real, dat->imag),
-				     f_add(ZERO, dat->real));
+        return nucomp_s_new_internal(klass,
+                                     f_sub(real, dat->imag),
+                                     f_add(ZERO, dat->real));
     }
     else if (!complex_i) {
-	get_dat1(real);
+        get_dat1(real);
 
-	return nucomp_s_new_internal(klass,
-				     dat->real,
-				     f_add(dat->imag, imag));
+        return nucomp_s_new_internal(klass,
+                                     dat->real,
+                                     f_add(dat->imag, imag));
     }
     else {
-	get_dat2(real, imag);
+        get_dat2(real, imag);
 
-	return nucomp_s_new_internal(klass,
-				     f_sub(adat->real, bdat->imag),
-				     f_add(adat->imag, bdat->real));
+        return nucomp_s_new_internal(klass,
+                                     f_sub(adat->real, bdat->imag),
+                                     f_add(adat->imag, bdat->real));
     }
 }
 
@@ -480,22 +487,26 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
 
     switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
       case 1:
-	nucomp_real_check(real);
-	imag = ZERO;
-	break;
+        real = nucomp_real_check(real);
+        imag = ZERO;
+        break;
       default:
-	nucomp_real_check(real);
-	nucomp_real_check(imag);
-	break;
+        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
 f_complex_new2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
+    if (RB_TYPE_P(x, T_COMPLEX)) {
+        get_dat1(x);
+        x = dat->real;
+        y = f_add(dat->imag, y);
+    }
     return nucomp_s_canonicalize_internal(klass, x, y);
 }
 
@@ -550,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);
@@ -580,14 +591,14 @@ static VALUE
 m_cos(VALUE x)
 {
     if (!RB_TYPE_P(x, T_COMPLEX))
-	return m_cos_bang(x);
+        return m_cos_bang(x);
     {
-	get_dat1(x);
-	return f_complex_new2(rb_cComplex,
-			      f_mul(m_cos_bang(dat->real),
-				    m_cosh_bang(dat->imag)),
-			      f_mul(f_negate(m_sin_bang(dat->real)),
-				    m_sinh_bang(dat->imag)));
+        get_dat1(x);
+        return f_complex_new2(rb_cComplex,
+                              f_mul(m_cos_bang(dat->real),
+                                    m_cosh_bang(dat->imag)),
+                              f_mul(f_negate(m_sin_bang(dat->real)),
+                                    m_sinh_bang(dat->imag)));
     }
 }
 
@@ -595,55 +606,61 @@ static VALUE
 m_sin(VALUE x)
 {
     if (!RB_TYPE_P(x, T_COMPLEX))
-	return m_sin_bang(x);
+        return m_sin_bang(x);
     {
-	get_dat1(x);
-	return f_complex_new2(rb_cComplex,
-			      f_mul(m_sin_bang(dat->real),
-				    m_cosh_bang(dat->imag)),
-			      f_mul(m_cos_bang(dat->real),
-				    m_sinh_bang(dat->imag)));
+        get_dat1(x);
+        return f_complex_new2(rb_cComplex,
+                              f_mul(m_sin_bang(dat->real),
+                                    m_cosh_bang(dat->imag)),
+                              f_mul(m_cos_bang(dat->real),
+                                    m_sinh_bang(dat->imag)));
     }
 }
 
 static VALUE
-f_complex_polar(VALUE klass, VALUE x, VALUE y)
+f_complex_polar_real(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
-    assert(!RB_TYPE_P(y, T_COMPLEX));
     if (f_zero_p(x) || f_zero_p(y)) {
-	return nucomp_s_new_internal(klass, x, RFLOAT_0);
+        return nucomp_s_new_internal(klass, x, RFLOAT_0);
     }
     if (RB_FLOAT_TYPE_P(y)) {
-	const double arg = RFLOAT_VALUE(y);
-	if (arg == M_PI) {
-	    x = f_negate(x);
-	    y = RFLOAT_0;
-	}
-	else if (arg == M_PI_2) {
-	    y = x;
-	    x = RFLOAT_0;
-	}
-	else if (arg == M_PI_2+M_PI) {
-	    y = f_negate(x);
-	    x = RFLOAT_0;
-	}
-	else if (RB_FLOAT_TYPE_P(x)) {
-	    const double abs = RFLOAT_VALUE(x);
-	    const double real = abs * cos(arg), imag = abs * sin(arg);
-	    x = DBL2NUM(real);
-	    y = DBL2NUM(imag);
-	}
-	else {
+        const double arg = RFLOAT_VALUE(y);
+        if (arg == M_PI) {
+            x = f_negate(x);
+            y = RFLOAT_0;
+        }
+        else if (arg == M_PI_2) {
+            y = x;
+            x = RFLOAT_0;
+        }
+        else if (arg == M_PI_2+M_PI) {
+            y = f_negate(x);
+            x = RFLOAT_0;
+        }
+        else if (RB_FLOAT_TYPE_P(x)) {
+            const double abs = RFLOAT_VALUE(x);
+            const double real = abs * cos(arg), imag = abs * sin(arg);
+            x = DBL2NUM(real);
+            y = DBL2NUM(imag);
+        }
+        else {
             const double ax = sin(arg), ay = cos(arg);
             y = f_mul(x, DBL2NUM(ax));
             x = f_mul(x, DBL2NUM(ay));
-	}
-	return nucomp_s_new_internal(klass, x, y);
+        }
+        return nucomp_s_new_internal(klass, x, y);
     }
     return nucomp_s_canonicalize_internal(klass,
-					  f_mul(x, m_cos(y)),
-					  f_mul(x, m_sin(y)));
+                                          f_mul(x, m_cos(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
@@ -665,12 +682,12 @@ rb_dbl_complex_new_polar_pi(double abs, double ang)
     int pos = fr == +0.5;
 
     if (pos || fr == -0.5) {
-	if ((modf(fi / 2.0, &fi) != fr) ^ pos) abs = -abs;
-	return rb_complex_new(RFLOAT_0, DBL2NUM(abs));
+        if ((modf(fi / 2.0, &fi) != fr) ^ pos) abs = -abs;
+        return rb_complex_new(RFLOAT_0, DBL2NUM(abs));
     }
     else if (fr == 0.0) {
-	if (modf(fi / 2.0, &fi) != 0.0) abs = -abs;
-	return DBL2NUM(abs);
+        if (modf(fi / 2.0, &fi) != 0.0) abs = -abs;
+        return DBL2NUM(abs);
     }
     else {
         const double real = abs * cospi(ang), imag = abs * sinpi(ang);
@@ -694,24 +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;
-    }
-    if (RB_TYPE_P(abs, T_COMPLEX)) {
-        get_dat1(abs);
-        abs = dat->real;
+    argc = rb_scan_args(argc, argv, "11", &abs, &arg);
+    abs = nucomp_real_check(abs);
+    if (argc == 2) {
+        arg = nucomp_real_check(arg);
     }
-    if (RB_TYPE_P(arg, T_COMPLEX)) {
-        get_dat1(arg);
-        arg = dat->real;
+    else {
+        arg = ZERO;
     }
-    return f_complex_polar(klass, abs, arg);
+    return f_complex_polar_real(klass, abs, arg);
 }
 
 /*
@@ -760,7 +768,7 @@ rb_complex_uminus(VALUE self)
 {
     get_dat1(self);
     return f_complex_new2(CLASS_OF(self),
-			  f_negate(dat->real), f_negate(dat->imag));
+                          f_negate(dat->real), f_negate(dat->imag));
 }
 
 /*
@@ -779,20 +787,20 @@ VALUE
 rb_complex_plus(VALUE self, VALUE other)
 {
     if (RB_TYPE_P(other, T_COMPLEX)) {
-	VALUE real, imag;
+        VALUE real, imag;
 
-	get_dat2(self, other);
+        get_dat2(self, other);
 
-	real = f_add(adat->real, bdat->real);
-	imag = f_add(adat->imag, bdat->imag);
+        real = f_add(adat->real, bdat->real);
+        imag = f_add(adat->imag, bdat->imag);
 
-	return f_complex_new2(CLASS_OF(self), real, imag);
+        return f_complex_new2(CLASS_OF(self), real, imag);
     }
     if (k_numeric_p(other) && f_real_p(other)) {
-	get_dat1(self);
+        get_dat1(self);
 
-	return f_complex_new2(CLASS_OF(self),
-			      f_add(dat->real, other), dat->imag);
+        return f_complex_new2(CLASS_OF(self),
+                              f_add(dat->real, other), dat->imag);
     }
     return rb_num_coerce_bin(self, other, '+');
 }
@@ -813,33 +821,33 @@ VALUE
 rb_complex_minus(VALUE self, VALUE other)
 {
     if (RB_TYPE_P(other, T_COMPLEX)) {
-	VALUE real, imag;
+        VALUE real, imag;
 
-	get_dat2(self, other);
+        get_dat2(self, other);
 
-	real = f_sub(adat->real, bdat->real);
-	imag = f_sub(adat->imag, bdat->imag);
+        real = f_sub(adat->real, bdat->real);
+        imag = f_sub(adat->imag, bdat->imag);
 
-	return f_complex_new2(CLASS_OF(self), real, imag);
+        return f_complex_new2(CLASS_OF(self), real, imag);
     }
     if (k_numeric_p(other) && f_real_p(other)) {
-	get_dat1(self);
+        get_dat1(self);
 
-	return f_complex_new2(CLASS_OF(self),
-			      f_sub(dat->real, other), dat->imag);
+        return f_complex_new2(CLASS_OF(self),
+                              f_sub(dat->real, other), dat->imag);
     }
     return rb_num_coerce_bin(self, other, '-');
 }
 
 static VALUE
-safe_mul(VALUE a, VALUE b, int az, int bz)
+safe_mul(VALUE a, VALUE b, bool az, bool bz)
 {
     double v;
     if (!az && bz && RB_FLOAT_TYPE_P(a) && (v = RFLOAT_VALUE(a), !isnan(v))) {
-	a = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0);
+        a = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0);
     }
     if (!bz && az && RB_FLOAT_TYPE_P(b) && (v = RFLOAT_VALUE(b), !isnan(v))) {
-	b = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0);
+        b = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0);
     }
     return f_mul(a, b);
 }
@@ -847,10 +855,10 @@ safe_mul(VALUE a, VALUE b, int az, int bz)
 static void
 comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE *imag)
 {
-    int arzero = f_zero_p(areal);
-    int aizero = f_zero_p(aimag);
-    int brzero = f_zero_p(breal);
-    int bizero = f_zero_p(bimag);
+    bool arzero = f_zero_p(areal);
+    bool aizero = f_zero_p(aimag);
+    bool brzero = f_zero_p(breal);
+    bool bizero = f_zero_p(bimag);
     *real = f_sub(safe_mul(areal, breal, arzero, brzero),
                   safe_mul(aimag, bimag, aizero, bizero));
     *imag = f_add(safe_mul(areal, bimag, arzero, bizero),
@@ -873,47 +881,47 @@ VALUE
 rb_complex_mul(VALUE self, VALUE other)
 {
     if (RB_TYPE_P(other, T_COMPLEX)) {
-	VALUE real, imag;
-	get_dat2(self, other);
+        VALUE real, imag;
+        get_dat2(self, other);
 
         comp_mul(adat->real, adat->imag, bdat->real, bdat->imag, &real, &imag);
 
-	return f_complex_new2(CLASS_OF(self), real, imag);
+        return f_complex_new2(CLASS_OF(self), real, imag);
     }
     if (k_numeric_p(other) && f_real_p(other)) {
-	get_dat1(self);
+        get_dat1(self);
 
-	return f_complex_new2(CLASS_OF(self),
-			      f_mul(dat->real, other),
-			      f_mul(dat->imag, other));
+        return f_complex_new2(CLASS_OF(self),
+                              f_mul(dat->real, other),
+                              f_mul(dat->imag, other));
     }
     return rb_num_coerce_bin(self, other, '*');
 }
 
 inline static VALUE
 f_divide(VALUE self, VALUE other,
-	 VALUE (*func)(VALUE, VALUE), ID id)
+         VALUE (*func)(VALUE, VALUE), ID id)
 {
     if (RB_TYPE_P(other, T_COMPLEX)) {
         VALUE r, n, x, y;
-	int flo;
-	get_dat2(self, other);
+        int flo;
+        get_dat2(self, other);
 
-	flo = (RB_FLOAT_TYPE_P(adat->real) || RB_FLOAT_TYPE_P(adat->imag) ||
-	       RB_FLOAT_TYPE_P(bdat->real) || RB_FLOAT_TYPE_P(bdat->imag));
+        flo = (RB_FLOAT_TYPE_P(adat->real) || RB_FLOAT_TYPE_P(adat->imag) ||
+               RB_FLOAT_TYPE_P(bdat->real) || RB_FLOAT_TYPE_P(bdat->imag));
 
-	if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) {
-	    r = (*func)(bdat->imag, bdat->real);
-	    n = f_mul(bdat->real, f_add(ONE, f_mul(r, r)));
+        if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) {
+            r = (*func)(bdat->imag, bdat->real);
+            n = f_mul(bdat->real, f_add(ONE, f_mul(r, r)));
             x = (*func)(f_add(adat->real, f_mul(adat->imag, r)), n);
             y = (*func)(f_sub(adat->imag, f_mul(adat->real, r)), n);
-	}
-	else {
-	    r = (*func)(bdat->real, bdat->imag);
-	    n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r)));
+        }
+        else {
+            r = (*func)(bdat->real, bdat->imag);
+            n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r)));
             x = (*func)(f_add(f_mul(adat->real, r), adat->imag), n);
             y = (*func)(f_sub(f_mul(adat->imag, r), adat->real), n);
-	}
+        }
         if (!flo) {
             x = rb_rational_canonicalize(x);
             y = rb_rational_canonicalize(y);
@@ -922,7 +930,7 @@ f_divide(VALUE self, VALUE other,
     }
     if (k_numeric_p(other) && f_real_p(other)) {
         VALUE x, y;
-	get_dat1(self);
+        get_dat1(self);
         x = rb_rational_canonicalize((*func)(dat->real, other));
         y = rb_rational_canonicalize((*func)(dat->imag, other));
         return f_complex_new2(CLASS_OF(self), x, y);
@@ -986,31 +994,31 @@ VALUE
 rb_complex_pow(VALUE self, VALUE other)
 {
     if (k_numeric_p(other) && k_exact_zero_p(other))
-	return f_complex_new_bang1(CLASS_OF(self), ONE);
+        return f_complex_new_bang1(CLASS_OF(self), ONE);
 
     if (RB_TYPE_P(other, T_RATIONAL) && RRATIONAL(other)->den == LONG2FIX(1))
-	other = RRATIONAL(other)->num; /* c14n */
+        other = RRATIONAL(other)->num; /* c14n */
 
     if (RB_TYPE_P(other, T_COMPLEX)) {
-	get_dat1(other);
+        get_dat1(other);
 
-	if (k_exact_zero_p(dat->imag))
-	    other = dat->real; /* c14n */
+        if (k_exact_zero_p(dat->imag))
+            other = dat->real; /* c14n */
     }
 
     if (RB_TYPE_P(other, T_COMPLEX)) {
-	VALUE r, theta, nr, ntheta;
+        VALUE r, theta, nr, ntheta;
 
-	get_dat1(other);
+        get_dat1(other);
 
-	r = f_abs(self);
-	theta = f_arg(self);
+        r = f_abs(self);
+        theta = f_arg(self);
 
-	nr = m_exp_bang(f_sub(f_mul(dat->real, m_log_bang(r)),
-			      f_mul(dat->imag, theta)));
-	ntheta = f_add(f_mul(theta, dat->real),
-		       f_mul(dat->imag, m_log_bang(r)));
-	return f_complex_polar(CLASS_OF(self), nr, ntheta);
+        nr = m_exp_bang(f_sub(f_mul(dat->real, m_log_bang(r)),
+                              f_mul(dat->imag, theta)));
+        ntheta = f_add(f_mul(theta, dat->real),
+                       f_mul(dat->imag, m_log_bang(r)));
+        return f_complex_polar(CLASS_OF(self), nr, ntheta);
     }
     if (FIXNUM_P(other)) {
         long n = FIX2LONG(other);
@@ -1051,19 +1059,19 @@ rb_complex_pow(VALUE self, VALUE other)
                 }
             }
             return nucomp_s_new_internal(CLASS_OF(self), zr, zi);
-	}
+        }
     }
     if (k_numeric_p(other) && f_real_p(other)) {
-	VALUE r, theta;
+        VALUE r, theta;
 
-	if (RB_BIGNUM_TYPE_P(other))
-	    rb_warn("in a**b, b may be too big");
+        if (RB_BIGNUM_TYPE_P(other))
+            rb_warn("in a**b, b may be too big");
 
-	r = f_abs(self);
-	theta = f_arg(self);
+        r = f_abs(self);
+        theta = f_arg(self);
 
-	return f_complex_polar(CLASS_OF(self), f_expt(r, other),
-			       f_mul(theta, other));
+        return f_complex_polar(CLASS_OF(self), f_expt(r, other),
+                               f_mul(theta, other));
     }
     return rb_num_coerce_bin(self, other, id_expt);
 }
@@ -1084,15 +1092,15 @@ static VALUE
 nucomp_eqeq_p(VALUE self, VALUE other)
 {
     if (RB_TYPE_P(other, T_COMPLEX)) {
-	get_dat2(self, other);
+        get_dat2(self, other);
 
-	return RBOOL(f_eqeq_p(adat->real, bdat->real) &&
-			  f_eqeq_p(adat->imag, bdat->imag));
+        return RBOOL(f_eqeq_p(adat->real, bdat->real) &&
+                          f_eqeq_p(adat->imag, bdat->imag));
     }
     if (k_numeric_p(other) && f_real_p(other)) {
-	get_dat1(self);
+        get_dat1(self);
 
-	return RBOOL(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
+        return RBOOL(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
     }
     return RBOOL(f_eqeq_p(other, self));
 }
@@ -1101,7 +1109,7 @@ static bool
 nucomp_real_p(VALUE self)
 {
     get_dat1(self);
-    return(f_zero_p(dat->imag) ? true : false);
+    return f_zero_p(dat->imag);
 }
 
 /*
@@ -1121,15 +1129,26 @@ nucomp_real_p(VALUE self)
 static VALUE
 nucomp_cmp(VALUE self, VALUE other)
 {
-    if (nucomp_real_p(self) && k_numeric_p(other)) {
-        if (RB_TYPE_P(other, T_COMPLEX) && nucomp_real_p(other)) {
+    if (!k_numeric_p(other)) {
+        return rb_num_coerce_cmp(self, other, idCmp);
+    }
+    if (!nucomp_real_p(self)) {
+        return Qnil;
+    }
+    if (RB_TYPE_P(other, T_COMPLEX)) {
+        if (nucomp_real_p(other)) {
             get_dat2(self, other);
             return rb_funcall(adat->real, idCmp, 1, bdat->real);
         }
-        else if (f_real_p(other)) {
-            get_dat1(self);
+    }
+    else {
+        get_dat1(self);
+        if (f_real_p(other)) {
             return rb_funcall(dat->real, idCmp, 1, other);
         }
+        else {
+            return rb_num_coerce_cmp(dat->real, other, idCmp);
+        }
     }
     return Qnil;
 }
@@ -1139,12 +1158,12 @@ static VALUE
 nucomp_coerce(VALUE self, VALUE other)
 {
     if (RB_TYPE_P(other, T_COMPLEX))
-	return rb_assoc_new(other, self);
+        return rb_assoc_new(other, self);
     if (k_numeric_p(other) && f_real_p(other))
         return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
 
     rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
-	     rb_obj_class(other), rb_obj_class(self));
+             rb_obj_class(other), rb_obj_class(self));
     return Qnil;
 }
 
@@ -1164,16 +1183,16 @@ rb_complex_abs(VALUE self)
     get_dat1(self);
 
     if (f_zero_p(dat->real)) {
-	VALUE a = f_abs(dat->imag);
-	if (RB_FLOAT_TYPE_P(dat->real) && !RB_FLOAT_TYPE_P(dat->imag))
-	    a = f_to_f(a);
-	return a;
+        VALUE a = f_abs(dat->imag);
+        if (RB_FLOAT_TYPE_P(dat->real) && !RB_FLOAT_TYPE_P(dat->imag))
+            a = f_to_f(a);
+        return a;
     }
     if (f_zero_p(dat->imag)) {
-	VALUE a = f_abs(dat->real);
-	if (!RB_FLOAT_TYPE_P(dat->real) && RB_FLOAT_TYPE_P(dat->imag))
-	    a = f_to_f(a);
-	return a;
+        VALUE a = f_abs(dat->real);
+        if (!RB_FLOAT_TYPE_P(dat->real) && RB_FLOAT_TYPE_P(dat->imag))
+            a = f_to_f(a);
+        return a;
     }
     return rb_math_hypot(dat->real, dat->imag);
 }
@@ -1192,7 +1211,7 @@ nucomp_abs2(VALUE self)
 {
     get_dat1(self);
     return f_add(f_mul(dat->real, dat->real),
-		 f_mul(dat->imag, dat->imag));
+                 f_mul(dat->imag, dat->imag));
 }
 
 /*
@@ -1313,10 +1332,10 @@ nucomp_numerator(VALUE self)
 
     cd = nucomp_denominator(self);
     return f_complex_new2(CLASS_OF(self),
-			  f_mul(f_numerator(dat->real),
-				f_div(cd, f_denominator(dat->real))),
-			  f_mul(f_numerator(dat->imag),
-				f_div(cd, f_denominator(dat->imag))));
+                          f_mul(f_numerator(dat->real),
+                                f_div(cd, f_denominator(dat->real))),
+                          f_mul(f_numerator(dat->imag),
+                                f_div(cd, f_denominator(dat->imag))));
 }
 
 /* :nodoc: */
@@ -1346,11 +1365,11 @@ static VALUE
 nucomp_eql_p(VALUE self, VALUE other)
 {
     if (RB_TYPE_P(other, T_COMPLEX)) {
-	get_dat2(self, other);
+        get_dat2(self, other);
 
-	return RBOOL((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
-			  (CLASS_OF(adat->imag) == CLASS_OF(bdat->imag)) &&
-			  f_eqeq_p(self, other));
+        return RBOOL((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
+                          (CLASS_OF(adat->imag) == CLASS_OF(bdat->imag)) &&
+                          f_eqeq_p(self, other));
 
     }
     return Qfalse;
@@ -1360,8 +1379,8 @@ inline static int
 f_signbit(VALUE x)
 {
     if (RB_FLOAT_TYPE_P(x)) {
-	double f = RFLOAT_VALUE(x);
-	return !isnan(f) && signbit(f);
+        double f = RFLOAT_VALUE(x);
+        return !isnan(f) && signbit(f);
     }
     return f_negative_p(x);
 }
@@ -1387,7 +1406,7 @@ f_format(VALUE self, VALUE (*func)(VALUE))
 
     rb_str_concat(s, (*func)(f_abs(dat->imag)));
     if (!rb_isdigit(RSTRING_PTR(s)[RSTRING_LEN(s) - 1]))
-	rb_str_cat2(s, "*");
+        rb_str_cat2(s, "*");
     rb_str_cat2(s, "i");
 
     return s;
@@ -1470,7 +1489,7 @@ rb_complex_infinite_p(VALUE self)
     get_dat1(self);
 
     if (!f_infinite_p(dat->real) && !f_infinite_p(dat->imag)) {
-	return Qnil;
+        return Qnil;
     }
     return ONE;
 }
@@ -1513,7 +1532,7 @@ nucomp_marshal_load(VALUE self, VALUE a)
 {
     Check_Type(a, T_ARRAY);
     if (RARRAY_LEN(a) != 2)
-	rb_raise(rb_eArgError, "marshaled complex must have an array whose length is 2 but %ld", RARRAY_LEN(a));
+        rb_raise(rb_eArgError, "marshaled complex must have an array whose length is 2 but %ld", RARRAY_LEN(a));
     rb_ivar_set(self, id_i_real, RARRAY_AREF(a, 0));
     rb_ivar_set(self, id_i_imag, RARRAY_AREF(a, 1));
     return self;
@@ -1575,8 +1594,8 @@ nucomp_to_i(VALUE self)
     get_dat1(self);
 
     if (!k_exact_zero_p(dat->imag)) {
-	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer",
-		 self);
+        rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer",
+                 self);
     }
     return f_to_i(dat->real);
 }
@@ -1598,8 +1617,8 @@ nucomp_to_f(VALUE self)
     get_dat1(self);
 
     if (!k_exact_zero_p(dat->imag)) {
-	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float",
-		 self);
+        rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float",
+                 self);
     }
     return f_to_f(dat->real);
 }
@@ -1623,8 +1642,8 @@ nucomp_to_r(VALUE self)
     get_dat1(self);
 
     if (!k_exact_zero_p(dat->imag)) {
-	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
-		 self);
+        rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
+                 self);
     }
     return f_to_r(dat->real);
 }
@@ -1703,14 +1722,14 @@ issign(int c)
 
 static int
 read_sign(const char **s,
-	  char **b)
+          char **b)
 {
     int sign = '?';
 
     if (issign(**s)) {
-	sign = **b = **s;
-	(*s)++;
-	(*b)++;
+        sign = **b = **s;
+        (*s)++;
+        (*b)++;
     }
     return sign;
 }
@@ -1723,32 +1742,32 @@ isdecimal(int c)
 
 static int
 read_digits(const char **s, int strict,
-	    char **b)
+            char **b)
 {
     int us = 1;
 
     if (!isdecimal(**s))
-	return 0;
+        return 0;
 
     while (isdecimal(**s) || **s == '_') {
-	if (**s == '_') {
-	    if (strict) {
-		if (us)
-		    return 0;
-	    }
-	    us = 1;
-	}
-	else {
-	    **b = **s;
-	    (*b)++;
-	    us = 0;
-	}
-	(*s)++;
+        if (**s == '_') {
+            if (us) {
+                if (strict) return 0;
+                break;
+            }
+            us = 1;
+        }
+        else {
+            **b = **s;
+            (*b)++;
+            us = 0;
+        }
+        (*s)++;
     }
     if (us)
-	do {
-	    (*s)--;
-	} while (**s == '_');
+        do {
+            (*s)--;
+        } while (**s == '_');
     return 1;
 }
 
@@ -1760,70 +1779,70 @@ islettere(int c)
 
 static int
 read_num(const char **s, int strict,
-	 char **b)
+         char **b)
 {
     if (**s != '.') {
-	if (!read_digits(s, strict, b))
-	    return 0;
+        if (!read_digits(s, strict, b))
+            return 0;
     }
 
     if (**s == '.') {
-	**b = **s;
-	(*s)++;
-	(*b)++;
-	if (!read_digits(s, strict, b)) {
-	    (*b)--;
-	    return 0;
-	}
+        **b = **s;
+        (*s)++;
+        (*b)++;
+        if (!read_digits(s, strict, b)) {
+            (*b)--;
+            return 0;
+        }
     }
 
     if (islettere(**s)) {
-	**b = **s;
-	(*s)++;
-	(*b)++;
-	read_sign(s, b);
-	if (!read_digits(s, strict, b)) {
-	    (*b)--;
-	    return 0;
-	}
+        **b = **s;
+        (*s)++;
+        (*b)++;
+        read_sign(s, b);
+        if (!read_digits(s, strict, b)) {
+            (*b)--;
+            return 0;
+        }
     }
     return 1;
 }
 
 inline static int
 read_den(const char **s, int strict,
-	 char **b)
+         char **b)
 {
     if (!read_digits(s, strict, b))
-	return 0;
+        return 0;
     return 1;
 }
 
 static int
 read_rat_nos(const char **s, int strict,
-	     char **b)
+             char **b)
 {
     if (!read_num(s, strict, b))
-	return 0;
+        return 0;
     if (**s == '/') {
-	**b = **s;
-	(*s)++;
-	(*b)++;
-	if (!read_den(s, strict, b)) {
-	    (*b)--;
-	    return 0;
-	}
+        **b = **s;
+        (*s)++;
+        (*b)++;
+        if (!read_den(s, strict, b)) {
+            (*b)--;
+            return 0;
+        }
     }
     return 1;
 }
 
 static int
 read_rat(const char **s, int strict,
-	 char **b)
+         char **b)
 {
     read_sign(s, b);
     if (!read_rat_nos(s, strict, b))
-	return 0;
+        return 0;
     return 1;
 }
 
@@ -1831,22 +1850,22 @@ inline static int
 isimagunit(int c)
 {
     return (c == 'i' || c == 'I' ||
-	    c == 'j' || c == 'J');
+            c == 'j' || c == 'J');
 }
 
 static VALUE
 str2num(char *s)
 {
     if (strchr(s, '/'))
-	return rb_cstr_to_rat(s, 0);
+        return rb_cstr_to_rat(s, 0);
     if (strpbrk(s, ".eE"))
-	return DBL2NUM(rb_cstr_to_dbl(s, 0));
+        return DBL2NUM(rb_cstr_to_dbl(s, 0));
     return rb_cstr_to_inum(s, 10, 0);
 }
 
 static int
 read_comp(const char **s, int strict,
-	  VALUE *ret, char **b)
+          VALUE *ret, char **b)
 {
     char *bb;
     int sign;
@@ -1857,72 +1876,72 @@ read_comp(const char **s, int strict,
     sign = read_sign(s, b);
 
     if (isimagunit(**s)) {
-	(*s)++;
-	num = INT2FIX((sign == '-') ? -1 : + 1);
-	*ret = rb_complex_new2(ZERO, num);
-	return 1; /* e.g. "i" */
+        (*s)++;
+        num = INT2FIX((sign == '-') ? -1 : + 1);
+        *ret = rb_complex_new2(ZERO, num);
+        return 1; /* e.g. "i" */
     }
 
     if (!read_rat_nos(s, strict, b)) {
-	**b = '\0';
-	num = str2num(bb);
-	*ret = rb_complex_new2(num, ZERO);
-	return 0; /* e.g. "-" */
+        **b = '\0';
+        num = str2num(bb);
+        *ret = rb_complex_new2(num, ZERO);
+        return 0; /* e.g. "-" */
     }
     **b = '\0';
     num = str2num(bb);
 
     if (isimagunit(**s)) {
-	(*s)++;
-	*ret = rb_complex_new2(ZERO, num);
-	return 1; /* e.g. "3i" */
+        (*s)++;
+        *ret = rb_complex_new2(ZERO, num);
+        return 1; /* e.g. "3i" */
     }
 
     if (**s == '@') {
-	int st;
-
-	(*s)++;
-	bb = *b;
-	st = read_rat(s, strict, b);
-	**b = '\0';
-	if (strlen(bb) < 1 ||
-	    !isdecimal(*(bb + strlen(bb) - 1))) {
-	    *ret = rb_complex_new2(num, ZERO);
-	    return 0; /* e.g. "1@-" */
-	}
-	num2 = str2num(bb);
-	*ret = rb_complex_new_polar(num, num2);
-	if (!st)
-	    return 0; /* e.g. "1@2." */
-	else
-	    return 1; /* e.g. "1@2" */
+        int st;
+
+        (*s)++;
+        bb = *b;
+        st = read_rat(s, strict, b);
+        **b = '\0';
+        if (strlen(bb) < 1 ||
+            !isdecimal(*(bb + strlen(bb) - 1))) {
+            *ret = rb_complex_new2(num, ZERO);
+            return 0; /* e.g. "1@-" */
+        }
+        num2 = str2num(bb);
+        *ret = rb_complex_new_polar(num, num2);
+        if (!st)
+            return 0; /* e.g. "1@2." */
+        else
+            return 1; /* e.g. "1@2" */
     }
 
     if (issign(**s)) {
-	bb = *b;
-	sign = read_sign(s, b);
-	if (isimagunit(**s))
-	    num2 = INT2FIX((sign == '-') ? -1 : + 1);
-	else {
-	    if (!read_rat_nos(s, strict, b)) {
-		*ret = rb_complex_new2(num, ZERO);
-		return 0; /* e.g. "1+xi" */
-	    }
-	    **b = '\0';
-	    num2 = str2num(bb);
-	}
-	if (!isimagunit(**s)) {
-	    *ret = rb_complex_new2(num, ZERO);
-	    return 0; /* e.g. "1+3x" */
-	}
-	(*s)++;
-	*ret = rb_complex_new2(num, num2);
-	return 1; /* e.g. "1+2i" */
+        bb = *b;
+        sign = read_sign(s, b);
+        if (isimagunit(**s))
+            num2 = INT2FIX((sign == '-') ? -1 : + 1);
+        else {
+            if (!read_rat_nos(s, strict, b)) {
+                *ret = rb_complex_new2(num, ZERO);
+                return 0; /* e.g. "1+xi" */
+            }
+            **b = '\0';
+            num2 = str2num(bb);
+        }
+        if (!isimagunit(**s)) {
+            *ret = rb_complex_new2(num, ZERO);
+            return 0; /* e.g. "1+3x" */
+        }
+        (*s)++;
+        *ret = rb_complex_new2(num, num2);
+        return 1; /* e.g. "1+2i" */
     }
     /* !(@, - or +) */
     {
-	*ret = rb_complex_new2(num, ZERO);
-	return 1; /* e.g. "3" */
+        *ret = rb_complex_new2(num, ZERO);
+        return 1; /* e.g. "3" */
     }
 }
 
@@ -1930,7 +1949,7 @@ inline static void
 skip_ws(const char **s)
 {
     while (isspace((unsigned char)**s))
-	(*s)++;
+        (*s)++;
 }
 
 static int
@@ -1971,22 +1990,22 @@ string_to_c_strict(VALUE self, int raise)
 
     if (!s || memchr(s, '\0', RSTRING_LEN(self))) {
         if (!raise) return Qnil;
-	rb_raise(rb_eArgError, "string contains null byte");
+        rb_raise(rb_eArgError, "string contains null byte");
     }
 
     if (s && s[RSTRING_LEN(self)]) {
-	rb_str_modify(self);
-	s = RSTRING_PTR(self);
-	s[RSTRING_LEN(self)] = '\0';
+        rb_str_modify(self);
+        s = RSTRING_PTR(self);
+        s[RSTRING_LEN(self)] = '\0';
     }
 
     if (!s)
-	s = (char *)"";
+        s = (char *)"";
 
     if (!parse_comp(s, 1, &num)) {
         if (!raise) return Qnil;
-	rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
-		 self);
+        rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
+                 self);
     }
 
     return num;
@@ -2013,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
@@ -2026,13 +2051,13 @@ string_to_c(VALUE self)
     s = RSTRING_PTR(self);
 
     if (s && s[RSTRING_LEN(self)]) {
-	rb_str_modify(self);
-	s = RSTRING_PTR(self);
-	s[RSTRING_LEN(self)] = '\0';
+        rb_str_modify(self);
+        s = RSTRING_PTR(self);
+        s[RSTRING_LEN(self)] = '\0';
     }
 
     if (!s)
-	s = (char *)"";
+        s = (char *)"";
 
     (void)parse_comp(s, 0, &num);
 
@@ -2050,65 +2075,68 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
 {
     if (NIL_P(a1) || NIL_P(a2)) {
         if (!raise) return Qnil;
-	rb_raise(rb_eTypeError, "can't convert nil into Complex");
+        rb_raise(rb_eTypeError, "can't convert nil into Complex");
     }
 
     if (RB_TYPE_P(a1, T_STRING)) {
-	a1 = string_to_c_strict(a1, raise);
+        a1 = string_to_c_strict(a1, raise);
         if (NIL_P(a1)) return Qnil;
     }
 
     if (RB_TYPE_P(a2, T_STRING)) {
-	a2 = string_to_c_strict(a2, raise);
+        a2 = string_to_c_strict(a2, raise);
         if (NIL_P(a2)) return Qnil;
     }
 
     if (RB_TYPE_P(a1, T_COMPLEX)) {
-	{
-	    get_dat1(a1);
+        {
+            get_dat1(a1);
 
-	    if (k_exact_zero_p(dat->imag))
-		a1 = dat->real;
-	}
+            if (k_exact_zero_p(dat->imag))
+                a1 = dat->real;
+        }
     }
 
     if (RB_TYPE_P(a2, T_COMPLEX)) {
-	{
-	    get_dat1(a2);
+        {
+            get_dat1(a2);
 
-	    if (k_exact_zero_p(dat->imag))
-		a2 = dat->real;
-	}
+            if (k_exact_zero_p(dat->imag))
+                a2 = dat->real;
+        }
     }
 
     if (RB_TYPE_P(a1, T_COMPLEX)) {
-	if (a2 == Qundef || (k_exact_zero_p(a2)))
-	    return a1;
-    }
-
-    if (a2 == Qundef) {
-	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);
-	    return to_complex(a1);
+        if (UNDEF_P(a2) || (k_exact_zero_p(a2)))
+            return a1;
+    }
+
+    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) {
+                a1 = rb_protect(to_complex, a1, NULL);
+                rb_set_errinfo(Qnil);
+                return a1;
+            }
+            return to_complex(a1);
         }
     }
     else {
-	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
-	    (!f_real_p(a1) || !f_real_p(a2)))
-	    return f_add(a1,
-			 f_mul(a2,
-			       f_complex_new_bang2(rb_cComplex, ZERO, ONE)));
+        if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
+            (!f_real_p(a1) || !f_real_p(a2)))
+            return f_add(a1,
+                         f_mul(a2,
+                               f_complex_new_bang2(rb_cComplex, ZERO, ONE)));
     }
 
     {
         int argc;
-	VALUE argv2[2];
-	argv2[0] = a1;
-        if (a2 == Qundef) {
+        VALUE argv2[2];
+        argv2[0] = a1;
+        if (UNDEF_P(a2)) {
             argv2[1] = Qnil;
             argc = 1;
         }
@@ -2118,7 +2146,7 @@ nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
             argv2[1] = a2;
             argc = 2;
         }
-	return nucomp_s_new(argc, argv2, klass);
+        return nucomp_s_new(argc, argv2, klass);
     }
 }
 
@@ -2136,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.
@@ -2232,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
@@ -2255,9 +2245,9 @@ static VALUE
 float_arg(VALUE self)
 {
     if (isnan(RFLOAT_VALUE(self)))
-	return self;
+        return self;
     if (f_tpositive_p(self))
-	return INT2FIX(0);
+        return INT2FIX(0);
     return rb_const_get(rb_mMath, id_PI);
 }
 
@@ -2408,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);
@@ -2418,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);
@@ -2429,7 +2414,7 @@ Init_Complex(void)
      * The imaginary unit.
      */
     rb_define_const(rb_cComplex, "I",
-		    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
+                    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
 
 #if !USE_FLONUM
     rb_gc_register_mark_object(RFLOAT_0 = DBL2NUM(0.0));
diff --git a/configure.ac b/configure.ac
index bddb5a4f40..220392d120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ m4_include([tool/m4/ruby_func_attribute.m4])dnl
 m4_include([tool/m4/ruby_mingw32.m4])dnl
 m4_include([tool/m4/ruby_prepend_option.m4])dnl
 m4_include([tool/m4/ruby_prog_gnu_ld.m4])dnl
+m4_include([tool/m4/ruby_prog_makedirs.m4])dnl
 m4_include([tool/m4/ruby_replace_funcs.m4])dnl
 m4_include([tool/m4/ruby_replace_type.m4])dnl
 m4_include([tool/m4/ruby_require_funcs.m4])dnl
@@ -63,14 +64,22 @@ 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?
+        RUBYOPT=- `cygpath -ma "$BASERUBY"` --disable=gems -e exit 2>/dev/null || HAVE_BASERUBY=no
+    ])
     BASERUBY="$BASERUBY --disable=gems"
     BASERUBY_VERSION=`$BASERUBY -v`
     $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
 ], [
-    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
     HAVE_BASERUBY=no
 ])
+AS_IF([test "$HAVE_BASERUBY" = no], [
+    AS_IF([test "$cross_compiling" = yes], [AC_MSG_ERROR([executable host ruby is required for cross-compiling])])
+    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+])
 AC_SUBST(BASERUBY)
 AC_SUBST(HAVE_BASERUBY)
 
@@ -87,7 +96,9 @@ AC_SUBST(GIT)
 AC_SUBST(HAVE_GIT)
 
 eval `sed -n -e ['s/^@%:@define RUBY_[A-Z_]*VERSION_\([A-Z][A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)$/\1=\2/p'] \
+      -e ['s/^@%:@define \(RUBY_ABI_VERSION\) \([0-9][0-9]*\).*/\1=\2/p'] \
       -e ['s/^@%:@define \(RUBY_PATCHLEVEL\) \(.*\)/\1=\2/p'] \
+     $srcdir/include/ruby/internal/abi.h \
      $srcdir/include/ruby/version.h $srcdir/version.h`
 for v in MAJOR MINOR TEENY; do
     AS_IF([eval "test \"\$$v\" = ''"], [
@@ -99,6 +110,9 @@ AC_SUBST(MINOR)
 AC_SUBST(TEENY)
 AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)')
 AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)')
+AS_CASE([$RUBY_PATCHLEVEL], [-*], [
+    AC_DEFINE_UNQUOTED(RUBY_ABI_VERSION, [${RUBY_ABI_VERSION}])
+], [RUBY_ABI_VERSION=])
 
 AS_IF([test "$program_prefix" = NONE], [
   program_prefix=
@@ -119,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
@@ -197,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)
@@ -349,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
@@ -370,14 +389,21 @@ AS_IF([test "$GCC" = yes], [
     icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///;/^__ICC/d'`
     test -n "$icc_version" || icc_version=0
     # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
+
+    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=
 ])
 
-AS_IF([test "$GCC" = yes -a "$gcc_major" -lt 3 ], [
-    AC_MSG_ERROR([too old GCC])
-])
-
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
 
@@ -484,6 +510,7 @@ AS_CASE(["$target_os"],
 	AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
 	sysconfdir=
     ])
+    rb_cv_binary_elf=no
     : ${enable_shared=yes}
     ],
 [hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
@@ -491,17 +518,12 @@ AS_CASE(["$target_os"],
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
-AC_PROG_MKDIR_P
-AS_IF([test "x$MKDIR_P" = "x -d"], [
-  AS_IF([test x"$as_mkdir_p" != xfalse], [
-    MKDIR_P='mkdir -p'
-    echo "use 'mkdir -p' as MKDIR_P"
-  ], [
-    AC_MSG_ERROR([mkdir -p is required])
-  ])
+
+AS_CASE(["$target_os"],[openbsd*],[
+    ac_cv_path_mkdir="mkdir"
 ])
-MAKEDIRS="$MKDIR_P"
-AC_SUBST(MAKEDIRS)
+
+RUBY_PROG_MAKEDIRS
 
 AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])
 AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"], [
@@ -511,11 +533,16 @@ 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)
 
-for prog in ${ac_tool_prefix:+${ac_tool_prefix}pkg-config} pkg-config; do
-    AC_CHECK_PROG(PKG_CONFIG, $prog, [$prog], [], [],
-        [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
-    test -z "${PKG_CONFIG}" || break
-done
+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], [],
+[
+    unset ac_cv_prog_PKG_CONFIG
+    PKG_CONFIG=
+    AC_MSG_WARN([$PKG_CONFIG does not work; ignore])
+])
 
 AC_MSG_CHECKING([whether it is Android])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -598,22 +625,39 @@ RUBY_WERROR_FLAG([
     cd .. && rm -fr tmp.$$.try_link
 ])
 
-: ${RPATHFLAG=''}
-rpathflag=''
-AS_IF([test x"${RPATHFLAG}" = x], [
-    AS_CASE(["$target_os"],
+: "rpath" && {
+    AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
+        [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[
+            AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
+            [.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+            [rb_cv_binary_elf=no])])
+
+    rpathflag=''
+    AS_IF([test x"${RPATHFLAG=}" = x], [
+	AS_CASE(["$target_os"],
 	[aix*], [rpathflag='-blibpath:'],
-	[for rpathflag in -R "-rpath "; do
+	[for rpathflag in "-rpath " -R; do
 	    AS_CASE("$rpathflag",
 		    [*" "], [AS_CASE(["${linker_flag}"],
 				     [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])])
 	    rpathflag="${linker_flag}${rpathflag}"
 	    RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=])
-	    AS_IF([test "x${rpathflag}" != x], [])
+	    AS_IF([test "x${rpathflag}" != x], [break])
         done])
-], [
-    rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
-])
+    ], [
+        rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
+    ])
+
+    AC_ARG_ENABLE(rpath,
+        AS_HELP_STRING([--enable-rpath], [embed run path into extension libraries.
+        enabled by default on ELF platforms]),
+        [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
+
+    AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [
+        RPATHFLAG="${rpathflag:+ ${rpathflag}%1\$-s}"
+    ])
+    AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
+}
 
 RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
 AS_IF([test "$fdeclspec" = yes], [
@@ -626,9 +670,13 @@ AS_IF([test "$fdeclspec" = yes], [
     RUBY_APPEND_OPTIONS(CXXFLAGS, -fdeclspec)
 ])
 
-AS_CASE([$RUBY_PATCHLEVEL], [-*],
-	[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
-particular_werror_flags=$RUBY_DEVEL
+AC_ARG_ENABLE(devel,
+    AS_HELP_STRING([--enable-devel], [enable development build]),
+    [RUBY_DEVEL=$enableval],
+    [AS_IF([test "x${RUBY_DEVEL-no}" != xyes], [RUBY_DEVEL=])]
+)dnl
+AC_SUBST(RUBY_DEVEL)
+particular_werror_flags=${RUBY_DEVEL:-no}
 AC_ARG_ENABLE(werror,
 	AS_HELP_STRING([--disable-werror],
 		       [don't make warnings into errors
@@ -639,10 +687,7 @@ AC_ARG_ENABLE(werror,
 rb_cv_warnflags="$warnflags"
 AS_CASE(["$GCC:${warnflags+set}:${extra_warnflags:+set}:"],
 [yes::*|yes:*:set:], [# GCC && (!warnflags || extra_warnflags)
-    AS_IF([test $gcc_major -ge 4], [
-	extra_warnflags="$extra_warnflags -Werror=extra-tokens"
-    ])
-    AS_IF([test $gcc_major -ge 5 -a $gcc_major -le 6], [
+    AS_IF([test $gcc_major -le 6], [
 	extra_warnflags="$extra_warnflags -Wno-maybe-uninitialized"
     ])
     # ICC doesn't support -Werror=
@@ -650,6 +695,7 @@ AS_CASE(["$GCC:${warnflags+set}:${extra_warnflags:+set}:"],
 	particular_werror_flags=no
     ])
     for wflag in \
+		 -Werror=extra-tokens \
 		 -Werror=deprecated-declarations \
 		 -Werror=division-by-zero -Werror=div-by-zero \
 		 -Werror=duplicated-cond \
@@ -754,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>])
     ])
 
@@ -762,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}"], [
@@ -774,12 +821,25 @@ 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)
 	RUBY_APPEND_OPTION(LDFLAGS, $stack_protector)
     ])
 
+    # aarch64 branch protection
+    AS_CASE(["$target_cpu"], [aarch64], [
+	AS_FOR(option, opt, [-mbranch-protection=pac-ret -msign-return-address=all], [
+            RUBY_TRY_CFLAGS(option, [branch_protection=yes], [branch_protection=no])
+            AS_IF([test "x$branch_protection" = xyes], [
+                RUBY_APPEND_OPTION(XCFLAGS, option)
+                break
+            ])
+        ])
+    ])
+
     AS_CASE("${compress_debug_sections:-zlib}",
     [none|no], [], [
     RUBY_TRY_LDFLAGS(${linker_flag}--compress-debug-sections=${compress_debug_sections:-zlib},
@@ -828,33 +888,6 @@ AS_IF([test "$GCC" = yes], [
       # need lgamma_r()
     ])
 
-    # ANSI (no XCFLAGS because this is C only)
-    AS_CASE(["$target_os"],
-    [solaris*], [
-      # Because "-std=gnu99" affects existence of functions on Solaris,
-      # "-std=gnu99" will be appended to CPPFLAGS.
-	for ansi_options in -std=gnu99; do
-	    RUBY_TRY_CFLAGS(${ansi_options}, [
-		RUBY_APPEND_OPTIONS(CPPFLAGS, ${ansi_options})
-	    ], [ansi_options=])
-	    test "x${ansi_options}" = x || break
-	done
-    ],
-    [
-      # ANSI (no XCFLAGS because this is C only)
-      rb_tmp_std_check=`echo $CC $CFLAGS $optflags $warnflags $debugflags | fgrep std= | tr -d  '\015'`
-      AS_IF([test "x$rb_tmp_std_check" = "x"],
-      [
-	for ansi_options in -std=gnu99; do
-	    RUBY_TRY_CFLAGS(${ansi_options}, [
-		RUBY_APPEND_OPTIONS(warnflags, ${ansi_options})
-		RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
-	    ], [ansi_options=])
-	    test "x${ansi_options}" = x || break
-	done
-      ])
-    ])
-
     # suppress annoying -Wstrict-overflow warnings
     RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
 
@@ -863,15 +896,12 @@ AS_IF([test "$GCC" = yes], [
     test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
 ])
 test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
-AS_IF([test "x$RUBY_DEVEL" = xyes], [RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_DEVEL=1)])
 
 AS_IF([test "$GCC" = ""], [
     AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"])
 ])
 AS_IF([test "$GCC" = yes], [
-    AS_IF([test "$gcc_major" -ge 4], [
-	RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
-    ])
+    RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
     AC_SUBST(WERRORFLAG, "-Werror")
     AS_IF([test "$visibility_option" = yes], [
 	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
@@ -920,17 +950,35 @@ AS_CASE(["$target_cpu"], [[i[3-6]86*]], [
     AS_IF([test "$rb_cv_gcc_compiler_cas" = i486], [ARCH_FLAG="-march=i486"])
 ])
 
+OPT_DIR=
+AC_ARG_WITH([gmp-dir],
+  AS_HELP_STRING([--with-gmp-dir=DIR],
+                 [specify the prefix directory where gmp is installed]),
+  [OPT_DIR="${OPT_DIR:+$OPT_DIR$PATH_SEPARATOR}$withval"], [])
+AC_ARG_WITH([gmp],
+  [AS_HELP_STRING([--without-gmp],
+                  [disable GNU GMP to accelerate Bignum operations])],
+  [], [with_gmp=yes])
+
 AC_ARG_WITH(opt-dir,
 	AS_HELP_STRING([--with-opt-dir=DIR-LIST],
 		       [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
-	[
-		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
-		CPPFLAGS="$CPPFLAGS $val"
-		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib${rpathflag:+ $rpathflag\\\\1/lib}|g;s/^ //"`
-		LDFLAGS="$LDFLAGS $val"
-		LDFLAGS_OPTDIR="$val"
-		OPT_DIR="$withval"
-	], [OPT_DIR=])
+	[OPT_DIR="${OPT_DIR:+$OPT_DIR$PATH_SEPARATOR}$withval"], [])
+
+AS_IF([test "x$OPT_DIR" != x], [
+    val=`IFS="$PATH_SEPARATOR"
+        for dir in $OPT_DIR; do
+            test -z "$dir" && continue
+            echo x ${LIBPATHFLAG} ${RPATHFLAG} |
+            sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
+        done | tr '\012' ' ' | sed 's/ *$//'`
+    LDFLAGS="${LDFLAGS:+$LDFLAGS }$val"
+    DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }$val"
+    LDFLAGS_OPTDIR="$val"
+    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\""
@@ -997,7 +1045,7 @@ AS_CASE(["$target_os"],
 		ac_cv_lib_crypt_crypt=no
 		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
 		ac_cv_func_vfork=no
-		AS_IF([test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \)], [
+		AS_IF([test $gcc_major -eq 4 -a $gcc_minor -lt 3], [
 		    ac_cv_func___builtin_setjmp=no
 		])
 		with_setjmp_type=sigsetjmp # to hijack SIGCHLD handler
@@ -1149,22 +1197,18 @@ main()
 		ac_cv_func_getpgrp_void=no
 		ac_cv_func_memcmp_working=yes
 		ac_cv_lib_dl_dlopen=no
-		rb_cv_binary_elf=no
 		rb_cv_negative_time_t=yes
 		ac_cv_func_fcntl=yes
 		ac_cv_func_flock=yes
 		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
 		AS_IF([test "$target_cpu" = x64], [
 		    ac_cv_func___builtin_setjmp=yes
 		    ac_cv_func_round=no
-		    coroutine_type=yes
 		])
 		ac_cv_func_tgamma=no
 		AC_CHECK_TYPE([NET_LUID], [], [],
@@ -1253,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)
@@ -1299,16 +1348,13 @@ 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)
 ])
 RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
 
-AC_ARG_WITH([gmp],
-  [AS_HELP_STRING([--without-gmp],
-    [disable GNU GMP to accelerate Bignum operations])],
-  [],
-  [with_gmp=yes])
 AS_IF([test "x$with_gmp" != xno],
   [AC_CHECK_HEADERS(gmp.h)
    AS_IF([test "x$ac_cv_header_gmp_h" != xno],
@@ -1320,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])
@@ -1351,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],
@@ -1880,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
@@ -1961,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)
@@ -2551,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*], [
@@ -2860,12 +2914,6 @@ AC_ARG_WITH(dln-a-out,
 	])
 ])
 
-AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[
-AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
-[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
-rb_cv_binary_elf=no)])
-
 AS_IF([test "$rb_cv_binary_elf" = yes], [
   AC_DEFINE(USE_ELF)
   AC_CHECK_HEADERS([elf.h elf_abi.h])
@@ -2942,13 +2990,25 @@ STATIC=
   ])
 }
 
-: "rpath" && {
-  AC_ARG_ENABLE(rpath,
-       AS_HELP_STRING([--enable-rpath], [embed run path into extension libraries.
-       enabled by default on ELF platforms]),
-       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
+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)
 
-  AS_CASE(["$target_os"],
+: "rpath" && {
+    AS_CASE(["$target_os"],
 	[solaris*], [	AS_IF([test "$GCC" = yes], [
 			    : ${LDSHARED='$(CC) -shared'}
 			    AS_IF([test "$rb_cv_prog_gnu_ld" = yes], [
@@ -2988,7 +3048,6 @@ STATIC=
 			rb_cv_dlopen=yes],
 	[interix*], [	: ${LDSHARED='$(CC) -shared'}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			LIBPATHFLAG=" -L%1\$-s"
 			rb_cv_dlopen=yes],
 	[freebsd*|dragonfly*], [
 			: ${LDSHARED='$(CC) -shared'}
@@ -3007,8 +3066,16 @@ 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
+                            EXTDLDFLAGS='$(LIBRUBYARG_SHARED)'
+                        ], [test "x$EXTSTATIC" = x], [
+                            # When building exts as bundles, a mach-o bundle needs to know its loader
+                            # program to bind symbols from the ruby executable
+                            EXTDLDFLAGS="-bundle_loader '\$(BUILTRUBY)'"
+			])
 			rb_cv_dlopen=yes],
         [aix*], [	: ${LDSHARED='$(CC)'}
 			AS_IF([test "$GCC" = yes], [
@@ -3040,30 +3107,35 @@ STATIC=
 	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
 			rb_cv_dlopen=yes],
 	[	: ${LDSHARED='$(LD)'}])
-  AC_MSG_RESULT($rb_cv_dlopen)
+    AC_MSG_RESULT($rb_cv_dlopen)
+}
 
-  AS_IF([test "$rb_cv_dlopen" = yes], [
+AS_IF([test "$rb_cv_dlopen" = yes], [
     AS_CASE(["$target_os"],
-      [darwin*], [
+    [darwin*], [
+        AC_SUBST(ADDITIONAL_DLDFLAGS, "")
 	for flag in \
-	  "-undefined dynamic_lookup" \
 	  "-multiply_defined suppress" \
+	  "-undefined dynamic_lookup" \
 	  ; do
-	  test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
-	  RUBY_TRY_LDFLAGS([$flag], [], [flag=])
-	  AS_IF([test "x$flag" != x], [
-	    RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
-	  ])
+            test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
+            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${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])
+            ], [
+                AC_MSG_RESULT([no])
+                RUBY_APPEND_OPTIONS(ADDITIONAL_DLDFLAGS, [$flag])
+            ])
+            rm -fr conftest.*
 	done
-      ])
-  ])
-
-  AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [
-      AS_IF([test "x$rpathflag" != x], [
-	  RPATHFLAG=" ${rpathflag}%1\$-s"
-      ])
-  ])
-}
+    ])
+])
 
 AS_IF([test "${LDSHAREDXX}" = ""], [
     AS_CASE(["${LDSHARED}"],
@@ -3079,7 +3151,6 @@ AS_IF([test "${LDSHAREDXX}" = ""], [
 	[ld" "*], [
 	    ])
 ])
-AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
 
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
@@ -3088,23 +3159,6 @@ AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
 AC_SUBST(PRELOADENV, "${PRELOADENV-LD_PRELOAD}")
 AC_SUBST(TRY_LINK)
 
-AS_IF([test "x$OPT_DIR" != x], [
-    pat=`echo "${LDFLAGS_OPTDIR}" | sed ['s/[][\\.*|]/\\\\&/']`
-    LDFLAGS=`echo "${LDFLAGS}" | sed "s| ${pat}||"`
-    val=`IFS="$PATH_SEPARATOR"
-        for dir in $OPT_DIR; do
-            echo x ${LIBPATHFLAG} ${RPATHFLAG} |
-            sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
-        done | tr '\012' ' ' | sed 's/ *$//'`
-    AS_IF([test x"$val" != x], [
-	test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
-	LDFLAGS="$LDFLAGS$val"
-	test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
-	DLDFLAGS="$DLDFLAGS$val"
-    ])
-    LDFLAGS_OPTDIR="$val"
-])
-
 AS_CASE(["$target_os"],
 [freebsd*], [
     AC_CHECK_LIB([procstat], [procstat_open_sysctl])
@@ -3119,6 +3173,15 @@ AS_CASE(["$target_cpu-$target_os"],
     AS_IF([test "x$ac_cv_header_execinfo_h" = xyes], [
 	AC_CHECK_LIB([execinfo], [backtrace])
 	AC_CHECK_HEADERS([libunwind.h])
+
+    AC_CHECK_HEADERS([mach/task.h mach/mach_init.h mach/mach_port.h])
+    AS_IF([ test \
+        "x${ac_cv_header_mach_task_h}" = xyes -a \
+        "x${ac_cv_header_mach_mach_init_h}" = xyes -a \
+        "x${ac_cv_header_mach_mach_port_h}" = xyes \
+    ], [
+        AC_DEFINE([HAVE_MACH_TASK_EXCEPTION_PORTS], [1])
+    ])
     ])],
 [*-freebsd*|x86_64-netbsd*], [
     AC_CHECK_HEADERS([execinfo.h])
@@ -3248,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])
@@ -3314,7 +3360,6 @@ for var in bindir includedir libdir rubylibprefix; do
 done
 
 BTESTRUBY='$(MINIRUBY)'
-BOOTSTRAPRUBY='$(BASERUBY)'
 AS_IF([test x"$cross_compiling" = xyes], [
   test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
   XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
@@ -3324,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)'
@@ -3337,7 +3386,6 @@ AS_IF([test x"$cross_compiling" = xyes], [
   RUNRUBY_COMMAND='$(MINIRUBY) $(tooldir)/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
   RUNRUBY='$(RUNRUBY_COMMAND) --'
   XRUBY='$(RUNRUBY)'
-  AS_CASE(["$HAVE_BASERUBY:$build_os"], [no:*|*:mingw*], [BOOTSTRAPRUBY='$(MINIRUBY)'])
   TEST_RUNNABLE=yes
   CROSS_COMPILING=no
 ])
@@ -3349,7 +3397,6 @@ AC_SUBST(PREP)
 AC_SUBST(RUNRUBY_COMMAND)
 AC_SUBST(RUNRUBY)
 AC_SUBST(XRUBY)
-AC_SUBST(BOOTSTRAPRUBY)
 AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
 
 FIRSTMAKEFILE=""
@@ -3588,7 +3635,7 @@ AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [
     AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed)
     AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null],
 	[AC_MSG_RESULT(no)],
-	[PREP="$PREP"' exe/$(PROGRAM)'
+	[AC_SUBST(XRUBY_LIBPATHENV_WRAPPER, 'exe/$(PROGRAM)')
 	AC_MSG_RESULT(yes)]
     )
 ])
@@ -3703,12 +3750,12 @@ AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC
 AC_SUBST(INSTALLDOC)
 
 AC_ARG_ENABLE(jit-support,
-        AS_HELP_STRING([--disable-jit-support], [disable JIT features]),
-        [MJIT_SUPPORT=$enableval],
-        # Enable mjit by default except for WASI
-        [AS_IF([test x"$target_os" != "xwasi"],
-		[MJIT_SUPPORT=yes],
-		[MJIT_SUPPORT=no ])])
+    AS_HELP_STRING([--disable-jit-support], [disable JIT features]),
+    [MJIT_SUPPORT=$enableval],
+    [AS_CASE(["$target_os"],
+        [wasi | mingw* | solaris*], [MJIT_SUPPORT=no],
+        [MJIT_SUPPORT=yes]
+    )])
 
 AS_IF([test x"$MJIT_SUPPORT" = "xyes"],
 	[AC_DEFINE(USE_MJIT, 1)],
@@ -3716,39 +3763,108 @@ 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=
 YJIT_LIBS=
 AS_CASE(["${YJIT_SUPPORT}"],
-[yes|dev], [
+[yes|dev|stats|dev_nodebug], [
     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])
     )
-    AS_IF([test x"$YJIT_SUPPORT" = "xyes"],
-            [rb_rust_target_subdir=release
-             CARGO_BUILD_ARGS='--release'],
-            [rb_rust_target_subdir=debug
-             CARGO_BUILD_ARGS='--features stats,disasm,asm_comments'
+
+    AS_CASE(["${YJIT_SUPPORT}"],
+    [yes], [
+	rb_rust_target_subdir=release
+    ],
+    [dev], [
+	rb_rust_target_subdir=debug
+	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'
+    ],
+    [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}"], [
              AC_CHECK_TOOL(CARGO, [cargo], [no])
              AS_IF([test x"$CARGO" = "xno"],
                 AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install])
-             )
-             AC_DEFINE(RUBY_DEBUG, 1)])
+             ]))
+
     YJIT_LIBS="yjit/target/${rb_rust_target_subdir}/libyjit.a"
+    AS_CASE(["$target_os"],[openbsd*],[
+        # Link libc++abi (which requires libpthread) for _Unwind_* functions needed by yjit
+        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
@@ -3793,13 +3909,26 @@ AS_CASE(["$target_os"],
 	],
     [darwin*], [
 	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+        AC_MSG_CHECKING([whether Security framework is needed])
 	AC_COMPILE_IFELSE([
-	    AC_LANG_BOOL_COMPILE_TRY([@%:@include <AvailabilityMacros.h>],
-		[MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 &&
-		 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10])],
+	    AC_LANG_BOOL_COMPILE_TRY([
+@%:@include <AvailabilityMacros.h>
+enum {
+    least = MAC_OS_X_VERSION_10_7, /* just fail if undefined */
+    required = MAC_OS_X_VERSION_MIN_REQUIRED,
+    upper /* bigger than MIN_REQUIRED, or */
+@%:@ifdef MAC_OS_X_VERSION_10_10
+        = MAC_OS_X_VERSION_10_10
+@%:@endif
+};],
+	    [required >= least && required < upper])],
 	    [dnl
+		AC_MSG_RESULT(yes)
 		RUBY_APPEND_OPTION(XLDFLAGS, [-framework Security])
 		RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Security])
+	    ],dnl
+	    [dnl
+		AC_MSG_RESULT(no)
 	    ]dnl
 	)
 	RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation])
@@ -4007,6 +4136,7 @@ AC_SUBST(EXPORT_PREFIX)
 AC_SUBST(SYMBOL_PREFIX)
 AC_SUBST(MINIOBJS)
 AC_SUBST(THREAD_MODEL)
+AC_SUBST(COROUTINE_TYPE, ${coroutine_type})
 AC_SUBST(PLATFORM_DIR)
 
 firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
@@ -4067,6 +4197,7 @@ AS_CASE(["$ruby_version"],
 AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [
     {
     echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+    echo '@%:@include "confdefs.h"'
     echo '#define STRINGIZE(x) x'
     test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
     echo '#include "version.h"'
@@ -4305,6 +4436,14 @@ AC_SUBST(XCC_WRAPPER)
 
 AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
 
+AS_IF([test ! -f "$srcdir/revision.h"], [
+    AS_IF([test "x$HAVE_BASERUBY" = xyes], [
+	${BASERUBY} -C "$srcdir" tool/file2lastrev.rb -q --revision.h > "$srcdir/revision.h"
+    ], [
+	touch "$srcdir/revision.h"
+    ])
+])
+
 AS_IF([test x"$firstmf" != x], [
     AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
 ])
@@ -4321,17 +4460,24 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
 	AS_CASE("$VCS",
 		['$(GIT)'|git], [VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)'],
 		[VCSUP='$(VCS)'])
-	sed -n \
-	    -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
-	    -e   's//\1 = \2/' \
-	    -e   '[s/ \([0-9]\)$/ 0\1/]' \
-	    -e   p \
-	    -e '}' "$srcdir/version.h"
+	for f in "$srcdir/version.h" "$srcdir/revision.h"; do
+            test -f "$f" || continue
+	    sed -n \
+	        -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
+	        -e   's//\1 = \2/' \
+	        -e   '[s/ \([0-9]\)$/ 0\1/]' \
+	        -e   p \
+	        -e '}' "$f"
+        done
 	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	AS_IF([test "$gnumake" != yes], [
 	    echo ['$(MKFILES): $(srcdir)/common.mk']
 	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+            AS_IF([test "$YJIT_SUPPORT" = yes], [
+                cat ${srcdir}/yjit/not_gmake.mk
+                echo ['$(MKFILES): ${srcdir}/yjit/not_gmake.mk']
+            ])
 	], [
 	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
 	])
@@ -4349,7 +4495,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
 	echo 'ruby: $(PROGRAM);' >> $tmpmk
 	test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
     ]) && mv -f $tmpmk Makefile],
-[EXEEXT='$EXEEXT' MAKE='${MAKE-make}' gnumake='$gnumake' GIT='$GIT'])
+[EXEEXT='$EXEEXT' MAKE='${MAKE-make}' gnumake='$gnumake' GIT='$GIT' YJIT_SUPPORT='$YJIT_SUPPORT'])
 
 AC_ARG_WITH([ruby-pc],
 	    AS_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]),
@@ -4413,7 +4559,7 @@ config_summary "debugflags"          "$debugflags"
 config_summary "warnflags"           "$warnflags"
 config_summary "strip command"       "$STRIP"
 config_summary "install doc"         "$DOCTARGETS"
-config_summary "JIT support"         "$MJIT_SUPPORT"
+config_summary "MJIT support"        "$MJIT_SUPPORT"
 config_summary "YJIT support"        "$YJIT_SUPPORT"
 config_summary "man page type"       "$MANTYPE"
 config_summary "search path"         "$search_path"
diff --git a/cont.c b/cont.c
index 38f5ceca4e..5375d1945b 100644
--- a/cont.c
+++ b/cont.c
@@ -29,11 +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"
 
@@ -66,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
@@ -194,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;
@@ -211,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;
 
 
@@ -258,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
@@ -680,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.
@@ -999,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)
 {
@@ -1019,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);
@@ -1126,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;
 }
@@ -1161,6 +1194,7 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
     }
 
     FLUSH_REGISTER_WINDOWS;
+    asan_unpoison_memory_region(cont->machine.stack_src, size, false);
     MEMCPY(cont->machine.stack, cont->machine.stack_src, VALUE, size);
 }
 
@@ -1185,13 +1219,110 @@ 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));
+    }
+}
+
+struct rb_execution_context_struct *
+rb_fiberptr_get_ec(struct rb_fiber_struct *fiber)
+{
+    return &fiber->cont.saved_ec;
 }
 
 static void
@@ -1203,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 *
@@ -1232,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
@@ -1310,7 +1445,7 @@ cont_capture(volatile int *volatile stat)
         entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1);
         for (p=th->ec->ensure_list; p; p=p->next) {
             if (!p->entry.marker)
-                p->entry.marker = rb_ary_tmp_new(0); /* dummy object */
+                p->entry.marker = rb_ary_hidden_new(0); /* dummy object */
             *entry++ = p->entry;
         }
         entry->marker = 0;
@@ -1446,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;
@@ -1486,6 +1621,10 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
             if (&space[0] > end) {
 # ifdef HAVE_ALLOCA
                 volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
+                // We need to make sure that the stack pointer is moved,
+                // but some compilers may remove the allocation by optimization.
+                // We hope that the following read/write will prevent such an optimization.
+                *sp = Qfalse;
                 space[0] = *sp;
 # else
                 cont_restore_0(cont, &space[0]);
@@ -1697,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);
         }
     }
@@ -1822,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
@@ -1873,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
+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)
+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;
@@ -1910,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)
@@ -1966,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
@@ -1979,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!");
@@ -2022,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
@@ -2041,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).
  *
  */
@@ -2075,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.
@@ -2142,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)
 {
@@ -2175,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
@@ -2212,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();
@@ -2398,7 +2749,60 @@ 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_value)
+{
+    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_value)
+{
+    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;
+}
+
+/*
+ *  call-seq:
+ *     Fiber.blocking{|fiber| ...} -> result
+ *
+ *  Forces the fiber to be blocking for the duration of the block. Returns the
+ *  result of the block.
+ *
+ *  See the "Non-blocking fibers" section in class docs for details.
+ *
+ */
+VALUE
+rb_fiber_blocking(VALUE class)
+{
+    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);
+    }
 }
 
 /*
@@ -2936,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)
 {
@@ -3280,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) {
@@ -3291,8 +3373,14 @@ Init_Cont(void)
     rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
     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);
@@ -3309,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 b13c3d9c8a..f342d2fcf7 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -2,15 +2,17 @@ gnumake = yes
 
 include Makefile
 
-ENABLE_SHARED=@ENABLE_SHARED@
-DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
+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)) \
 	$(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp)))
 WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED
 STRIP = @STRIP@
 
-ifeq (@target_os@,cygwin)
+ifeq ($(target_os),cygwin)
   DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
 else
   DLL_BASE_NAME := $(RUBY_SO_NAME)
@@ -38,7 +40,7 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 
 include $(srcdir)/template/GNUmakefile.in
 
-SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
+SOLIBS := $(DLL_BASE_NAME).res.$(OBJEXT) $(SOLIBS)
 override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
 RUBYDEF = $(DLL_BASE_NAME).def
@@ -47,26 +49,26 @@ ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
 
 $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
-$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
+$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.$(OBJEXT)
 
-%.res.@OBJEXT@: %.rc
+%.res.$(OBJEXT): %.rc
 	$(ECHO) compiling $@
 	$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+%.rc: $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \
+	$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
 	  -so_name=$(DLL_BASE_NAME) -output=$(*F) \
 	  . $(icondirs) $(srcdir)/win32
 
-$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
-$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
+$(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@
+$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.$(OBJEXT)
 
 $(RUBY_EXP): $(LIBRUBY_A)
 	$(ECHO) creating $@
@@ -78,7 +80,7 @@ $(RUBY_EXP): $(LIBRUBY_A)
 
 GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 
-ifeq (@target_os@,mingw32)
+ifeq ($(target_os),mingw32)
 $(OBJS) $(MAINOBJ): win32.h
 
 dir.$(OBJEXT) win32/win32.$(OBJEXT): win32/dir.h
@@ -89,16 +91,17 @@ MSYS2_ARG_CONV_EXCL_PARAM = --exclude=;--name=
 yes-test-ruby:	 export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 yes-test-all:	 export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 yes-test-almost: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
+test/% spec/%/ spec/%_spec.rb: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 
 endif
 
 $(LIBRUBY_SO): $(RUBYDEF)
 
-$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
+$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG)
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
+	$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
 
 clean-local::
 	@$(RM) $(RUBYDEF)
-	@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
+	@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.$(OBJEXT))
 	@$(RM) $(RCFILES)
diff --git a/debug.c b/debug.c
index 6c9d6563db..3dd0f71906 100644
--- a/debug.c
+++ b/debug.c
@@ -53,7 +53,9 @@ const union {
     rb_econv_result_t           econv_result;
     enum ruby_preserved_encindex encoding_index;
     enum ruby_robject_flags     robject_flags;
+#if !USE_RVARGC
     enum ruby_robject_consts    robject_consts;
+#endif
     enum ruby_rmodule_flags     rmodule_flags;
     enum ruby_rstring_flags     rstring_flags;
 #if !USE_RVARGC
@@ -62,23 +64,23 @@ const union {
     enum ruby_rarray_flags      rarray_flags;
     enum ruby_rarray_consts     rarray_consts;
     enum {
-	RUBY_FMODE_READABLE		= FMODE_READABLE,
-	RUBY_FMODE_WRITABLE		= FMODE_WRITABLE,
-	RUBY_FMODE_READWRITE		= FMODE_READWRITE,
-	RUBY_FMODE_BINMODE		= FMODE_BINMODE,
-	RUBY_FMODE_SYNC 		= FMODE_SYNC,
-	RUBY_FMODE_TTY			= FMODE_TTY,
-	RUBY_FMODE_DUPLEX		= FMODE_DUPLEX,
-	RUBY_FMODE_APPEND		= FMODE_APPEND,
-	RUBY_FMODE_CREATE		= FMODE_CREATE,
-	RUBY_FMODE_NOREVLOOKUP		= 0x00000100,
-	RUBY_FMODE_TRUNC		= FMODE_TRUNC,
-	RUBY_FMODE_TEXTMODE		= FMODE_TEXTMODE,
-	RUBY_FMODE_PREP 		= 0x00010000,
-	RUBY_FMODE_SETENC_BY_BOM	= FMODE_SETENC_BY_BOM,
-	RUBY_FMODE_UNIX 		= 0x00200000,
-	RUBY_FMODE_INET 		= 0x00400000,
-	RUBY_FMODE_INET6		= 0x00800000,
+        RUBY_FMODE_READABLE		= FMODE_READABLE,
+        RUBY_FMODE_WRITABLE		= FMODE_WRITABLE,
+        RUBY_FMODE_READWRITE		= FMODE_READWRITE,
+        RUBY_FMODE_BINMODE		= FMODE_BINMODE,
+        RUBY_FMODE_SYNC 		= FMODE_SYNC,
+        RUBY_FMODE_TTY			= FMODE_TTY,
+        RUBY_FMODE_DUPLEX		= FMODE_DUPLEX,
+        RUBY_FMODE_APPEND		= FMODE_APPEND,
+        RUBY_FMODE_CREATE		= FMODE_CREATE,
+        RUBY_FMODE_NOREVLOOKUP		= 0x00000100,
+        RUBY_FMODE_TRUNC		= FMODE_TRUNC,
+        RUBY_FMODE_TEXTMODE		= FMODE_TEXTMODE,
+        RUBY_FMODE_PREP 		= 0x00010000,
+        RUBY_FMODE_SETENC_BY_BOM	= FMODE_SETENC_BY_BOM,
+        RUBY_FMODE_UNIX 		= 0x00200000,
+        RUBY_FMODE_INET 		= 0x00400000,
+        RUBY_FMODE_INET6		= 0x00800000,
 
         RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
         RUBY_NODE_TYPEMASK  = NODE_TYPEMASK,
@@ -86,9 +88,9 @@ const union {
         RUBY_NODE_FL_NEWLINE   = NODE_FL_NEWLINE
     } various;
     union {
-	enum imemo_type                     types;
-	enum {RUBY_IMEMO_MASK = IMEMO_MASK} mask;
-	struct RIMemo                      *ptr;
+        enum imemo_type                     types;
+        enum {RUBY_IMEMO_MASK = IMEMO_MASK} mask;
+        struct RIMemo                      *ptr;
     } imemo;
     struct RSymbol *symbol_ptr;
     enum vm_call_flag_bits vm_call_flags;
@@ -100,9 +102,9 @@ int
 ruby_debug_print_indent(int level, int debug_level, int indent_level)
 {
     if (level < debug_level) {
-	fprintf(stderr, "%*s", indent_level, "");
-	fflush(stderr);
-	return TRUE;
+        fprintf(stderr, "%*s", indent_level, "");
+        fflush(stderr);
+        return TRUE;
     }
     return FALSE;
 }
@@ -122,11 +124,11 @@ VALUE
 ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj)
 {
     if (level < debug_level) {
-	char buff[0x100];
-	rb_raw_obj_info(buff, 0x100, obj);
+        char buff[0x100];
+        rb_raw_obj_info(buff, 0x100, obj);
 
-	fprintf(stderr, "DBG> %s: %s\n", header, buff);
-	fflush(stderr);
+        fprintf(stderr, "DBG> %s: %s\n", header, buff);
+        fflush(stderr);
     }
     return obj;
 }
@@ -141,8 +143,8 @@ ID
 ruby_debug_print_id(int level, int debug_level, const char *header, ID id)
 {
     if (level < debug_level) {
-	fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id));
-	fflush(stderr);
+        fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id));
+        fflush(stderr);
     }
     return id;
 }
@@ -151,8 +153,8 @@ NODE *
 ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node)
 {
     if (level < debug_level) {
-	fprintf(stderr, "DBG> %s: %s (%u)\n", header,
-		ruby_node_name(nd_type(node)), nd_line(node));
+        fprintf(stderr, "DBG> %s: %s (%u)\n", header,
+                ruby_node_name(nd_type(node)), nd_line(node));
     }
     return (NODE *)node;
 }
@@ -182,11 +184,11 @@ ruby_env_debug_option(const char *str, int len, void *arg)
     size_t retlen;
     unsigned long n;
 #define SET_WHEN(name, var, val) do {	    \
-	if (len == sizeof(name) - 1 &&	    \
-	    strncmp(str, (name), len) == 0) { \
-	    (var) = (val);		    \
-	    return 1;			    \
-	}				    \
+        if (len == sizeof(name) - 1 &&	    \
+            strncmp(str, (name), len) == 0) { \
+            (var) = (val);		    \
+            return 1;			    \
+        }				    \
     } while (0)
 #define NAME_MATCH_VALUE(name)				\
     ((size_t)len >= sizeof(name)-1 &&			\
@@ -195,24 +197,24 @@ ruby_env_debug_option(const char *str, int len, void *arg)
       (str[sizeof(name)-1] == '=' &&			\
        (str += sizeof(name), len -= sizeof(name), 1))))
 #define SET_UINT(val) do { \
-	n = ruby_scan_digits(str, len, 10, &retlen, &ov); \
-	if (!ov && retlen) { \
-	    val = (unsigned int)n; \
-	} \
-	str += retlen; \
-	len -= retlen; \
+        n = ruby_scan_digits(str, len, 10, &retlen, &ov); \
+        if (!ov && retlen) { \
+            val = (unsigned int)n; \
+        } \
+        str += retlen; \
+        len -= retlen; \
     } while (0)
 #define SET_UINT_LIST(name, vals, num) do { \
-	int i; \
-	for (i = 0; i < (num); ++i) { \
-	    SET_UINT((vals)[i]); \
-	    if (!len || *str != ':') break; \
-	    ++str; \
-	    --len; \
-	} \
-	if (len > 0) { \
-	    fprintf(stderr, "ignored "name" option: `%.*s'\n", len, str); \
-	} \
+        int i; \
+        for (i = 0; i < (num); ++i) { \
+            SET_UINT((vals)[i]); \
+            if (!len || *str != ':') break; \
+            ++str; \
+            --len; \
+        } \
+        if (len > 0) { \
+            fprintf(stderr, "ignored "name" option: `%.*s'\n", len, str); \
+        } \
     } while (0)
 #define SET_WHEN_UINT(name, vals, num, req) \
     if (NAME_MATCH_VALUE(name)) SET_UINT_LIST(name, vals, num);
@@ -221,9 +223,9 @@ ruby_env_debug_option(const char *str, int len, void *arg)
     SET_WHEN("core", ruby_enable_coredump, 1);
     SET_WHEN("ci", ruby_on_ci, 1);
     if (NAME_MATCH_VALUE("rgengc")) {
-	if (!len) ruby_rgengc_debug = 1;
-	else SET_UINT_LIST("rgengc", &ruby_rgengc_debug, 1);
-	return 1;
+        if (!len) ruby_rgengc_debug = 1;
+        else SET_UINT_LIST("rgengc", &ruby_rgengc_debug, 1);
+        return 1;
     }
 #if defined _WIN32
 # if RUBY_MSVCRT_VERSION >= 80
@@ -232,9 +234,9 @@ ruby_env_debug_option(const char *str, int len, void *arg)
 #endif
 #if defined _WIN32 || defined __CYGWIN__
     if (NAME_MATCH_VALUE("codepage")) {
-	if (!len) fprintf(stderr, "missing codepage argument");
-	else SET_UINT_LIST("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage));
-	return 1;
+        if (!len) fprintf(stderr, "missing codepage argument");
+        else SET_UINT_LIST("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage));
+        return 1;
     }
 #endif
     return 0;
@@ -244,7 +246,7 @@ static void
 set_debug_option(const char *str, int len, void *arg)
 {
     if (!ruby_env_debug_option(str, len, arg)) {
-	fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+        fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
     }
 }
 
@@ -273,10 +275,26 @@ ruby_set_debug_option(const char *str)
 
 enum ruby_debug_log_mode ruby_debug_log_mode;
 
+struct debug_log_filter {
+    enum debug_log_filter_type {
+        dlf_all,
+        dlf_file, // "file:..."
+        dlf_func, // "func:..."
+    } type;
+    bool negative;
+    char str[MAX_DEBUG_LOG_FILTER_LEN];
+};
+
+static const char *dlf_type_names[] = {
+    "all",
+    "file",
+    "func",
+};
+
 static struct {
     char *mem;
     unsigned int cnt;
-    char filters[MAX_DEBUG_LOG_FILTER_NUM][MAX_DEBUG_LOG_FILTER_LEN];
+    struct debug_log_filter filters[MAX_DEBUG_LOG_FILTER_NUM];
     unsigned int filters_num;
     rb_nativethread_lock_t lock;
     FILE *output;
@@ -288,15 +306,86 @@ RUBY_DEBUG_LOG_MEM_ENTRY(unsigned int index)
     return &debug_log.mem[MAX_DEBUG_LOG_MESSAGE_LEN * index];
 }
 
+static enum debug_log_filter_type
+filter_type(const char *str, int *skiplen)
+{
+    if (strncmp(str, "file:", 5) == 0) {
+        *skiplen = 5;
+        return dlf_file;
+    }
+    else if(strncmp(str, "func:", 5) == 0) {
+        *skiplen = 5;
+        return dlf_func;
+    }
+    else {
+        *skiplen = 0;
+        return dlf_all;
+    }
+}
+
+static void
+setup_debug_log_filter(void)
+{
+    const char *filter_config = getenv("RUBY_DEBUG_LOG_FILTER");
+
+    if (filter_config && strlen(filter_config) > 0) {
+        unsigned int i;
+        for (i=0; i<MAX_DEBUG_LOG_FILTER_NUM && filter_config; i++) {
+            size_t len;
+            const char *str = filter_config;
+            const char *p;
+
+            if ((p = strchr(str, ',')) == NULL) {
+                len = strlen(str);
+                filter_config = NULL;
+            }
+            else {
+                len = p - str - 1; // 1 is ','
+                filter_config = p + 1;
+            }
+
+            // positive/negative
+            if (*str == '-') {
+                debug_log.filters[i].negative = true;
+                str++;
+            }
+            else if (*str == '+') {
+                // negative is false on default.
+                str++;
+            }
+
+            // type
+            int skiplen;
+            debug_log.filters[i].type = filter_type(str, &skiplen);
+            len -= skiplen;
+
+            if (len >= MAX_DEBUG_LOG_FILTER_LEN) {
+                fprintf(stderr, "too long: %s (max:%d)\n", str, MAX_DEBUG_LOG_FILTER_LEN - 1);
+                exit(1);
+            }
+
+            // body
+            strncpy(debug_log.filters[i].str, str + skiplen, len);
+            debug_log.filters[i].str[len] = 0;
+        }
+        debug_log.filters_num = i;
+
+        for (i=0; i<debug_log.filters_num; i++) {
+            fprintf(stderr, "RUBY_DEBUG_LOG_FILTER[%d]=%s (%s%s)\n", i,
+                    debug_log.filters[i].str,
+                    debug_log.filters[i].negative ? "-" : "",
+                    dlf_type_names[debug_log.filters[i].type]);
+        }
+    }
+}
+
 static void
 setup_debug_log(void)
 {
     // check RUBY_DEBUG_LOG
     const char *log_config = getenv("RUBY_DEBUG_LOG");
-    if (log_config) {
-        fprintf(stderr, "RUBY_DEBUG_LOG=%s\n", log_config);
-
-        if  (strcmp(log_config, "mem") == 0) {
+    if (log_config && strlen(log_config) > 0) {
+        if (strcmp(log_config, "mem") == 0) {
             debug_log.mem = (char *)malloc(MAX_DEBUG_LOG * MAX_DEBUG_LOG_MESSAGE_LEN);
             if (debug_log.mem == NULL) {
                 fprintf(stderr, "setup_debug_log failed (can't allocate memory)\n");
@@ -316,37 +405,37 @@ setup_debug_log(void)
             setvbuf(debug_log.output, NULL, _IONBF, 0);
         }
 
+        fprintf(stderr, "RUBY_DEBUG_LOG=%s %s%s%s\n", log_config,
+                (ruby_debug_log_mode & ruby_debug_log_memory) ? "[mem]" : "",
+                (ruby_debug_log_mode & ruby_debug_log_stderr) ? "[stderr]" : "",
+                (ruby_debug_log_mode & ruby_debug_log_file)   ? "[file]" : "");
         rb_nativethread_lock_initialize(&debug_log.lock);
+
+        setup_debug_log_filter();
     }
+}
 
-    // check RUBY_DEBUG_LOG_FILTER
-    const char *filter_config = getenv("RUBY_DEBUG_LOG_FILTER");
-    if (filter_config && strlen(filter_config) > 0) {
-        unsigned int i;
-        for (i=0; i<MAX_DEBUG_LOG_FILTER_NUM; i++) {
-            const char *p;
-            if ((p = strchr(filter_config, ',')) == NULL) {
-                if (strlen(filter_config) >= MAX_DEBUG_LOG_FILTER_LEN) {
-                    fprintf(stderr, "too long: %s (max:%d)\n", filter_config, MAX_DEBUG_LOG_FILTER_LEN);
-                    exit(1);
-                }
-                strncpy(debug_log.filters[i], filter_config, MAX_DEBUG_LOG_FILTER_LEN - 1);
-                i++;
-                break;
-            }
-            else {
-                size_t n = p - filter_config;
-                if (n >= MAX_DEBUG_LOG_FILTER_LEN) {
-                    fprintf(stderr, "too long: %s (max:%d)\n", filter_config, MAX_DEBUG_LOG_FILTER_LEN);
-                    exit(1);
-                }
-                strncpy(debug_log.filters[i], filter_config, n);
-                filter_config = p+1;
-            }
+static bool
+check_filter(const char *str, const struct debug_log_filter *filter, bool *state)
+{
+    if (filter->negative) {
+        if (strstr(str, filter->str) == NULL) {
+            *state = true;
+            return false;
         }
-        debug_log.filters_num = i;
-        for (i=0; i<debug_log.filters_num; i++) {
-            fprintf(stderr, "RUBY_DEBUG_LOG_FILTER[%d]=%s\n", i, debug_log.filters[i]);
+        else {
+            *state = false;
+            return true;
+        }
+    }
+    else {
+        if (strstr(str, filter->str) != NULL) {
+            *state = true;
+            return true;
+        }
+        else {
+            *state = false;
+            return false;
         }
     }
 }
@@ -354,47 +443,45 @@ setup_debug_log(void)
 //
 // RUBY_DEBUG_LOG_FILTER=-foo,-bar,baz,boo
 // returns true if
-//   func_name doesn't contain foo
+//   (func_name or file_name) doesn't contain foo
 // and
-//   func_name doesn't contain bar
+//   (func_name or file_name) doesn't contain bar
 // and
-//   func_name contains baz or boo
+//   (func_name or file_name) contains baz or boo
 //
 // RUBY_DEBUG_LOG_FILTER=foo,bar,-baz,-boo
 // retunrs true if
-//   func_name contains foo or bar
+//   (func_name or file_name) contains foo or bar
 // or
-//   func_name doesn't contain baz and
-//   func_name doesn't contain boo and
+//   (func_name or file_name) doesn't contain baz and
+//   (func_name or file_name) doesn't contain boo and
+//
+// You can specify "file:" (ex file:foo) or "func:" (ex  func:foo)
+// prefixes to specify the filter for.
 //
 bool
-ruby_debug_log_filter(const char *func_name)
+ruby_debug_log_filter(const char *func_name, const char *file_name)
 {
     if (debug_log.filters_num > 0) {
-        bool status = false;
+        bool state = false;
 
         for (unsigned int i = 0; i<debug_log.filters_num; i++) {
-            const char *filter = debug_log.filters[i];
-
-            if (*filter == '-') {
-                if (strstr(func_name, &filter[1]) == NULL) {
-                    status = true;
-                }
-                else {
-                    return false;
-                }
-            }
-            else {
-                if (strstr(func_name, filter) != NULL) {
-                    return true;
-                }
-                else {
-                    status = false;
-                }
+            const struct debug_log_filter *filter = &debug_log.filters[i];
+
+            switch (filter->type) {
+              case dlf_all:
+                if (check_filter(func_name, filter, &state)) return state;
+                if (check_filter(file_name, filter, &state)) return state;
+                break;
+              case dlf_func:
+                if (check_filter(func_name, filter, &state)) return state;
+                break;
+              case dlf_file:
+                if (check_filter(file_name, filter, &state)) return state;
+                break;
             }
         }
-
-        return status;
+        return state;
     }
     else {
         return true;
@@ -412,6 +499,7 @@ pretty_filename(const char *path)
     return path;
 }
 
+#undef ruby_debug_log
 void
 ruby_debug_log(const char *file, int line, const char *func_name, const char *fmt, ...)
 {
diff --git a/debug_counter.c b/debug_counter.c
index e7b0bb0acd..463bebf849 100644
--- a/debug_counter.c
+++ b/debug_counter.c
@@ -16,19 +16,21 @@
 
 #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
 #define RB_DEBUG_COUNTER(name) #name,
 #include "debug_counter.h"
 #undef RB_DEBUG_COUNTER
 };
 
 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
 
-rb_nativethread_lock_t debug_counter_lock;
+static rb_nativethread_lock_t debug_counter_lock;
 
 __attribute__((constructor))
 static void
@@ -47,24 +49,14 @@ rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add)
     rb_nativethread_lock_unlock(&debug_counter_lock);
 }
 
-int debug_counter_disable_show_at_exit = 0;
+static int debug_counter_disable_show_at_exit = 0;
 
 // note that this operation is not atomic.
 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;
     }
 }
 
@@ -75,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) {
@@ -101,13 +93,13 @@ rb_debug_counter_show_results(const char *msg)
     setlocale(LC_NUMERIC, "");
 
     if (env == NULL || strcmp("1", env) != 0) {
-	int i;
+        int i;
         fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%d %s\n", getpid(), msg);
-	for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+        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[i]);
-	}
+                    rb_debug_counter_names[i],
+                    rb_debug_counter[i]);
+        }
     }
 }
 
diff --git a/debug_counter.h b/debug_counter.h
index 3f0dec948f..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)
 
-/* mjit_exec() counts */
-RB_DEBUG_COUNTER(mjit_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 929238af7b..54fef6685f 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -11,11 +11,15 @@ override ACTIONS_GROUP = @echo "\#\#[group]$(patsubst yes-%,%,$@)"
 override ACTIONS_ENDGROUP = @echo "\#\#[endgroup]"
 endif
 
-ifneq ($(filter %darwin%,$(arch)),)
-INSTRUBY_ENV += SDKROOT=/
+ifneq ($(filter darwin%,$(target_os)),)
+# Remove debug option not to generate thousands of .dSYM
+MJIT_DEBUGFLAGS := $(filter-out -g%,$(MJIT_DEBUGFLAGS))
+
+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))
@@ -23,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))
@@ -36,15 +40,13 @@ 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) &&)
 
-ifneq ($(filter -O0 -Od,$(optflags)),)
-override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))
-endif
-
 ifeq ($(if $(filter all main exts enc trans libencs libenc libtrans \
 		    prog program ruby ruby$(EXEEXT) \
 		    wprogram rubyw rubyw$(EXEEXT) \
@@ -72,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)),)
@@ -81,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 \
 	)
@@ -89,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))
@@ -134,7 +139,7 @@ config.status: $(wildcard config.cache)
 STUBPROGRAM = rubystub$(EXEEXT)
 IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
 SCRIPTBINDIR := $(if $(EXEEXT),,exec/)
-SCRIPTPROGRAMS = $(addprefix $(SCRIPTBINDIR),$(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/libexec/*)))))
+SCRIPTPROGRAMS = $(addprefix $(SCRIPTBINDIR),$(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*)))))
 
 stub: $(STUBPROGRAM)
 scriptbin: $(SCRIPTPROGRAMS)
@@ -160,9 +165,8 @@ $(SCRIPTBINDIR)%$(EXEEXT): bin/% $(STUBPROGRAM) \
 	$(Q) chmod +x $@
 	$(Q) $(POSTLINK)
 
-$(TIMESTAMPDIR)/.exec.time:
-	$(Q) mkdir exec
-	$(Q) exit > $@
+$(SCRIPTBINDIR):
+	$(Q) mkdir $@
 
 .PHONY: commit
 commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) up
@@ -180,8 +184,8 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS
 GITHUB_RUBY_URL = https://github.com/ruby/ruby
 PR =
 
-COMMIT_GPG_SIGN = $(shell git -C "$(srcdir)" config commit.gpgsign)
-REMOTE_GITHUB_URL = $(shell git -C "$(srcdir)" config remote.github.url)
+COMMIT_GPG_SIGN = $(shell $(GIT) -C "$(srcdir)" config commit.gpgsign)
+REMOTE_GITHUB_URL = $(shell $(GIT) -C "$(srcdir)" config remote.github.url)
 COMMITS_NOTES = commits
 
 .PHONY: fetch-github
@@ -194,21 +198,21 @@ define fetch-github
 	  exit 1; \
 	)
 	$(eval REMOTE_GITHUB_URL := $(REMOTE_GITHUB_URL))
-	$(if $(REMOTE_GITHUB_URL),, \
-	  echo adding $(GITHUB_RUBY_URL) as remote github; \
-	  git -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL); \
-	  git -C "$(srcdir)" config --add remote.github.fetch +refs/notes/$(COMMITS_NOTES):refs/notes/$(COMMITS_NOTES)
-	  $(eval REMOTE_GITHUB_URL := $(GITHUB_RUBY_URL)) \
+	$(if $(REMOTE_GITHUB_URL),,
+	  echo adding $(GITHUB_RUBY_URL) as remote github
+	  $(GIT) -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL)
+	  $(GIT) -C "$(srcdir)" config --add remote.github.fetch +refs/notes/$(COMMITS_NOTES):refs/notes/$(COMMITS_NOTES)
+	  $(eval REMOTE_GITHUB_URL := $(GITHUB_RUBY_URL))
 	)
-	$(if $(git -C "$(srcdir)" rev-parse "github/pull/$(1)/head" -- 2> /dev/null), \
-	    git -C "$(srcdir)" branch -f "gh-$(1)" "github/pull/$(1)/head", \
-	    git -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)" \
+	$(if $(shell $(GIT) -C "$(srcdir)" rev-parse "github/pull/$(1)/head" -- 2> /dev/null),
+	    $(GIT) -C "$(srcdir)" branch -f "gh-$(1)" "github/pull/$(1)/head",
+	    $(GIT) -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)"
 	)
 endef
 
 .PHONY: checkout-github
 checkout-github: fetch-github
-	git -C "$(srcdir)" checkout "gh-$(PR)"
+	$(GIT) -C "$(srcdir)" checkout "gh-$(PR)"
 
 .PHONY: update-github
 update-github: fetch-github
@@ -221,31 +225,31 @@ update-github: fetch-github
 	$(eval PR_BRANCH := $(word 2,$(PULL_REQUEST_FORK_BRANCH)))
 
 	$(eval GITHUB_UPDATE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(PR)-XXXXXX"))
-	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)"
-	git -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit
+	$(GIT) -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)"
+	$(GIT) -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit
 	@$(BASERUBY) -e 'print "Are you sure to push this to PR=$(PR)? [Y/n]: "; exit(gets.chomp != "n")'
-	git -C "$(srcdir)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git
-	git -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH)
-	git -C "$(srcdir)" remote rm fork-$(PR)
-	git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_UPDATE_WORKTREE))
-	git -C "$(srcdir)" branch -D gh-$(PR)
+	$(GIT) -C "$(srcdir)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git
+	$(GIT) -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH)
+	$(GIT) -C "$(srcdir)" remote rm fork-$(PR)
+	$(GIT) -C "$(srcdir)" worktree remove $(notdir $(GITHUB_UPDATE_WORKTREE))
+	$(GIT) -C "$(srcdir)" branch -D gh-$(PR)
 
 .PHONY: pull-github
 pull-github: fetch-github
 	$(call pull-github,$(PR))
 
 define pull-github
-	$(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H))
-	$(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD))
+	$(eval GITHUB_MERGE_BASE := $(shell $(GIT) -C "$(srcdir)" log -1 --format=format:%H))
+	$(eval GITHUB_MERGE_BRANCH := $(shell $(GIT) -C "$(srcdir)" symbolic-ref --short HEAD))
 	$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(1)-XXXXXX"))
-	git -C "$(srcdir)" worktree prune
-	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(1)"
-	git -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH)
+	$(GIT) -C "$(srcdir)" worktree prune
+	$(GIT) -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(1)"
+	$(GIT) -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH)
 	$(eval COMMIT_GPG_SIGN := $(COMMIT_GPG_SIGN))
 	$(if $(filter true,$(COMMIT_GPG_SIGN)), \
-	  git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git commit --amend --no-edit -S" "$(GITHUB_MERGE_BASE)"; \
+	  $(GIT) -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "$(GIT) commit --amend --no-edit -S" "$(GITHUB_MERGE_BASE)"; \
 	)
-	git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)"
+	$(GIT) -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "$(GIT) notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)"
 endef
 
 .PHONY: fetch-github-%
@@ -254,23 +258,46 @@ fetch-github-%:
 
 .PHONY: checkout-github-%
 checkout-github-%: fetch-github-%
-	git -C "$(srcdir)" checkout "gh-$*"
+	$(GIT) -C "$(srcdir)" checkout "gh-$*"
 
 .PHONY: pr-% pull-github-%
 pr-% pull-github-%: fetch-github-%
 	$(call pull-github,$*)
 
 HELP_EXTRA_TASKS = \
-	"  checkout-github:     checkout GitHub Pull Request [PR=1234]" \
-	"  pull-github:         rebase GitHub Pull Request to new worktree [PR=1234]" \
-	"  update-github:       merge master branch and push it to Pull Request [PR=1234]" \
+	"  checkout-github:       checkout GitHub Pull Request [PR=1234]" \
+	"  pull-github:           rebase GitHub Pull Request to new worktree [PR=1234]" \
+	"  update-github:         merge master branch and push it to Pull Request [PR=1234]" \
 	""
 
-extract-gems: $(HAVE_BASERUBY:yes=update-gems)
-
-bundled-gems := $(shell sed '/^[ 	]*\#/d;/^[ 	]*$$/d;s/[ 	][ 	]*/-/;s/[ 	].*//' $(srcdir)/gems/bundled_gems)
-
-update-gems: | $(patsubst %,gems/%.gem,$(bundled-gems))
+# 1. squeeze spaces
+# 2. strip and skip comment/empty lines
+# 3. "gem x.y.z URL xxxxxx" -> "gem|x.y.z|xxxxxx|URL"
+# 4. "gem x.y.z URL" -> "gem-x.y.z"
+bundled-gems := $(shell sed \
+	-e 's/[ 	][ 	]*/ /g' \
+	-e 's/^ //;/\#/d;s/ *$$//;/^$$/d' \
+	$(if $(filter yes,$(HAVE_GIT)), \
+	-e 's/^\(.*\) \(.*\) \(.*\) \(.*\)/\1|\2|\4|\3/' \
+	) \
+	-e 's/ /-/;s/ .*//' \
+	 $(srcdir)/gems/bundled_gems)
+
+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: | $(call foreach-bundled-gems-rev,bundled-gem-gemfile)
+update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-srcdir)
 
 test-bundler-precheck: | $(srcdir)/.bundle/cache
 
@@ -278,7 +305,7 @@ $(srcdir)/.bundle/cache:
 	$(MAKEDIRS) $(@D) $(CACHE_DIR)
 	$(LN_S) ../.downloaded-cache $@
 
-gems/%.gem:
+$(srcdir)/gems/%.gem:
 	$(ECHO) Downloading bundled gem $*...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
 	    -I./tool -rdownloader \
@@ -289,14 +316,39 @@ gems/%.gem:
 	    -e 'File.unlink(*old) and' \
 	    -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})'
 
-extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems))
+extract-gems: | $(patsubst %,$(srcdir)/.bundle/gems/%,$(bundled-gems))
+extract-gems: | $(call foreach-bundled-gems-rev,bundled-gem-extracted)
 
-.bundle/gems/%: gems/%.gem | .bundle/gems
+$(srcdir)/.bundle/gems/%: $(srcdir)/gems/%.gem | .bundle/gems
 	$(ECHO) Extracting bundle gem $*...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
-	    -Itool -rgem-unpack \
-	    -e 'Gem.unpack("gems/$(@F).gem", ".bundle/gems", ".bundle/specifications")'
-	$(RMALL) "$(srcdir)/$(@:.gem=)/".git*
+	    -Itool/lib -rbundled_gem \
+	    -e 'BundledGem.unpack("gems/$(@F).gem", ".bundle")'
+
+define copy-gem
+$(srcdir)/gems/src/$(1): | $(srcdir)/gems/src
+	$(ECHO) Cloning $(4)
+	$(Q) $(GIT) clone $(4) $$(@)
+
+$(srcdir)/.bundle/gems/$(1)-$(2): | $(srcdir)/gems/src/$(1) .bundle/gems
+	$(ECHO) Copying $(1)@$(3) to $$(@F)
+	$(Q) $(CHDIR) "$(srcdir)/gems/src/$(1)" && \
+	    $(GIT) fetch origin $(3) && \
+	    $(GIT) checkout --detach $(3) && \
+	:
+	$(Q) $(BASERUBY) -C "$(srcdir)" \
+	    -Itool/lib -rbundled_gem \
+	    -e 'BundledGem.copy("gems/src/$(1)/$(1).gemspec", ".bundle")'
+
+endef
+define copy-gem-0
+$(eval $(call copy-gem,$(1),$(2),$(3),$(4)))
+endef
+
+$(call foreach-bundled-gems-rev,copy-gem-0)
+
+$(srcdir)/gems/src:
+	$(MAKEDIRS) $@
 
 $(srcdir)/.bundle/gems:
 	$(MAKEDIRS) $@
@@ -333,28 +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)
-endif
+.SECONDARY: update-unicode-files
+.SECONDARY: update-unicode-auxiliary-files
+.SECONDARY: update-unicode-ucd-emoji-files
+.SECONDARY: update-unicode-emoji-files
 
-ifeq ($(wildcard $(srcdir)/revision.h),)
-REVISION_IN_HEADER := none
-REVISION_LATEST := update
+ifeq ($(HAVE_GIT),yes)
+REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && $(GIT) log -1 --format=%H 2>/dev/null)
 else
-REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
-REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null)
+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))
-# GNU make treat the target as unmodified when its dependents get
-# updated but it is not updated, while others may not.
-$(srcdir)/revision.h: $(REVISION_H)
+$(REVISION_H): PHONY
 endif
 
 include $(top_srcdir)/yjit/yjit.mk
@@ -401,19 +447,19 @@ endif
 update-deps:
 	$(eval update_deps := $(shell date +update-deps-%Y%m%d))
 	$(eval deps_dir := $(shell mktemp -d)/$(update_deps))
-	$(eval GIT_DIR := $(shell git -C $(srcdir) rev-parse --absolute-git-dir))
-	git --git-dir=$(GIT_DIR) worktree add $(deps_dir)
+	$(eval GIT_DIR := $(shell $(GIT) -C $(srcdir) rev-parse --absolute-git-dir))
+	$(GIT) --git-dir=$(GIT_DIR) worktree add $(deps_dir)
 	cp $(tooldir)/config.guess $(tooldir)/config.sub $(deps_dir)/tool
 	[ -f config.status ] && cp config.status $(deps_dir)
 	cd $(deps_dir) && autoconf && \
 	exec ./configure -q -C --enable-load-relative --disable-install-doc --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g'
 	$(RUNRUBY) -C $(deps_dir) tool/update-deps --fix
-	git -C $(deps_dir) diff --no-ext-diff --ignore-submodules --exit-code || \
-	    git -C $(deps_dir) commit --all --message='Update dependencies'
-	git --git-dir=$(GIT_DIR) worktree remove $(deps_dir)
+	$(GIT) -C $(deps_dir) diff --no-ext-diff --ignore-submodules --exit-code || \
+	    $(GIT) -C $(deps_dir) commit --all --message='Update dependencies'
+	$(GIT) --git-dir=$(GIT_DIR) worktree remove $(deps_dir)
 	$(RMDIR) $(dir $(deps_dir))
-	git --git-dir=$(GIT_DIR) merge --no-edit --ff-only $(update_deps)
-	git --git-dir=$(GIT_DIR) branch --delete $(update_deps)
+	$(GIT) --git-dir=$(GIT_DIR) merge --no-edit --ff-only $(update_deps)
+	$(GIT) --git-dir=$(GIT_DIR) branch --delete $(update_deps)
 
 # order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT)
 # because the same named directory exists in the source tree.
diff --git a/defs/id.def b/defs/id.def
index 097e34e405..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>
@@ -194,13 +196,14 @@ predefined.split(/^/).each_with_index do |line, num|
   end << token
   predefined_ids[token] = name
 end
+index = 127
 token_ops.split(/^/).each do |line|
   next if /^#/ =~ line
   line.sub!(/\s+#.*/, '')
   id, op, token = line.split
   next unless id and op
   token ||= (id unless /\A\W\z/ =~ op)
-  token_op_ids << [id, op, token]
+  token_op_ids << [id, op, token, (index += 1 if token)]
 end
 {
   "LOCAL" => local_ids,
@@ -212,4 +215,5 @@ end
   :preserved => preserved_ids,
   :predefined => predefined_ids,
   :token_op => token_op_ids,
+  :last_token => index,
 }
diff --git a/defs/keywords b/defs/keywords
index fc30ec2d15..a1b1f4f60f 100644
--- a/defs/keywords
+++ b/defs/keywords
@@ -2,7 +2,7 @@
 struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
+static const struct kwtable *reserved_word(register const char *str, register size_t len);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
diff --git a/defs/lex.c.src b/defs/lex.c.src
index fc30ec2d15..a1b1f4f60f 100644
--- a/defs/lex.c.src
+++ b/defs/lex.c.src
@@ -2,7 +2,7 @@
 struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
+static const struct kwtable *reserved_word(register const char *str, register size_t len);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
diff --git a/dir.c b/dir.c
index a090b9f38c..3f73f83fc5 100644
--- a/dir.c
+++ b/dir.c
@@ -77,9 +77,9 @@ char *strchr(char*,char);
 #endif
 
 #define USE_NAME_ON_FS_REAL_BASENAME 1	/* platform dependent APIs to
-					 * get real basenames */
+                                         * get real basenames */
 #define USE_NAME_ON_FS_BY_FNMATCH 2	/* select the matching
-					 * basename by fnmatch */
+                                         * basename by fnmatch */
 
 #ifdef HAVE_GETATTRLIST
 # define USE_NAME_ON_FS USE_NAME_ON_FS_REAL_BASENAME
@@ -160,12 +160,12 @@ need_normalization(DIR *dirp, const char *path)
     int ret = getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0);
 #   endif
     if (!ret) {
-	const fsobj_tag_t *tag = (void *)(attrbuf+1);
-	switch (*tag) {
-	  case VT_HFS:
-	  case VT_CIFS:
-	    return TRUE;
-	}
+        const fsobj_tag_t *tag = (void *)(attrbuf+1);
+        switch (*tag) {
+          case VT_HFS:
+          case VT_CIFS:
+            return TRUE;
+        }
     }
 # endif
     return FALSE;
@@ -175,9 +175,9 @@ static inline int
 has_nonascii(const char *ptr, size_t len)
 {
     while (len > 0) {
-	if (!ISASCII(*ptr)) return 1;
-	ptr++;
-	--len;
+        if (!ISASCII(*ptr)) return 1;
+        ptr++;
+        --len;
     }
     return 0;
 }
@@ -254,53 +254,53 @@ bracket(
 
     if (p >= pend) return NULL;
     if (*p == '!' || *p == '^') {
-	not = 1;
-	p++;
+        not = 1;
+        p++;
     }
 
     while (*p != ']') {
-	const char *t1 = p;
-	if (escape && *t1 == '\\')
-	    t1++;
-	if (!*t1)
-	    return NULL;
-	p = t1 + (r = rb_enc_mbclen(t1, pend, enc));
-	if (p >= pend) return NULL;
-	if (p[0] == '-' && p[1] != ']') {
-	    const char *t2 = p + 1;
-	    int r2;
-	    if (escape && *t2 == '\\')
-		t2++;
-	    if (!*t2)
-		return NULL;
-	    p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
-	    if (ok) continue;
-	    if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
-		(r2 <= (send-s) && memcmp(t2, s, r2) == 0)) {
-		ok = 1;
-		continue;
-	    }
-	    c1 = rb_enc_codepoint(s, send, enc);
-	    if (nocase) c1 = rb_enc_toupper(c1, enc);
-	    c2 = rb_enc_codepoint(t1, pend, enc);
-	    if (nocase) c2 = rb_enc_toupper(c2, enc);
-	    if (c1 < c2) continue;
-	    c2 = rb_enc_codepoint(t2, pend, enc);
-	    if (nocase) c2 = rb_enc_toupper(c2, enc);
-	    if (c1 > c2) continue;
-	}
-	else {
-	    if (ok) continue;
-	    if (r <= (send-s) && memcmp(t1, s, r) == 0) {
-		ok = 1;
-		continue;
-	    }
-	    if (!nocase) continue;
-	    c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc);
-	    c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc);
-	    if (c1 != c2) continue;
-	}
-	ok = 1;
+        const char *t1 = p;
+        if (escape && *t1 == '\\')
+            t1++;
+        if (!*t1)
+            return NULL;
+        p = t1 + (r = rb_enc_mbclen(t1, pend, enc));
+        if (p >= pend) return NULL;
+        if (p[0] == '-' && p[1] != ']') {
+            const char *t2 = p + 1;
+            int r2;
+            if (escape && *t2 == '\\')
+                t2++;
+            if (!*t2)
+                return NULL;
+            p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
+            if (ok) continue;
+            if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
+                (r2 <= (send-s) && memcmp(t2, s, r2) == 0)) {
+                ok = 1;
+                continue;
+            }
+            c1 = rb_enc_codepoint(s, send, enc);
+            if (nocase) c1 = rb_enc_toupper(c1, enc);
+            c2 = rb_enc_codepoint(t1, pend, enc);
+            if (nocase) c2 = rb_enc_toupper(c2, enc);
+            if (c1 < c2) continue;
+            c2 = rb_enc_codepoint(t2, pend, enc);
+            if (nocase) c2 = rb_enc_toupper(c2, enc);
+            if (c1 > c2) continue;
+        }
+        else {
+            if (ok) continue;
+            if (r <= (send-s) && memcmp(t1, s, r) == 0) {
+                ok = 1;
+                continue;
+            }
+            if (!nocase) continue;
+            c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc);
+            c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc);
+            if (c1 != c2) continue;
+        }
+        ok = 1;
     }
 
     return ok == not ? NULL : (char *)p + 1;
@@ -338,72 +338,72 @@ fnmatch_helper(
     int r;
 
     if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
-	RETURN(FNM_NOMATCH);
+        RETURN(FNM_NOMATCH);
 
     while (1) {
-	switch (*p) {
-	  case '*':
-	    do { p++; } while (*p == '*');
-	    if (ISEND(UNESCAPE(p))) {
-		p = UNESCAPE(p);
-		RETURN(0);
-	    }
-	    if (ISEND(s))
-		RETURN(FNM_NOMATCH);
-	    ptmp = p;
-	    stmp = s;
-	    continue;
-
-	  case '?':
-	    if (ISEND(s))
-		RETURN(FNM_NOMATCH);
-	    p++;
-	    Inc(s, send, enc);
-	    continue;
-
-	  case '[': {
-	    const char *t;
-	    if (ISEND(s))
-		RETURN(FNM_NOMATCH);
-	    if ((t = bracket(p + 1, pend, s, send, flags, enc)) != 0) {
-		p = t;
-		Inc(s, send, enc);
-		continue;
-	    }
-	    goto failed;
-	  }
-	}
-
-	/* ordinary */
-	p = UNESCAPE(p);
-	if (ISEND(s))
-	    RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
-	if (ISEND(p))
-	    goto failed;
-	r = rb_enc_precise_mbclen(p, pend, enc);
-	if (!MBCLEN_CHARFOUND_P(r))
-	    goto failed;
-	if (r <= (send-s) && memcmp(p, s, r) == 0) {
-	    p += r;
-	    s += r;
-	    continue;
-	}
-	if (!nocase) goto failed;
-	if (rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc) !=
-	    rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc))
-	    goto failed;
-	p += r;
-	Inc(s, send, enc);
-	continue;
+        switch (*p) {
+          case '*':
+            do { p++; } while (*p == '*');
+            if (ISEND(UNESCAPE(p))) {
+                p = UNESCAPE(p);
+                RETURN(0);
+            }
+            if (ISEND(s))
+                RETURN(FNM_NOMATCH);
+            ptmp = p;
+            stmp = s;
+            continue;
+
+          case '?':
+            if (ISEND(s))
+                RETURN(FNM_NOMATCH);
+            p++;
+            Inc(s, send, enc);
+            continue;
+
+          case '[': {
+            const char *t;
+            if (ISEND(s))
+                RETURN(FNM_NOMATCH);
+            if ((t = bracket(p + 1, pend, s, send, flags, enc)) != 0) {
+                p = t;
+                Inc(s, send, enc);
+                continue;
+            }
+            goto failed;
+          }
+        }
+
+        /* ordinary */
+        p = UNESCAPE(p);
+        if (ISEND(s))
+            RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
+        if (ISEND(p))
+            goto failed;
+        r = rb_enc_precise_mbclen(p, pend, enc);
+        if (!MBCLEN_CHARFOUND_P(r))
+            goto failed;
+        if (r <= (send-s) && memcmp(p, s, r) == 0) {
+            p += r;
+            s += r;
+            continue;
+        }
+        if (!nocase) goto failed;
+        if (rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc) !=
+            rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc))
+            goto failed;
+        p += r;
+        Inc(s, send, enc);
+        continue;
 
       failed: /* try next '*' position */
-	if (ptmp && stmp) {
-	    p = ptmp;
-	    Inc(stmp, send, enc); /* !ISEND(*stmp) */
-	    s = stmp;
-	    continue;
-	}
-	RETURN(FNM_NOMATCH);
+        if (ptmp && stmp) {
+            p = ptmp;
+            Inc(stmp, send, enc); /* !ISEND(*stmp) */
+            s = stmp;
+            continue;
+        }
+        RETURN(FNM_NOMATCH);
     }
 }
 
@@ -424,37 +424,37 @@ fnmatch(
     const char *stmp = 0;
 
     if (pathname) {
-	while (1) {
-	    if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
-		do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
-		ptmp = p;
-		stmp = s;
-	    }
-	    if (fnmatch_helper(&p, &s, flags, enc) == 0) {
-		while (*s && *s != '/') Inc(s, send, enc);
-		if (*p && *s) {
-		    p++;
-		    s++;
-		    continue;
-		}
-		if (!*p && !*s)
-		    return 0;
-	    }
-	    /* failed : try next recursion */
-	    if (ptmp && stmp && !(period && *stmp == '.')) {
-		while (*stmp && *stmp != '/') Inc(stmp, send, enc);
-		if (*stmp) {
-		    p = ptmp;
-		    stmp++;
-		    s = stmp;
-		    continue;
-		}
-	    }
-	    return FNM_NOMATCH;
-	}
+        while (1) {
+            if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
+                do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
+                ptmp = p;
+                stmp = s;
+            }
+            if (fnmatch_helper(&p, &s, flags, enc) == 0) {
+                while (*s && *s != '/') Inc(s, send, enc);
+                if (*p && *s) {
+                    p++;
+                    s++;
+                    continue;
+                }
+                if (!*p && !*s)
+                    return 0;
+            }
+            /* failed : try next recursion */
+            if (ptmp && stmp && !(period && *stmp == '.')) {
+                while (*stmp && *stmp != '/') Inc(stmp, send, enc);
+                if (*stmp) {
+                    p = ptmp;
+                    stmp++;
+                    s = stmp;
+                    continue;
+                }
+            }
+            return FNM_NOMATCH;
+        }
     }
     else
-	return fnmatch_helper(&p, &s, flags, enc);
+        return fnmatch_helper(&p, &s, flags, enc);
 }
 
 VALUE rb_cDir;
@@ -520,14 +520,14 @@ static DIR *
 opendir_without_gvl(const char *path)
 {
     if (vm_initialized) {
-	union { const void *in; void *out; } u;
+        union { const void *in; void *out; } u;
 
-	u.in = path;
+        u.in = path;
 
-	return rb_thread_call_without_gvl(nogvl_opendir, u.out, RUBY_UBF_IO, 0);
+        return rb_thread_call_without_gvl(nogvl_opendir, u.out, RUBY_UBF_IO, 0);
     }
     else
-	return opendir(path);
+        return opendir(path);
 }
 
 static VALUE
@@ -551,23 +551,23 @@ dir_initialize(rb_execution_context_t *ec, VALUE dir, VALUE dirname, VALUE enc)
     path = RSTRING_PTR(dirname);
     dp->dir = opendir_without_gvl(path);
     if (dp->dir == NULL) {
-	int e = errno;
-	if (rb_gc_for_fd(e)) {
-	    dp->dir = opendir_without_gvl(path);
-	}
+        int e = errno;
+        if (rb_gc_for_fd(e)) {
+            dp->dir = opendir_without_gvl(path);
+        }
 #ifdef HAVE_GETATTRLIST
-	else if (e == EIO) {
-	    u_int32_t attrbuf[1];
-	    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0};
-	    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) {
-		dp->dir = opendir_without_gvl(path);
-	    }
-	}
-#endif
-	if (dp->dir == NULL) {
-	    RB_GC_GUARD(dirname);
-	    rb_syserr_fail_path(e, orig);
-	}
+        else if (e == EIO) {
+            u_int32_t attrbuf[1];
+            struct attrlist al = {ATTR_BIT_MAP_COUNT, 0};
+            if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) {
+                dp->dir = opendir_without_gvl(path);
+            }
+        }
+#endif
+        if (dp->dir == NULL) {
+            RB_GC_GUARD(dirname);
+            rb_syserr_fail_path(e, orig);
+        }
     }
     RB_OBJ_WRITE(dir, &dp->path, orig);
 
@@ -630,12 +630,12 @@ dir_inspect(VALUE dir)
 
     TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
     if (!NIL_P(dirp->path)) {
-	VALUE str = rb_str_new_cstr("#<");
-	rb_str_append(str, rb_class_name(CLASS_OF(dir)));
-	rb_str_cat2(str, ":");
-	rb_str_append(str, dirp->path);
-	rb_str_cat2(str, ">");
-	return str;
+        VALUE str = rb_str_new_cstr("#<");
+        rb_str_append(str, rb_class_name(CLASS_OF(dir)));
+        rb_str_cat2(str, ":");
+        rb_str_append(str, dirp->path);
+        rb_str_cat2(str, ">");
+        return str;
     }
     return rb_funcallv(dir, idTo_s, 0, 0);
 }
@@ -677,7 +677,7 @@ dir_fileno(VALUE dir)
     GetDIR(dir, dirp);
     fd = dirfd(dirp->dir);
     if (fd == -1)
-	rb_sys_fail("dirfd");
+        rb_sys_fail("dirfd");
     return INT2NUM(fd);
 }
 #else
@@ -709,12 +709,12 @@ static int
 fundamental_encoding_p(rb_encoding *enc)
 {
     switch (rb_enc_to_index(enc)) {
-      case ENCINDEX_ASCII:
+      case ENCINDEX_ASCII_8BIT:
       case ENCINDEX_US_ASCII:
       case ENCINDEX_UTF_8:
-	return TRUE;
+        return TRUE;
       default:
-	return FALSE;
+        return FALSE;
     }
 }
 # define READDIR(dir, enc) rb_w32_readdir((dir), (enc))
@@ -731,11 +731,11 @@ to_be_skipped(const struct dirent *dp)
 #ifdef HAVE_DIRENT_NAMLEN
     switch (NAMLEN(dp)) {
       case 2:
-	if (name[1] != '.') return FALSE;
+        if (name[1] != '.') return FALSE;
       case 1:
-	return TRUE;
+        return TRUE;
       default:
-	break;
+        break;
     }
 #else
     if (!name[1]) return TRUE;
@@ -766,12 +766,12 @@ dir_read(VALUE dir)
     GetDIR(dir, dirp);
     errno = 0;
     if ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
-	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
+        return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
     else {
-	int e = errno;
-	if (e != 0) rb_syserr_fail(e, 0);
-	return Qnil;		/* end of stream */
+        int e = errno;
+        if (e != 0) rb_syserr_fail(e, 0);
+        return Qnil;		/* end of stream */
     }
 }
 
@@ -821,23 +821,23 @@ dir_each_entry(VALUE dir, VALUE (*each)(VALUE, VALUE), VALUE arg, int children_o
     rewinddir(dirp->dir);
     IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp->dir, RSTRING_PTR(dirp->path)));
     while ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
-	const char *name = dp->d_name;
-	size_t namlen = NAMLEN(dp);
-	VALUE path;
-
-	if (children_only && name[0] == '.') {
-	    if (namlen == 1) continue; /* current directory */
-	    if (namlen == 2 && name[1] == '.') continue; /* parent directory */
-	}
+        const char *name = dp->d_name;
+        size_t namlen = NAMLEN(dp);
+        VALUE path;
+
+        if (children_only && name[0] == '.') {
+            if (namlen == 1) continue; /* current directory */
+            if (namlen == 2 && name[1] == '.') continue; /* parent directory */
+        }
 #if NORMALIZE_UTF8PATH
-	if (norm_p && has_nonascii(name, namlen) &&
-	    !NIL_P(path = rb_str_normalize_ospath(name, namlen))) {
-	    path = rb_external_str_with_enc(path, dirp->enc);
-	}
-	else
+        if (norm_p && has_nonascii(name, namlen) &&
+            !NIL_P(path = rb_str_normalize_ospath(name, namlen))) {
+            path = rb_external_str_with_enc(path, dirp->enc);
+        }
+        else
 #endif
-	path = rb_external_str_new_with_enc(name, namlen, dirp->enc);
-	(*each)(arg, path);
+        path = rb_external_str_new_with_enc(name, namlen, dirp->enc);
+        (*each)(arg, path);
     }
     return dir;
 }
@@ -978,7 +978,7 @@ static void
 dir_chdir(VALUE path)
 {
     if (chdir(RSTRING_PTR(path)) < 0)
-	rb_sys_fail_path(path);
+        rb_sys_fail_path(path);
 }
 
 static int chdir_blocking = 0;
@@ -997,7 +997,7 @@ chdir_yield(VALUE v)
     args->done = TRUE;
     chdir_blocking++;
     if (NIL_P(chdir_thread))
-	chdir_thread = rb_thread_current();
+        chdir_thread = rb_thread_current();
     return rb_yield(args->new_path);
 }
 
@@ -1006,10 +1006,10 @@ chdir_restore(VALUE v)
 {
     struct chdir_data *args = (void *)v;
     if (args->done) {
-	chdir_blocking--;
-	if (chdir_blocking == 0)
-	    chdir_thread = Qnil;
-	dir_chdir(args->old_path);
+        chdir_blocking--;
+        if (chdir_blocking == 0)
+            chdir_thread = Qnil;
+        dir_chdir(args->old_path);
     }
     return Qnil;
 }
@@ -1063,35 +1063,35 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
         path = rb_str_encode_ospath(rb_get_path(argv[0]));
     }
     else {
-	const char *dist = getenv("HOME");
-	if (!dist) {
-	    dist = getenv("LOGDIR");
-	    if (!dist) rb_raise(rb_eArgError, "HOME/LOGDIR not set");
-	}
-	path = rb_str_new2(dist);
+        const char *dist = getenv("HOME");
+        if (!dist) {
+            dist = getenv("LOGDIR");
+            if (!dist) rb_raise(rb_eArgError, "HOME/LOGDIR not set");
+        }
+        path = rb_str_new2(dist);
     }
 
     if (chdir_blocking > 0) {
-	if (rb_thread_current() != chdir_thread)
+        if (rb_thread_current() != chdir_thread)
             rb_raise(rb_eRuntimeError, "conflicting chdir during another chdir block");
         if (!rb_block_given_p())
             rb_warn("conflicting chdir during another chdir block");
     }
 
     if (rb_block_given_p()) {
-	struct chdir_data args;
+        struct chdir_data args;
 
-	args.old_path = rb_str_encode_ospath(rb_dir_getwd());
-	args.new_path = path;
-	args.done = FALSE;
-	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
+        args.old_path = rb_str_encode_ospath(rb_dir_getwd());
+        args.new_path = path;
+        args.done = FALSE;
+        return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
     }
     else {
-	char *p = RSTRING_PTR(path);
-	int r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_chdir, p,
-							RUBY_UBF_IO, 0);
-	if (r < 0)
-	    rb_sys_fail_path(path);
+        char *p = RSTRING_PTR(path);
+        int r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_chdir, p,
+                                                        RUBY_UBF_IO, 0);
+        if (r < 0)
+            rb_sys_fail_path(path);
     }
 
     return INT2FIX(0);
@@ -1131,12 +1131,12 @@ rb_dir_getwd(void)
 
     switch (fsenc) {
       case ENCINDEX_US_ASCII:
-	fsenc = ENCINDEX_ASCII;
-      case ENCINDEX_ASCII:
-	break;
+        fsenc = ENCINDEX_ASCII_8BIT;
+      case ENCINDEX_ASCII_8BIT:
+        break;
 #if defined _WIN32 || defined __APPLE__
       default:
-	return rb_str_conv_enc(cwd, NULL, fs);
+        return rb_str_conv_enc(cwd, NULL, fs);
 #endif
     }
     return rb_enc_associate_index(cwd, fsenc);
@@ -1174,8 +1174,8 @@ check_dirname(VALUE dir)
     pend = path + len;
     pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc);
     if (pend - path < len) {
-	d = rb_str_subseq(d, 0, pend - path);
-	StringValueCStr(d);
+        d = rb_str_subseq(d, 0, pend - path);
+        StringValueCStr(d);
     }
     return rb_str_encode_ospath(d);
 }
@@ -1195,7 +1195,7 @@ dir_s_chroot(VALUE dir, VALUE path)
 {
     path = check_dirname(path);
     if (chroot(RSTRING_PTR(path)) == -1)
-	rb_sys_fail_path(path);
+        rb_sys_fail_path(path);
 
     return INT2FIX(0);
 }
@@ -1238,17 +1238,17 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
     int r;
 
     if (rb_scan_args(argc, argv, "11", &path, &vmode) == 2) {
-	m.mode = NUM2MODET(vmode);
+        m.mode = NUM2MODET(vmode);
     }
     else {
-	m.mode = 0777;
+        m.mode = 0777;
     }
 
     path = check_dirname(path);
     m.path = RSTRING_PTR(path);
     r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_mkdir, &m, RUBY_UBF_IO, 0);
     if (r < 0)
-	rb_sys_fail_path(path);
+        rb_sys_fail_path(path);
 
     return INT2FIX(0);
 }
@@ -1280,7 +1280,7 @@ dir_s_rmdir(VALUE obj, VALUE dir)
     p = RSTRING_PTR(dir);
     r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_rmdir, (void *)p, RUBY_UBF_IO, 0);
     if (r < 0)
-	rb_sys_fail_path(dir);
+        rb_sys_fail_path(dir);
 
     return INT2FIX(0);
 }
@@ -1386,8 +1386,8 @@ at_subpath(int fd, size_t baselen, const char *path)
 {
 #if USE_OPENDIR_AT
     if (fd != (int)AT_FDCWD && baselen > 0) {
-	path += baselen;
-	if (*path == '/') ++path;
+        path += baselen;
+        if (*path == '/') ++path;
     }
 #endif
     return *path ? path : ".";
@@ -1403,7 +1403,7 @@ do_stat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, r
     int ret = STAT(path, pst);
 #endif
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path, enc);
+        sys_warning(path, enc);
 
     return ret;
 }
@@ -1418,7 +1418,7 @@ do_lstat(int fd, size_t baselen, const char *path, struct stat *pst, int flags,
     int ret = lstat(path, pst);
 #endif
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path, enc);
+        sys_warning(path, enc);
 
     return ret;
 }
@@ -1443,9 +1443,9 @@ static int
 gc_for_fd_with_gvl(int e)
 {
     if (vm_initialized)
-	return (int)(VALUE)rb_thread_call_with_gvl(with_gvl_gc_for_fd, &e);
+        return (int)(VALUE)rb_thread_call_with_gvl(with_gvl_gc_for_fd, &e);
     else
-	return RBOOL(rb_gc_for_fd(e));
+        return RBOOL(rb_gc_for_fd(e));
 }
 
 static void *
@@ -1457,32 +1457,32 @@ nogvl_opendir_at(void *ptr)
 #if USE_OPENDIR_AT
     const int opendir_flags = (O_RDONLY|O_CLOEXEC|
 #  ifdef O_DIRECTORY
-			       O_DIRECTORY|
+                               O_DIRECTORY|
 #  endif /* O_DIRECTORY */
-			       0);
+                               0);
     int fd = openat(oaa->basefd, oaa->path, opendir_flags);
 
     dirp = fd >= 0 ? fdopendir(fd) : 0;
     if (!dirp) {
-	int e = errno;
-
-	switch (gc_for_fd_with_gvl(e)) {
-	  default:
-	    if (fd < 0) fd = openat(oaa->basefd, oaa->path, opendir_flags);
-	    if (fd >= 0) dirp = fdopendir(fd);
-	    if (dirp) return dirp;
-
-	    e = errno;
-	    /* fallthrough*/
-	  case 0:
-	    if (fd >= 0) close(fd);
-	    errno = e;
-	}
+        int e = errno;
+
+        switch (gc_for_fd_with_gvl(e)) {
+          default:
+            if (fd < 0) fd = openat(oaa->basefd, oaa->path, opendir_flags);
+            if (fd >= 0) dirp = fdopendir(fd);
+            if (dirp) return dirp;
+
+            e = errno;
+            /* fallthrough*/
+          case 0:
+            if (fd >= 0) close(fd);
+            errno = e;
+        }
     }
 #else  /* !USE_OPENDIR_AT */
     dirp = opendir(oaa->path);
     if (!dirp && gc_for_fd_with_gvl(errno))
-	dirp = opendir(oaa->path);
+        dirp = opendir(oaa->path);
 #endif /* !USE_OPENDIR_AT */
 
     return dirp;
@@ -1497,37 +1497,37 @@ opendir_at(int basefd, const char *path)
     oaa.path = path;
 
     if (vm_initialized)
-	return rb_thread_call_without_gvl(nogvl_opendir_at, &oaa, RUBY_UBF_IO, 0);
+        return rb_thread_call_without_gvl(nogvl_opendir_at, &oaa, RUBY_UBF_IO, 0);
     else
-	return nogvl_opendir_at(&oaa);
+        return nogvl_opendir_at(&oaa);
 }
 
 static DIR *
 do_opendir(const int basefd, size_t baselen, const char *path, int flags, rb_encoding *enc,
-	   ruby_glob_errfunc *errfunc, VALUE arg, int *status)
+           ruby_glob_errfunc *errfunc, VALUE arg, int *status)
 {
     DIR *dirp;
 #ifdef _WIN32
     VALUE tmp = 0;
     if (!fundamental_encoding_p(enc)) {
-	tmp = rb_enc_str_new(path, strlen(path), enc);
-	tmp = rb_str_encode_ospath(tmp);
-	path = RSTRING_PTR(tmp);
+        tmp = rb_enc_str_new(path, strlen(path), enc);
+        tmp = rb_str_encode_ospath(tmp);
+        path = RSTRING_PTR(tmp);
     }
 #endif
     dirp = opendir_at(basefd, at_subpath(basefd, baselen, path));
     if (!dirp) {
-	int e = errno;
-
-	*status = 0;
-	if (!to_be_ignored(e)) {
-	    if (errfunc) {
-		*status = (*errfunc)(path, arg, enc, e);
-	    }
-	    else {
-		sys_warning(path, enc);
-	    }
-	}
+        int e = errno;
+
+        *status = 0;
+        if (!to_be_ignored(e)) {
+            if (errfunc) {
+                *status = (*errfunc)(path, arg, enc, e);
+            }
+            else {
+                sys_warning(path, enc);
+            }
+        }
     }
 #ifdef _WIN32
     if (tmp) rb_str_resize(tmp, 0); /* GC guard */
@@ -1550,37 +1550,37 @@ has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
     register char c;
 
     while (p < pend && (c = *p++) != 0) {
-	switch (c) {
-	  case '{':
-	    return BRACE;
+        switch (c) {
+          case '{':
+            return BRACE;
 
-	  case '*':
-	  case '?':
-	  case '[':
-	    hasmagical = 1;
-	    break;
+          case '*':
+          case '?':
+          case '[':
+            hasmagical = 1;
+            break;
 
-	  case '\\':
-	    if (escape && p++ >= pend)
-		continue;
-	    break;
+          case '\\':
+            if (escape && p++ >= pend)
+                continue;
+            break;
 
 #ifdef _WIN32
-	  case '.':
-	    break;
+          case '.':
+            break;
 
-	  case '~':
-	    hasalpha = 1;
-	    break;
+          case '~':
+            hasalpha = 1;
+            break;
 #endif
-	  default:
-	    if (IS_WIN32 || ISALPHA(c)) {
-		hasalpha = 1;
-	    }
-	    break;
-	}
+          default:
+            if (IS_WIN32 || ISALPHA(c)) {
+                hasalpha = 1;
+            }
+            break;
+        }
 
-	p = Next(p-1, pend, enc);
+        p = Next(p-1, pend, enc);
     }
 
     return hasmagical ? MAGICAL : hasalpha ? ALPHA : PLAIN;
@@ -1596,33 +1596,33 @@ find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
     int open = 0;
 
     while ((c = *p++) != 0) {
-	switch (c) {
-	  case '[':
-	    open = 1;
-	    continue;
-	  case ']':
-	    open = 0;
-	    continue;
-
-	  case '{':
-	    open = 1;
-	    continue;
-	  case '}':
-	    open = 0;
-	    continue;
-
-	  case '/':
-	    if (!open)
-		return (char *)p-1;
-	    continue;
-
-	  case '\\':
-	    if (escape && !(c = *p++))
-		return (char *)p-1;
-	    continue;
-	}
-
-	p = Next(p-1, pend, enc);
+        switch (c) {
+          case '[':
+            open = 1;
+            continue;
+          case ']':
+            open = 0;
+            continue;
+
+          case '{':
+            open = 1;
+            continue;
+          case '}':
+            open = 0;
+            continue;
+
+          case '/':
+            if (!open)
+                return (char *)p-1;
+            continue;
+
+          case '\\':
+            if (escape && !(c = *p++))
+                return (char *)p-1;
+            continue;
+        }
+
+        p = Next(p-1, pend, enc);
     }
 
     return (char *)p-1;
@@ -1636,20 +1636,20 @@ remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
     char *s = p;
 
     while (*p) {
-	if (*p == '\\') {
-	    if (t != s)
-		memmove(t, s, p - s);
-	    t += p - s;
-	    s = ++p;
-	    if (!*p) break;
-	}
-	Inc(p, pend, enc);
+        if (*p == '\\') {
+            if (t != s)
+                memmove(t, s, p - s);
+            t += p - s;
+            s = ++p;
+            if (!*p) break;
+        }
+        Inc(p, pend, enc);
     }
 
     while (*p++);
 
     if (t != s)
-	memmove(t, s, p - s); /* move '\0' too */
+        memmove(t, s, p - s); /* move '\0' too */
 
     return p;
 }
@@ -1670,49 +1670,49 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
     int recursive = 0;
 
     while (p < e && *p) {
-	tmp = GLOB_ALLOC(struct glob_pattern);
-	if (!tmp) goto error;
-	if (p + 2 < e && p[0] == '*' && p[1] == '*' && p[2] == '/') {
-	    /* fold continuous RECURSIVEs (needed in glob_helper) */
-	    do { p += 3; while (*p == '/') p++; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
-	    tmp->type = RECURSIVE;
-	    tmp->str = 0;
-	    dirsep = 1;
-	    recursive = 1;
-	}
-	else {
-	    const char *m = find_dirsep(p, e, flags, enc);
-	    const enum glob_pattern_type magic = has_magic(p, m, flags, enc);
-	    const enum glob_pattern_type non_magic = (USE_NAME_ON_FS || FNM_SYSCASE) ? PLAIN : ALPHA;
-	    char *buf;
-
-	    if (!(FNM_SYSCASE || magic > non_magic) && !recursive && *m) {
-		const char *m2;
-		while (has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) <= non_magic &&
-		       *m2) {
-		    m = m2;
-		}
-	    }
-	    buf = GLOB_ALLOC_N(char, m-p+1);
-	    if (!buf) {
-		GLOB_FREE(tmp);
-		goto error;
-	    }
-	    memcpy(buf, p, m-p);
-	    buf[m-p] = '\0';
-	    tmp->type = magic > MAGICAL ? MAGICAL : magic > non_magic ? magic : PLAIN;
-	    tmp->str = buf;
-	    if (*m) {
-		dirsep = 1;
-		p = m + 1;
-	    }
-	    else {
-		dirsep = 0;
-		p = m;
-	    }
-	}
-	*tail = tmp;
-	tail = &tmp->next;
+        tmp = GLOB_ALLOC(struct glob_pattern);
+        if (!tmp) goto error;
+        if (p + 2 < e && p[0] == '*' && p[1] == '*' && p[2] == '/') {
+            /* fold continuous RECURSIVEs (needed in glob_helper) */
+            do { p += 3; while (*p == '/') p++; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
+            tmp->type = RECURSIVE;
+            tmp->str = 0;
+            dirsep = 1;
+            recursive = 1;
+        }
+        else {
+            const char *m = find_dirsep(p, e, flags, enc);
+            const enum glob_pattern_type magic = has_magic(p, m, flags, enc);
+            const enum glob_pattern_type non_magic = (USE_NAME_ON_FS || FNM_SYSCASE) ? PLAIN : ALPHA;
+            char *buf;
+
+            if (!(FNM_SYSCASE || magic > non_magic) && !recursive && *m) {
+                const char *m2;
+                while (has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) <= non_magic &&
+                       *m2) {
+                    m = m2;
+                }
+            }
+            buf = GLOB_ALLOC_N(char, m-p+1);
+            if (!buf) {
+                GLOB_FREE(tmp);
+                goto error;
+            }
+            memcpy(buf, p, m-p);
+            buf[m-p] = '\0';
+            tmp->type = magic > MAGICAL ? MAGICAL : magic > non_magic ? magic : PLAIN;
+            tmp->str = buf;
+            if (*m) {
+                dirsep = 1;
+                p = m + 1;
+            }
+            else {
+                dirsep = 0;
+                p = m;
+            }
+        }
+        *tail = tmp;
+        tail = &tmp->next;
     }
 
     tmp = GLOB_ALLOC(struct glob_pattern);
@@ -1736,11 +1736,11 @@ static void
 glob_free_pattern(struct glob_pattern *list)
 {
     while (list) {
-	struct glob_pattern *tmp = list;
-	list = list->next;
-	if (tmp->str)
-	    GLOB_FREE(tmp->str);
-	GLOB_FREE(tmp);
+        struct glob_pattern *tmp = list;
+        list = list->next;
+        if (tmp->str)
+            GLOB_FREE(tmp->str);
+        GLOB_FREE(tmp);
     }
 }
 
@@ -1752,7 +1752,7 @@ join_path(const char *path, size_t len, int dirsep, const char *name, size_t nam
     if (!buf) return 0;
     memcpy(buf, path, len);
     if (dirsep) {
-	buf[len++] = '/';
+        buf[len++] = '/';
     }
     memcpy(buf+len, name, namlen);
     buf[len+namlen] = '\0';
@@ -1769,8 +1769,8 @@ static int
 is_case_sensitive(DIR *dirp, const char *path)
 {
     struct {
-	u_int32_t length;
-	vol_capabilities_attr_t cap[1];
+        u_int32_t length;
+        vol_capabilities_attr_t cap[1];
     } __attribute__((aligned(4), packed)) attrbuf[1];
     struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, 0, ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES};
     const vol_capabilities_attr_t *const cap = attrbuf[0].cap;
@@ -1779,13 +1779,13 @@ is_case_sensitive(DIR *dirp, const char *path)
 
 #   if defined HAVE_FGETATTRLIST
     if (fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
-	return -1;
+        return -1;
 #   else
     if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
-	return -1;
+        return -1;
 #   endif
     if (!(cap->valid[idx] & mask))
-	return -1;
+        return -1;
     return (cap->capabilities[idx] & mask) != 0;
 }
 
@@ -1793,10 +1793,10 @@ static char *
 replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int flags, rb_pathtype_t *type)
 {
     struct {
-	u_int32_t length;
-	attrreference_t ref[1];
-	fsobj_type_t objtype;
-	char path[MAXPATHLEN * 3];
+        u_int32_t length;
+        attrreference_t ref[1];
+        fsobj_type_t objtype;
+        char path[MAXPATHLEN * 3];
     } __attribute__((aligned(4), packed)) attrbuf[1];
     struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_NAME|ATTR_CMN_OBJTYPE};
     const attrreference_t *const ar = attrbuf[0].ref;
@@ -1807,9 +1807,9 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
 
     *type = path_noent;
     if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) {
-	if (!to_be_ignored(errno))
-	    sys_warning(path, enc);
-	return path;
+        if (!to_be_ignored(errno))
+            sys_warning(path, enc);
+        return path;
     }
 
     switch (attrbuf[0].objtype) {
@@ -1821,21 +1821,21 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
     name = (char *)ar + ar->attr_dataoffset;
     len = (long)ar->attr_length - 1;
     if (name + len > (char *)attrbuf + sizeof(attrbuf))
-	return path;
+        return path;
 
 # if NORMALIZE_UTF8PATH
     if (norm_p && has_nonascii(name, len)) {
-	if (!NIL_P(utf8str = rb_str_normalize_ospath(name, len))) {
-	    RSTRING_GETMEM(utf8str, name, len);
-	}
+        if (!NIL_P(utf8str = rb_str_normalize_ospath(name, len))) {
+            RSTRING_GETMEM(utf8str, name, len);
+        }
     }
 # endif
 
     tmp = GLOB_REALLOC(path, base + len + 1);
     if (tmp) {
-	path = tmp;
-	memcpy(path + base, name, len);
-	path[base + len] = '\0';
+        path = tmp;
+        memcpy(path + base, name, len);
+        path[base + len] = '\0';
     }
     IF_NORMALIZE_UTF8PATH(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
     return path;
@@ -1856,62 +1856,62 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
     long wlen;
     int e = 0;
     if (!fundamental_encoding_p(enc)) {
-	tmp = rb_enc_str_new_cstr(plainname, enc);
-	tmp = rb_str_encode_ospath(tmp);
-	plainname = RSTRING_PTR(tmp);
+        tmp = rb_enc_str_new_cstr(plainname, enc);
+        tmp = rb_str_encode_ospath(tmp);
+        plainname = RSTRING_PTR(tmp);
     }
     wplain = rb_w32_mbstr_to_wstr(CP_UTF8, plainname, -1, &wlen);
     if (tmp) rb_str_resize(tmp, 0);
     if (!wplain) return path;
     if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa)) {
-	h = FindFirstFileW(wplain, &fd);
-	e = rb_w32_map_errno(GetLastError());
+        h = FindFirstFileW(wplain, &fd);
+        e = rb_w32_map_errno(GetLastError());
     }
     if (fa.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-	if (!rb_w32_reparse_symlink_p(wplain))
-	    fa.dwFileAttributes &= ~FILE_ATTRIBUTE_REPARSE_POINT;
+        if (!rb_w32_reparse_symlink_p(wplain))
+            fa.dwFileAttributes &= ~FILE_ATTRIBUTE_REPARSE_POINT;
     }
     free(wplain);
     if (h == INVALID_HANDLE_VALUE) {
-	*type = path_noent;
-	if (e && !to_be_ignored(e)) {
-	    errno = e;
-	    sys_warning(path, enc);
-	}
-	return path;
+        *type = path_noent;
+        if (e && !to_be_ignored(e)) {
+            errno = e;
+            sys_warning(path, enc);
+        }
+        return path;
     }
     FindClose(h);
     *type =
-	(fa.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ? path_symlink :
-	(fa.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? path_directory :
-	path_regular;
+        (fa.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ? path_symlink :
+        (fa.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? path_directory :
+        path_regular;
     if (tmp) {
-	char *buf;
-	tmp = rb_w32_conv_from_wchar(fd.cFileName, enc);
-	wlen = RSTRING_LEN(tmp);
-	buf = GLOB_REALLOC(path, base + wlen + 1);
-	if (buf) {
-	    path = buf;
-	    memcpy(path + base, RSTRING_PTR(tmp), wlen);
-	    path[base + wlen] = 0;
-	}
-	rb_str_resize(tmp, 0);
+        char *buf;
+        tmp = rb_w32_conv_from_wchar(fd.cFileName, enc);
+        wlen = RSTRING_LEN(tmp);
+        buf = GLOB_REALLOC(path, base + wlen + 1);
+        if (buf) {
+            path = buf;
+            memcpy(path + base, RSTRING_PTR(tmp), wlen);
+            path[base + wlen] = 0;
+        }
+        rb_str_resize(tmp, 0);
     }
     else {
-	char *utf8filename;
-	wlen = WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, NULL, 0, NULL, NULL);
-	utf8filename = GLOB_REALLOC(0, wlen);
-	if (utf8filename) {
-	    char *buf;
-	    WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, utf8filename, wlen, NULL, NULL);
-	    buf = GLOB_REALLOC(path, base + wlen + 1);
-	    if (buf) {
-		path = buf;
-		memcpy(path + base, utf8filename, wlen);
-		path[base + wlen] = 0;
-	    }
-	    GLOB_FREE(utf8filename);
-	}
+        char *utf8filename;
+        wlen = WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, NULL, 0, NULL, NULL);
+        utf8filename = GLOB_REALLOC(0, wlen);
+        if (utf8filename) {
+            char *buf;
+            WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, utf8filename, wlen, NULL, NULL);
+            buf = GLOB_REALLOC(path, base + wlen + 1);
+            if (buf) {
+                path = buf;
+                memcpy(path + base, utf8filename, wlen);
+                path[base + wlen] = 0;
+            }
+            GLOB_FREE(utf8filename);
+        }
     }
     return path;
 }
@@ -2003,7 +2003,7 @@ rb_glob_error(const char *path, VALUE a, const void *enc, int error)
 #ifdef ENOTCAPABLE
       case ENOTCAPABLE:
 #endif
-	errfunc = glob_func_warning;
+        errfunc = glob_func_warning;
     }
     args.path = path;
     args.enc = enc;
@@ -2027,7 +2027,7 @@ dirent_match(const char *pat, rb_encoding *enc, const char *name, const rb_diren
     if (fnmatch(pat, enc, name, flags) == 0) return 1;
 #ifdef _WIN32
     if (dp->d_altname && (flags & FNM_SHORTNAME)) {
-	if (fnmatch(pat, enc, dp->d_altname, flags) == 0) return 1;
+        if (fnmatch(pat, enc, dp->d_altname, flags) == 0) return 1;
     }
 #endif
     return 0;
@@ -2068,39 +2068,39 @@ join_path_from_pattern(struct glob_pattern **beg)
     size_t path_len = 0;
 
     for (p = *beg; p; p = p->next) {
-	const char *str;
-	switch (p->type) {
-	  case RECURSIVE:
-	    str = "**";
-	    break;
-	  case MATCH_DIR:
-	    /* append last slash */
-	    str = "";
-	    break;
-	  default:
-	    str = p->str;
-	    if (!str) continue;
-	}
-	if (!path) {
-	    path_len = strlen(str);
-	    path = GLOB_ALLOC_N(char, path_len + 1);
+        const char *str;
+        switch (p->type) {
+          case RECURSIVE:
+            str = "**";
+            break;
+          case MATCH_DIR:
+            /* append last slash */
+            str = "";
+            break;
+          default:
+            str = p->str;
+            if (!str) continue;
+        }
+        if (!path) {
+            path_len = strlen(str);
+            path = GLOB_ALLOC_N(char, path_len + 1);
             if (path) {
                 memcpy(path, str, path_len);
                 path[path_len] = '\0';
             }
         }
         else {
-	    size_t len = strlen(str);
-	    char *tmp;
-	    tmp = GLOB_REALLOC(path, path_len + len + 2);
-	    if (tmp) {
-		path = tmp;
-		path[path_len++] = '/';
-		memcpy(path + path_len, str, len);
-		path_len += len;
-		path[path_len] = '\0';
-	    }
-	}
+            size_t len = strlen(str);
+            char *tmp;
+            tmp = GLOB_REALLOC(path, path_len + len + 2);
+            if (tmp) {
+                path = tmp;
+                path[path_len++] = '/';
+                memcpy(path + path_len, str, len);
+                path_len += len;
+                path[path_len] = '\0';
+            }
+        }
     }
     return path;
 }
@@ -2108,7 +2108,7 @@ join_path_from_pattern(struct glob_pattern **beg)
 static int push_caller(const char *path, VALUE val, void *enc);
 
 static int ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
-			     rb_encoding *enc, VALUE var);
+                             rb_encoding *enc, VALUE var);
 
 static const size_t rb_dirent_name_offset =
     offsetof(rb_dirent_t, d_type) + sizeof(uint8_t);
@@ -2216,7 +2216,7 @@ glob_opendir(ruby_glob_entries_t *ent, DIR *dirp, int flags, rb_encoding *enc)
             ent->sort.entries = newp;
         }
 #endif
-	while ((dp = READDIR(dirp, enc)) != NULL) {
+        while ((dp = READDIR(dirp, enc)) != NULL) {
             rb_dirent_t *rdp = dirent_copy(dp, NULL);
             if (!rdp) {
                 goto nomem;
@@ -2288,133 +2288,133 @@ glob_helper(
     rb_check_stack_overflow();
 
     for (cur = beg; cur < end; ++cur) {
-	struct glob_pattern *p = *cur;
-	if (p->type == RECURSIVE) {
-	    recursive = 1;
-	    p = p->next;
-	}
-	switch (p->type) {
-	  case PLAIN:
-	    plain = 1;
-	    break;
-	  case ALPHA:
+        struct glob_pattern *p = *cur;
+        if (p->type == RECURSIVE) {
+            recursive = 1;
+            p = p->next;
+        }
+        switch (p->type) {
+          case PLAIN:
+            plain = 1;
+            break;
+          case ALPHA:
 #if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
-	    plain = 1;
+            plain = 1;
 #else
-	    magical = 1;
-#endif
-	    break;
-	  case BRACE:
-	    if (!recursive) {
-		brace = 1;
-	    }
-	    break;
-	  case MAGICAL:
-	    magical = 2;
-	    break;
-	  case MATCH_ALL:
-	    match_all = 1;
-	    break;
-	  case MATCH_DIR:
-	    match_dir = 1;
-	    break;
-	  case RECURSIVE:
-	    rb_bug("continuous RECURSIVEs");
-	}
+            magical = 1;
+#endif
+            break;
+          case BRACE:
+            if (!recursive || strchr(p->str, '/')) {
+                brace = 1;
+            }
+            break;
+          case MAGICAL:
+            magical = 2;
+            break;
+          case MATCH_ALL:
+            match_all = 1;
+            break;
+          case MATCH_DIR:
+            match_dir = 1;
+            break;
+          case RECURSIVE:
+            rb_bug("continuous RECURSIVEs");
+        }
     }
 
     if (brace) {
-	struct push_glob_args args;
-	char* brace_path = join_path_from_pattern(beg);
-	if (!brace_path) return -1;
-	args.fd = fd;
-	args.path = path;
-	args.baselen = baselen;
-	args.namelen = namelen;
-	args.dirsep = dirsep;
-	args.pathtype = pathtype;
-	args.flags = flags;
-	args.funcs = funcs;
-	args.arg = arg;
-	status = ruby_brace_expand(brace_path, flags, push_caller, (VALUE)&args, enc, Qfalse);
-	GLOB_FREE(brace_path);
-	return status;
+        struct push_glob_args args;
+        char* brace_path = join_path_from_pattern(beg);
+        if (!brace_path) return -1;
+        args.fd = fd;
+        args.path = path;
+        args.baselen = baselen;
+        args.namelen = namelen;
+        args.dirsep = dirsep;
+        args.pathtype = pathtype;
+        args.flags = flags;
+        args.funcs = funcs;
+        args.arg = arg;
+        status = ruby_brace_expand(brace_path, flags, push_caller, (VALUE)&args, enc, Qfalse);
+        GLOB_FREE(brace_path);
+        return status;
     }
 
     if (*path) {
-	if (match_all && pathtype == path_unknown) {
-	    if (do_lstat(fd, baselen, path, &st, flags, enc) == 0) {
-		pathtype = IFTODT(st.st_mode);
-	    }
-	    else {
-		pathtype = path_noent;
-	    }
-	}
-	if (match_dir && (pathtype == path_unknown || pathtype == path_symlink)) {
-	    if (do_stat(fd, baselen, path, &st, flags, enc) == 0) {
-		pathtype = IFTODT(st.st_mode);
-	    }
-	    else {
-		pathtype = path_noent;
-	    }
-	}
-	if (match_all && pathtype > path_noent) {
-	    const char *subpath = path + baselen + (baselen && path[baselen] == '/');
-	    status = glob_call_func(funcs->match, subpath, arg, enc);
-	    if (status) return status;
-	}
-	if (match_dir && pathtype == path_directory) {
-	    int seplen = (baselen && path[baselen] == '/');
-	    const char *subpath = path + baselen + seplen;
-	    char *tmp = join_path(subpath, namelen - seplen, dirsep, "", 0);
-	    if (!tmp) return -1;
-	    status = glob_call_func(funcs->match, tmp, arg, enc);
-	    GLOB_FREE(tmp);
-	    if (status) return status;
-	}
+        if (match_all && pathtype == path_unknown) {
+            if (do_lstat(fd, baselen, path, &st, flags, enc) == 0) {
+                pathtype = IFTODT(st.st_mode);
+            }
+            else {
+                pathtype = path_noent;
+            }
+        }
+        if (match_dir && (pathtype == path_unknown || pathtype == path_symlink)) {
+            if (do_stat(fd, baselen, path, &st, flags, enc) == 0) {
+                pathtype = IFTODT(st.st_mode);
+            }
+            else {
+                pathtype = path_noent;
+            }
+        }
+        if (match_all && pathtype > path_noent) {
+            const char *subpath = path + baselen + (baselen && path[baselen] == '/');
+            status = glob_call_func(funcs->match, subpath, arg, enc);
+            if (status) return status;
+        }
+        if (match_dir && pathtype == path_directory) {
+            int seplen = (baselen && path[baselen] == '/');
+            const char *subpath = path + baselen + seplen;
+            char *tmp = join_path(subpath, namelen - seplen, dirsep, "", 0);
+            if (!tmp) return -1;
+            status = glob_call_func(funcs->match, tmp, arg, enc);
+            GLOB_FREE(tmp);
+            if (status) return status;
+        }
     }
 
     if (pathtype == path_noent) return 0;
 
     if (magical || recursive) {
-	rb_dirent_t *dp;
-	DIR *dirp;
+        rb_dirent_t *dp;
+        DIR *dirp;
 # if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
-	char *plainname = 0;
+        char *plainname = 0;
 # endif
-	IF_NORMALIZE_UTF8PATH(int norm_p);
+        IF_NORMALIZE_UTF8PATH(int norm_p);
 # if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
-	if (cur + 1 == end && (*cur)->type <= ALPHA) {
-	    plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
-	    if (!plainname) return -1;
-	    dirp = do_opendir(fd, basename, plainname, flags, enc, funcs->error, arg, &status);
-	    GLOB_FREE(plainname);
-	}
-	else
+        if (cur + 1 == end && (*cur)->type <= ALPHA) {
+            plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
+            if (!plainname) return -1;
+            dirp = do_opendir(fd, basename, plainname, flags, enc, funcs->error, arg, &status);
+            GLOB_FREE(plainname);
+        }
+        else
 # else
-	    ;
+            ;
 # endif
-	dirp = do_opendir(fd, baselen, path, flags, enc, funcs->error, arg, &status);
-	if (dirp == NULL) {
+        dirp = do_opendir(fd, baselen, path, flags, enc, funcs->error, arg, &status);
+        if (dirp == NULL) {
 # if FNM_SYSCASE || NORMALIZE_UTF8PATH
-	    if ((magical < 2) && !recursive && (errno == EACCES)) {
-		/* no read permission, fallback */
-		goto literally;
-	    }
+            if ((magical < 2) && !recursive && (errno == EACCES)) {
+                /* no read permission, fallback */
+                goto literally;
+            }
 # endif
-	    return status;
-	}
-	IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : "."));
+            return status;
+        }
+        IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : "."));
 
 # if NORMALIZE_UTF8PATH
-	if (!(norm_p || magical || recursive)) {
-	    closedir(dirp);
-	    goto literally;
-	}
+        if (!(norm_p || magical || recursive)) {
+            closedir(dirp);
+            goto literally;
+        }
 # endif
 # ifdef HAVE_GETATTRLIST
-	if (is_case_sensitive(dirp, path) == 0)
-	    flags |= FNM_CASEFOLD;
+        if (is_case_sensitive(dirp, path) == 0)
+            flags |= FNM_CASEFOLD;
 # endif
         ruby_glob_entries_t globent;
         if (!glob_opendir(&globent, dirp, flags, enc)) {
@@ -2428,182 +2428,182 @@ glob_helper(
             return status;
         }
 
-	int skipdot = (flags & FNM_GLOB_SKIPDOT);
-	flags |= FNM_GLOB_SKIPDOT;
-
-	while ((dp = glob_getent(&globent, flags, enc)) != NULL) {
-	    char *buf;
-	    rb_pathtype_t new_pathtype = path_unknown;
-	    const char *name;
-	    size_t namlen;
-	    int dotfile = 0;
-	    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
-
-	    name = dp->d_name;
-	    namlen = dp->d_namlen;
-	    if (name[0] == '.') {
-		++dotfile;
-		if (namlen == 1) {
-		    /* unless DOTMATCH, skip current directories not to recurse infinitely */
-		    if (recursive && !(flags & FNM_DOTMATCH)) continue;
-		    if (skipdot) continue;
-		    ++dotfile;
-		    new_pathtype = path_directory; /* force to skip stat/lstat */
-		}
-		else if (namlen == 2 && name[1] == '.') {
-		    /* always skip parent directories not to recurse infinitely */
-		    continue;
-		}
-	    }
+        int skipdot = (flags & FNM_GLOB_SKIPDOT);
+        flags |= FNM_GLOB_SKIPDOT;
+
+        while ((dp = glob_getent(&globent, flags, enc)) != NULL) {
+            char *buf;
+            rb_pathtype_t new_pathtype = path_unknown;
+            const char *name;
+            size_t namlen;
+            int dotfile = 0;
+            IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
+
+            name = dp->d_name;
+            namlen = dp->d_namlen;
+            if (name[0] == '.') {
+                ++dotfile;
+                if (namlen == 1) {
+                    /* unless DOTMATCH, skip current directories not to recurse infinitely */
+                    if (recursive && !(flags & FNM_DOTMATCH)) continue;
+                    if (skipdot) continue;
+                    ++dotfile;
+                    new_pathtype = path_directory; /* force to skip stat/lstat */
+                }
+                else if (namlen == 2 && name[1] == '.') {
+                    /* always skip parent directories not to recurse infinitely */
+                    continue;
+                }
+            }
 
 # if NORMALIZE_UTF8PATH
-	    if (norm_p && has_nonascii(name, namlen)) {
-		if (!NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) {
-		    RSTRING_GETMEM(utf8str, name, namlen);
-		}
-	    }
+            if (norm_p && has_nonascii(name, namlen)) {
+                if (!NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) {
+                    RSTRING_GETMEM(utf8str, name, namlen);
+                }
+            }
 # endif
-	    buf = join_path(path, pathlen, dirsep, name, namlen);
-	    IF_NORMALIZE_UTF8PATH(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
-	    if (!buf) {
-		status = -1;
-		break;
-	    }
-	    name = buf + pathlen + (dirsep != 0);
+            buf = join_path(path, pathlen, dirsep, name, namlen);
+            IF_NORMALIZE_UTF8PATH(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
+            if (!buf) {
+                status = -1;
+                break;
+            }
+            name = buf + pathlen + (dirsep != 0);
 #if !EMULATE_IFTODT
-	    if (dp->d_type != DT_UNKNOWN) {
-		/* Got it. We need no more lstat. */
-		new_pathtype = dp->d_type;
-	    }
-#endif
-	    if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1) &&
-		new_pathtype == path_unknown) {
-		/* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
-		if (do_lstat(fd, baselen, buf, &st, flags, enc) == 0)
-		    new_pathtype = IFTODT(st.st_mode);
-		else
-		    new_pathtype = path_noent;
-	    }
-
-	    new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
-	    if (!new_beg) {
-		GLOB_FREE(buf);
-		status = -1;
-		break;
-	    }
-
-	    for (cur = beg; cur < end; ++cur) {
-		struct glob_pattern *p = *cur;
-		struct dirent_brace_args args;
-		if (p->type == RECURSIVE) {
-		    if (new_pathtype == path_directory || /* not symlink but real directory */
-			new_pathtype == path_exist) {
-			if (dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1))
-			    *new_end++ = p; /* append recursive pattern */
-		    }
-		    p = p->next; /* 0 times recursion */
-		}
-		switch (p->type) {
-		  case BRACE:
-		    args.name = name;
-		    args.dp = dp;
-		    args.flags = flags;
-		    if (ruby_brace_expand(p->str, flags, dirent_match_brace,
-					  (VALUE)&args, enc, Qfalse) > 0)
-			*new_end++ = p->next;
-		    break;
-		  case ALPHA:
+            if (dp->d_type != DT_UNKNOWN) {
+                /* Got it. We need no more lstat. */
+                new_pathtype = dp->d_type;
+            }
+#endif
+            if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1) &&
+                new_pathtype == path_unknown) {
+                /* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
+                if (do_lstat(fd, baselen, buf, &st, flags, enc) == 0)
+                    new_pathtype = IFTODT(st.st_mode);
+                else
+                    new_pathtype = path_noent;
+            }
+
+            new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
+            if (!new_beg) {
+                GLOB_FREE(buf);
+                status = -1;
+                break;
+            }
+
+            for (cur = beg; cur < end; ++cur) {
+                struct glob_pattern *p = *cur;
+                struct dirent_brace_args args;
+                if (p->type == RECURSIVE) {
+                    if (new_pathtype == path_directory || /* not symlink but real directory */
+                        new_pathtype == path_exist) {
+                        if (dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1))
+                            *new_end++ = p; /* append recursive pattern */
+                    }
+                    p = p->next; /* 0 times recursion */
+                }
+                switch (p->type) {
+                  case BRACE:
+                    args.name = name;
+                    args.dp = dp;
+                    args.flags = flags;
+                    if (ruby_brace_expand(p->str, flags, dirent_match_brace,
+                                          (VALUE)&args, enc, Qfalse) > 0)
+                        *new_end++ = p->next;
+                    break;
+                  case ALPHA:
 # if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
-		    if (plainname) {
-			*new_end++ = p->next;
-			break;
-		    }
+                    if (plainname) {
+                        *new_end++ = p->next;
+                        break;
+                    }
 # endif
-		  case PLAIN:
-		  case MAGICAL:
-		    if (dirent_match(p->str, enc, name, dp, flags))
-			*new_end++ = p->next;
-		  default:
-		    break;
-		}
-	    }
-
-	    status = glob_helper(fd, buf, baselen, name - buf - baselen + namlen, 1,
-				 new_pathtype, new_beg, new_end,
-				 flags, funcs, arg, enc);
-	    GLOB_FREE(buf);
-	    GLOB_FREE(new_beg);
-	    if (status) break;
-	}
+                  case PLAIN:
+                  case MAGICAL:
+                    if (dirent_match(p->str, enc, name, dp, flags))
+                        *new_end++ = p->next;
+                  default:
+                    break;
+                }
+            }
+
+            status = glob_helper(fd, buf, baselen, name - buf - baselen + namlen, 1,
+                                 new_pathtype, new_beg, new_end,
+                                 flags, funcs, arg, enc);
+            GLOB_FREE(buf);
+            GLOB_FREE(new_beg);
+            if (status) break;
+        }
 
         glob_dir_finish(&globent, flags);
     }
     else if (plain) {
-	struct glob_pattern **copy_beg, **copy_end, **cur2;
+        struct glob_pattern **copy_beg, **copy_end, **cur2;
 
 # if FNM_SYSCASE || NORMALIZE_UTF8PATH
       literally:
 # endif
-	copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
-	if (!copy_beg) return -1;
-	for (cur = beg; cur < end; ++cur)
-	    *copy_end++ = (*cur)->type <= ALPHA ? *cur : 0;
-
-	for (cur = copy_beg; cur < copy_end; ++cur) {
-	    if (*cur) {
-		rb_pathtype_t new_pathtype = path_unknown;
-		char *buf;
-		char *name;
-		size_t len = strlen((*cur)->str) + 1;
-		name = GLOB_ALLOC_N(char, len);
-		if (!name) {
-		    status = -1;
-		    break;
-		}
-		memcpy(name, (*cur)->str, len);
-		if (escape)
-		    len = remove_backslashes(name, name+len-1, enc) - name;
-
-		new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
-		if (!new_beg) {
-		    GLOB_FREE(name);
-		    status = -1;
-		    break;
-		}
-		*new_end++ = (*cur)->next;
-		for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
-		    if (*cur2 && fnmatch((*cur2)->str, enc, name, flags) == 0) {
-			*new_end++ = (*cur2)->next;
-			*cur2 = 0;
-		    }
-		}
-
-		buf = join_path(path, pathlen, dirsep, name, len);
-		GLOB_FREE(name);
-		if (!buf) {
-		    GLOB_FREE(new_beg);
-		    status = -1;
-		    break;
-		}
+        copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
+        if (!copy_beg) return -1;
+        for (cur = beg; cur < end; ++cur)
+            *copy_end++ = (*cur)->type <= ALPHA ? *cur : 0;
+
+        for (cur = copy_beg; cur < copy_end; ++cur) {
+            if (*cur) {
+                rb_pathtype_t new_pathtype = path_unknown;
+                char *buf;
+                char *name;
+                size_t len = strlen((*cur)->str) + 1;
+                name = GLOB_ALLOC_N(char, len);
+                if (!name) {
+                    status = -1;
+                    break;
+                }
+                memcpy(name, (*cur)->str, len);
+                if (escape)
+                    len = remove_backslashes(name, name+len-1, enc) - name;
+
+                new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
+                if (!new_beg) {
+                    GLOB_FREE(name);
+                    status = -1;
+                    break;
+                }
+                *new_end++ = (*cur)->next;
+                for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
+                    if (*cur2 && fnmatch((*cur2)->str, enc, name, flags) == 0) {
+                        *new_end++ = (*cur2)->next;
+                        *cur2 = 0;
+                    }
+                }
+
+                buf = join_path(path, pathlen, dirsep, name, len);
+                GLOB_FREE(name);
+                if (!buf) {
+                    GLOB_FREE(new_beg);
+                    status = -1;
+                    break;
+                }
 #if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
-		if ((*cur)->type == ALPHA) {
-		    buf = replace_real_basename(buf, pathlen + (dirsep != 0), enc,
-						IF_NORMALIZE_UTF8PATH(1)+0,
-						flags, &new_pathtype);
-		    if (!buf) break;
-		}
-#endif
-		status = glob_helper(fd, buf, baselen,
-				     namelen + strlen(buf + pathlen), 1,
-				     new_pathtype, new_beg, new_end,
-				     flags, funcs, arg, enc);
-		GLOB_FREE(buf);
-		GLOB_FREE(new_beg);
-		if (status) break;
-	    }
-	}
-
-	GLOB_FREE(copy_beg);
+                if ((*cur)->type == ALPHA) {
+                    buf = replace_real_basename(buf, pathlen + (dirsep != 0), enc,
+                                                IF_NORMALIZE_UTF8PATH(1)+0,
+                                                flags, &new_pathtype);
+                    if (!buf) break;
+                }
+#endif
+                status = glob_helper(fd, buf, baselen,
+                                     namelen + strlen(buf + pathlen), 1,
+                                     new_pathtype, new_beg, new_end,
+                                     flags, funcs, arg, enc);
+                GLOB_FREE(buf);
+                GLOB_FREE(new_beg);
+                if (status) break;
+            }
+        }
+
+        GLOB_FREE(copy_beg);
     }
 
     return status;
@@ -2618,11 +2618,11 @@ push_caller(const char *path, VALUE val, void *enc)
 
     list = glob_make_pattern(path, path + strlen(path), arg->flags, enc);
     if (!list) {
-	return -1;
+        return -1;
     }
     status = glob_helper(arg->fd, arg->path, arg->baselen, arg->namelen, arg->dirsep,
-			 arg->pathtype, &list, &list + 1, arg->flags, arg->funcs,
-			 arg->arg, enc);
+                         arg->pathtype, &list, &list + 1, arg->flags, arg->funcs,
+                         arg->arg, enc);
     glob_free_pattern(list);
     return status;
 }
@@ -2647,8 +2647,8 @@ push_glob0_caller(const char *path, VALUE val, void *enc)
 
 static int
 ruby_glob0(const char *path, int fd, const char *base, int flags,
-	   const ruby_glob_funcs_t *funcs, VALUE arg,
-	   rb_encoding *enc)
+           const ruby_glob_funcs_t *funcs, VALUE arg,
+           rb_encoding *enc)
 {
     struct glob_pattern *list;
     const char *root, *start;
@@ -2677,10 +2677,10 @@ ruby_glob0(const char *path, int fd, const char *base, int flags,
 
     n = root - start;
     if (!n && base) {
-	n = strlen(base);
-	baselen = n;
-	start = base;
-	dirsep = TRUE;
+        n = strlen(base);
+        baselen = n;
+        start = base;
+        dirsep = TRUE;
     }
     buf = GLOB_ALLOC_N(char, n + 1);
     if (!buf) return -1;
@@ -2689,12 +2689,12 @@ ruby_glob0(const char *path, int fd, const char *base, int flags,
 
     list = glob_make_pattern(root, root + strlen(root), flags, enc);
     if (!list) {
-	GLOB_FREE(buf);
-	return -1;
+        GLOB_FREE(buf);
+        return -1;
     }
     status = glob_helper(fd, buf, baselen, n-baselen, dirsep,
-			 path_unknown, &list, &list + 1,
-			 flags, funcs, arg, enc);
+                         path_unknown, &list, &list + 1,
+                         flags, funcs, arg, enc);
     glob_free_pattern(list);
     GLOB_FREE(buf);
 
@@ -2708,7 +2708,7 @@ ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
     funcs.match = func;
     funcs.error = 0;
     return ruby_glob0(path, AT_FDCWD, 0, flags & ~GLOB_VERBOSE,
-		      &funcs, arg, rb_ascii8bit_encoding());
+                      &funcs, arg, rb_ascii8bit_encoding());
 }
 
 static int
@@ -2737,7 +2737,7 @@ rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
     args.enc = rb_ascii8bit_encoding();
 
     status = ruby_glob0(path, AT_FDCWD, 0, GLOB_VERBOSE, &rb_glob_funcs,
-			(VALUE)&args, args.enc);
+                        (VALUE)&args, args.enc);
     if (status) GLOB_JUMP_TAG(status);
 }
 
@@ -2756,7 +2756,7 @@ push_pattern(const char *path, VALUE ary, void *enc)
 
 static int
 ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
-		  rb_encoding *enc, VALUE var)
+                  rb_encoding *enc, VALUE var)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const char *p = str;
@@ -2766,48 +2766,48 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
     int nest = 0, status = 0;
 
     while (*p) {
-	if (*p == '{' && nest++ == 0) {
-	    lbrace = p;
-	}
-	if (*p == '}' && lbrace && --nest == 0) {
-	    rbrace = p;
-	    break;
-	}
-	if (*p == '\\' && escape) {
-	    if (!*++p) break;
-	}
-	Inc(p, pend, enc);
+        if (*p == '{' && nest++ == 0) {
+            lbrace = p;
+        }
+        if (*p == '}' && lbrace && --nest == 0) {
+            rbrace = p;
+            break;
+        }
+        if (*p == '\\' && escape) {
+            if (!*++p) break;
+        }
+        Inc(p, pend, enc);
     }
 
     if (lbrace && rbrace) {
-	size_t len = strlen(s) + 1;
-	char *buf = GLOB_ALLOC_N(char, len);
-	long shift;
-
-	if (!buf) return -1;
-	memcpy(buf, s, lbrace-s);
-	shift = (lbrace-s);
-	p = lbrace;
-	while (p < rbrace) {
-	    const char *t = ++p;
-	    nest = 0;
-	    while (p < rbrace && !(*p == ',' && nest == 0)) {
-		if (*p == '{') nest++;
-		if (*p == '}') nest--;
-		if (*p == '\\' && escape) {
-		    if (++p == rbrace) break;
-		}
-		Inc(p, pend, enc);
-	    }
-	    memcpy(buf+shift, t, p-t);
-	    strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
-	    status = ruby_brace_expand(buf, flags, func, arg, enc, var);
-	    if (status) break;
-	}
-	GLOB_FREE(buf);
+        size_t len = strlen(s) + 1;
+        char *buf = GLOB_ALLOC_N(char, len);
+        long shift;
+
+        if (!buf) return -1;
+        memcpy(buf, s, lbrace-s);
+        shift = (lbrace-s);
+        p = lbrace;
+        while (p < rbrace) {
+            const char *t = ++p;
+            nest = 0;
+            while (p < rbrace && !(*p == ',' && nest == 0)) {
+                if (*p == '{') nest++;
+                if (*p == '}') nest--;
+                if (*p == '\\' && escape) {
+                    if (++p == rbrace) break;
+                }
+                Inc(p, pend, enc);
+            }
+            memcpy(buf+shift, t, p-t);
+            strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
+            status = ruby_brace_expand(buf, flags, func, arg, enc, var);
+            if (status) break;
+        }
+        GLOB_FREE(buf);
     }
     else if (!lbrace && !rbrace) {
-	status = glob_call_func(func, s, arg, enc);
+        status = glob_call_func(func, s, arg, enc);
     }
 
     RB_GC_GUARD(var);
@@ -2858,9 +2858,9 @@ push_glob(VALUE ary, VALUE str, VALUE base, int flags)
     str = rb_str_encode_ospath(str);
 #endif
     if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
-	enc = rb_filesystem_encoding();
+        enc = rb_filesystem_encoding();
     if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
-	enc = rb_ascii8bit_encoding();
+        enc = rb_ascii8bit_encoding();
     flags |= GLOB_VERBOSE;
     args.func = push_pattern;
     args.value = ary;
@@ -2868,23 +2868,23 @@ push_glob(VALUE ary, VALUE str, VALUE base, int flags)
     args.base = 0;
     fd = AT_FDCWD;
     if (!NIL_P(base)) {
-	if (!RB_TYPE_P(base, T_STRING) || !rb_enc_check(str, base)) {
-	    struct dir_data *dirp = DATA_PTR(base);
-	    if (!dirp->dir) dir_closed();
+        if (!RB_TYPE_P(base, T_STRING) || !rb_enc_check(str, base)) {
+            struct dir_data *dirp = DATA_PTR(base);
+            if (!dirp->dir) dir_closed();
 #ifdef HAVE_DIRFD
-	    if ((fd = dirfd(dirp->dir)) == -1)
-		rb_sys_fail_path(dir_inspect(base));
+            if ((fd = dirfd(dirp->dir)) == -1)
+                rb_sys_fail_path(dir_inspect(base));
 #endif
-	    base = dirp->path;
-	}
-	args.base = RSTRING_PTR(base);
+            base = dirp->path;
+        }
+        args.base = RSTRING_PTR(base);
     }
 #if defined _WIN32 || defined __APPLE__
     enc = rb_utf8_encoding();
 #endif
 
     return ruby_glob0(RSTRING_PTR(str), fd, args.base, flags, &rb_glob_funcs,
-		      (VALUE)&args, enc);
+                      (VALUE)&args, enc);
 }
 
 static VALUE
@@ -2895,13 +2895,13 @@ rb_push_glob(VALUE str, VALUE base, int flags) /* '\0' is delimiter */
 
     /* can contain null bytes as separators */
     if (!RB_TYPE_P(str, T_STRING)) {
-	FilePathValue(str);
+        FilePathValue(str);
     }
     else if (!rb_str_to_cstr(str)) {
         rb_raise(rb_eArgError, "nul-separated glob pattern is deprecated");
     }
     else {
-	rb_enc_check(str, rb_enc_from_encoding(rb_usascii_encoding()));
+        rb_enc_check(str, rb_enc_from_encoding(rb_usascii_encoding()));
     }
     ary = rb_ary_new();
 
@@ -2918,11 +2918,11 @@ dir_globs(VALUE args, VALUE base, int flags)
     long i;
 
     for (i = 0; i < RARRAY_LEN(args); ++i) {
-	int status;
-	VALUE str = RARRAY_AREF(args, i);
-	FilePathValue(str);
-	status = push_glob(ary, str, base, flags);
-	if (status) GLOB_JUMP_TAG(status);
+        int status;
+        VALUE str = RARRAY_AREF(args, i);
+        FilePathValue(str);
+        status = push_glob(ary, str, base, flags);
+        if (status) GLOB_JUMP_TAG(status);
     }
     RB_GC_GUARD(args);
 
@@ -2932,12 +2932,12 @@ dir_globs(VALUE args, VALUE base, int flags)
 static VALUE
 dir_glob_option_base(VALUE base)
 {
-    if (base == Qundef || NIL_P(base)) {
-	return Qnil;
+    if (NIL_OR_UNDEF_P(base)) {
+        return Qnil;
     }
 #if USE_OPENDIR_AT
     if (rb_typeddata_is_kind_of(base, &dir_data_type)) {
-	return base;
+        return base;
     }
 #endif
     FilePathValue(base);
@@ -2948,7 +2948,7 @@ dir_glob_option_base(VALUE base)
 static int
 dir_glob_option_sort(VALUE sort)
 {
-    return (rb_bool_expected(sort, "sort") ? 0 : FNM_GLOB_NOSORT);
+    return (rb_bool_expected(sort, "sort", TRUE) ? 0 : FNM_GLOB_NOSORT);
 }
 
 static VALUE
@@ -2957,7 +2957,7 @@ dir_s_aref(rb_execution_context_t *ec, VALUE obj, VALUE args, VALUE base, VALUE
     const int flags = dir_glob_option_sort(sort);
     base = dir_glob_option_base(base);
     if (RARRAY_LEN(args) == 1) {
-	return rb_push_glob(RARRAY_AREF(args, 0), base, flags);
+        return rb_push_glob(RARRAY_AREF(args, 0), base, flags);
     }
     return dir_globs(args, base, flags);
 }
@@ -2969,15 +2969,15 @@ dir_s_glob(rb_execution_context_t *ec, VALUE obj, VALUE str, VALUE rflags, VALUE
     const int flags = (NUM2INT(rflags) | dir_glob_option_sort(sort)) & ~FNM_CASEFOLD;
     base = dir_glob_option_base(base);
     if (NIL_P(ary)) {
-	ary = rb_push_glob(str, base, flags);
+        ary = rb_push_glob(str, base, flags);
     }
     else {
         ary = dir_globs(ary, base, flags);
     }
 
     if (rb_block_given_p()) {
-	rb_ary_each(ary);
-	return Qnil;
+        rb_ary_each(ary);
+        return Qnil;
     }
     return ary;
 }
@@ -3174,19 +3174,19 @@ fnmatch_brace(const char *pattern, VALUE val, void *enc)
     rb_encoding *enc_path = rb_enc_get(path);
 
     if (enc_pattern != enc_path) {
-	if (!rb_enc_asciicompat(enc_pattern))
-	    return FNM_NOMATCH;
-	if (!rb_enc_asciicompat(enc_path))
-	    return FNM_NOMATCH;
-	if (!rb_enc_str_asciionly_p(path)) {
-	    int cr = ENC_CODERANGE_7BIT;
-	    long len = strlen(pattern);
-	    if (rb_str_coderange_scan_restartable(pattern, pattern + len,
-						  enc_pattern, &cr) != len)
-		return FNM_NOMATCH;
-	    if (cr != ENC_CODERANGE_7BIT)
-		return FNM_NOMATCH;
-	}
+        if (!rb_enc_asciicompat(enc_pattern))
+            return FNM_NOMATCH;
+        if (!rb_enc_asciicompat(enc_path))
+            return FNM_NOMATCH;
+        if (!rb_enc_str_asciionly_p(path)) {
+            int cr = ENC_CODERANGE_7BIT;
+            long len = strlen(pattern);
+            if (rb_str_coderange_scan_restartable(pattern, pattern + len,
+                                                  enc_pattern, &cr) != len)
+                return FNM_NOMATCH;
+            if (cr != ENC_CODERANGE_7BIT)
+                return FNM_NOMATCH;
+        }
     }
     return (fnmatch(pattern, enc, RSTRING_PTR(path), arg->flags) == 0);
 }
@@ -3200,27 +3200,27 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
     int flags;
 
     if (rb_scan_args(argc, argv, "21", &pattern, &path, &rflags) == 3)
-	flags = NUM2INT(rflags);
+        flags = NUM2INT(rflags);
     else
-	flags = 0;
+        flags = 0;
 
     StringValueCStr(pattern);
     FilePathStringValue(path);
 
     if (flags & FNM_EXTGLOB) {
-	struct brace_args args;
+        struct brace_args args;
 
-	args.value = path;
-	args.flags = flags;
-	if (ruby_brace_expand(RSTRING_PTR(pattern), flags, fnmatch_brace,
-			      (VALUE)&args, rb_enc_get(pattern), pattern) > 0)
-	    return Qtrue;
+        args.value = path;
+        args.flags = flags;
+        if (ruby_brace_expand(RSTRING_PTR(pattern), flags, fnmatch_brace,
+                              (VALUE)&args, rb_enc_get(pattern), pattern) > 0)
+            return Qtrue;
     }
     else {
-	rb_encoding *enc = rb_enc_compatible(pattern, path);
-	if (!enc) return Qfalse;
-	if (fnmatch(RSTRING_PTR(pattern), enc, RSTRING_PTR(path), flags) == 0)
-	    return Qtrue;
+        rb_encoding *enc = rb_enc_compatible(pattern, path);
+        if (!enc) return Qfalse;
+        if (fnmatch(RSTRING_PTR(pattern), enc, RSTRING_PTR(path), flags) == 0)
+            return Qtrue;
     }
     RB_GC_GUARD(pattern);
 
@@ -3244,12 +3244,12 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
     rb_check_arity(argc, 0, 1);
     user = (argc > 0) ? argv[0] : Qnil;
     if (!NIL_P(user)) {
-	SafeStringValue(user);
-	rb_must_asciicompat(user);
-	u = StringValueCStr(user);
-	if (*u) {
-	    return rb_home_dir_of(user, rb_str_new(0, 0));
-	}
+        SafeStringValue(user);
+        rb_must_asciicompat(user);
+        u = StringValueCStr(user);
+        if (*u) {
+            return rb_home_dir_of(user, rb_str_new(0, 0));
+        }
     }
     return rb_default_home_dir(rb_str_new(0, 0));
 
@@ -3279,24 +3279,24 @@ nogvl_dir_empty_p(void *ptr)
     VALUE result = Qtrue;
 
     if (!dir) {
-	int e = errno;
-	switch (gc_for_fd_with_gvl(e)) {
-	  default:
-	    dir = opendir(path);
-	    if (dir) break;
-	    e = errno;
-	    /* fall through */
-	  case 0:
-	    if (e == ENOTDIR) return (void *)Qfalse;
-	    errno = e; /* for rb_sys_fail_path */
-	    return (void *)Qundef;
-	}
+        int e = errno;
+        switch (gc_for_fd_with_gvl(e)) {
+          default:
+            dir = opendir(path);
+            if (dir) break;
+            e = errno;
+            /* fall through */
+          case 0:
+            if (e == ENOTDIR) return (void *)Qfalse;
+            errno = e; /* for rb_sys_fail_path */
+            return (void *)Qundef;
+        }
     }
     while ((dp = READDIR(dir, NULL)) != NULL) {
-	if (!to_be_skipped(dp)) {
-	    result = Qfalse;
-	    break;
-	}
+        if (!to_be_skipped(dp)) {
+            result = Qfalse;
+            break;
+        }
     }
     closedir(dir);
     return (void *)result;
@@ -3324,27 +3324,27 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname)
 
 #if defined HAVE_GETATTRLIST && defined ATTR_DIR_ENTRYCOUNT
     {
-	u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)];
-	struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,};
-	if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) != 0)
-	    rb_sys_fail_path(orig);
-	if (*(const fsobj_tag_t *)(attrbuf+1) == VT_HFS) {
-	    al.commonattr = 0;
-	    al.dirattr = ATTR_DIR_ENTRYCOUNT;
-	    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) == 0) {
-		if (attrbuf[0] >= 2 * sizeof(u_int32_t))
-		    return RBOOL(attrbuf[1] == 0);
-		if (false_on_notdir) return Qfalse;
-	    }
-	    rb_sys_fail_path(orig);
-	}
+        u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)];
+        struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,};
+        if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) != 0)
+            rb_sys_fail_path(orig);
+        if (*(const fsobj_tag_t *)(attrbuf+1) == VT_HFS) {
+            al.commonattr = 0;
+            al.dirattr = ATTR_DIR_ENTRYCOUNT;
+            if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) == 0) {
+                if (attrbuf[0] >= 2 * sizeof(u_int32_t))
+                    return RBOOL(attrbuf[1] == 0);
+                if (false_on_notdir) return Qfalse;
+            }
+            rb_sys_fail_path(orig);
+        }
     }
 #endif
 
     result = (VALUE)rb_thread_call_without_gvl(nogvl_dir_empty_p, (void *)path,
-					    RUBY_UBF_IO, 0);
-    if (result == Qundef) {
-	rb_sys_fail_path(orig);
+                                            RUBY_UBF_IO, 0);
+    if (UNDEF_P(result)) {
+        rb_sys_fail_path(orig);
     }
     return result;
 }
diff --git a/dir.rb b/dir.rb
index d2ed92c287..2e426b0881 100644
--- a/dir.rb
+++ b/dir.rb
@@ -65,7 +65,7 @@
 #
 # - ::each_child: Calls the given block with each entry in the given directory,
 #   but not including <tt>.</tt> or <tt>..</tt>.
-# - ::foreach: Calls the given block with each entryin the given directory,
+# - ::foreach: Calls the given block with each entry in the given directory,
 #   including <tt>.</tt> and <tt>..</tt>.
 # - #each: Calls the given block with each entry in +self+,
 #   including <tt>.</tt> and <tt>..</tt>.
diff --git a/dln.c b/dln.c
index 6fa68289dd..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
@@ -110,8 +114,8 @@ init_funcname_len(const char **file)
 
     /* Load the file as an object one */
     for (base = p; *p; p++) { /* Find position of last '/' */
-	if (*p == '.' && !dot) dot = p;
-	if (isdirsep(*p)) base = p+1, dot = NULL;
+        if (*p == '.' && !dot) dot = p;
+        if (isdirsep(*p)) base = p+1, dot = NULL;
     }
     *file = base;
     /* Delete suffix if it exists */
@@ -126,7 +130,7 @@ static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX
     const size_t plen = sizeof(funcname_prefix);\
     char *const tmp = ALLOCA_N(char, plen+flen+1);\
     if (!tmp) {\
-	dln_memerror();\
+        dln_memerror();\
     }\
     memcpy(tmp, funcname_prefix, plen);\
     memcpy(tmp+plen, base, flen);\
@@ -170,14 +174,14 @@ dln_strerror(char *message, size_t size)
     size_t len = snprintf(message, size, "%d: ", error);
 
 #define format_message(sublang) FormatMessage(\
-	FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,	\
-	NULL, error, MAKELANGID(LANG_NEUTRAL, (sublang)),		\
-	message + len, size - len, NULL)
+        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,	\
+        NULL, error, MAKELANGID(LANG_NEUTRAL, (sublang)),		\
+        message + len, size - len, NULL)
     if (format_message(SUBLANG_ENGLISH_US) == 0)
-	format_message(SUBLANG_DEFAULT);
+        format_message(SUBLANG_DEFAULT);
     for (p = message + len; *p; p++) {
-	if (*p == '\n' || *p == '\r')
-	    *p = ' ';
+        if (*p == '\n' || *p == '\r')
+            *p = ' ';
     }
     return message;
 }
@@ -200,18 +204,18 @@ aix_loaderror(const char *pathname)
     snprintf(errbuf, sizeof(errbuf), "load failed - %s. ", pathname);
 
     if (loadquery(L_GETMESSAGES, &message[0], sizeof(message)) != -1) {
-	ERRBUF_APPEND("Please issue below command for detailed reasons:\n\t");
-	ERRBUF_APPEND("/usr/sbin/execerror ruby ");
-	for (i=0; message[i]; i++) {
-	    ERRBUF_APPEND("\"");
-	    ERRBUF_APPEND(message[i]);
-	    ERRBUF_APPEND("\" ");
-	}
-	ERRBUF_APPEND("\n");
+        ERRBUF_APPEND("Please issue below command for detailed reasons:\n\t");
+        ERRBUF_APPEND("/usr/sbin/execerror ruby ");
+        for (i=0; message[i]; i++) {
+            ERRBUF_APPEND("\"");
+            ERRBUF_APPEND(message[i]);
+            ERRBUF_APPEND("\" ");
+        }
+        ERRBUF_APPEND("\n");
     }
     else {
-	ERRBUF_APPEND(strerror(errno));
-	ERRBUF_APPEND("[loadquery failed]");
+        ERRBUF_APPEND(strerror(errno));
+        ERRBUF_APPEND("[loadquery failed]");
     }
     dln_loaderror("%s", errbuf);
 }
@@ -229,22 +233,22 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
     desc = ImageDirectoryEntryToData(ext, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size);
     if (!desc) return 0;
     while (desc->Name) {
-	PIMAGE_THUNK_DATA pint = (PIMAGE_THUNK_DATA)((char *)ext + desc->Characteristics);
-	PIMAGE_THUNK_DATA piat = (PIMAGE_THUNK_DATA)((char *)ext + desc->FirstThunk);
-	for (; piat->u1.Function; piat++, pint++) {
-	    static const char prefix[] = "rb_";
-	    PIMAGE_IMPORT_BY_NAME pii;
-	    const char *name;
-
-	    if (IMAGE_SNAP_BY_ORDINAL(pint->u1.Ordinal)) continue;
-	    pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + (size_t)pint->u1.AddressOfData);
-	    name = (const char *)pii->Name;
-	    if (strncmp(name, prefix, sizeof(prefix) - 1) == 0) {
-		FARPROC addr = GetProcAddress(mine, name);
-		if (addr) return (FARPROC)piat->u1.Function == addr;
-	    }
-	}
-	desc++;
+        PIMAGE_THUNK_DATA pint = (PIMAGE_THUNK_DATA)((char *)ext + desc->Characteristics);
+        PIMAGE_THUNK_DATA piat = (PIMAGE_THUNK_DATA)((char *)ext + desc->FirstThunk);
+        for (; piat->u1.Function; piat++, pint++) {
+            static const char prefix[] = "rb_";
+            PIMAGE_IMPORT_BY_NAME pii;
+            const char *name;
+
+            if (IMAGE_SNAP_BY_ORDINAL(pint->u1.Ordinal)) continue;
+            pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + (size_t)pint->u1.AddressOfData);
+            name = (const char *)pii->Name;
+            if (strncmp(name, prefix, sizeof(prefix) - 1) == 0) {
+                FARPROC addr = GetProcAddress(mine, name);
+                if (addr) return (FARPROC)piat->u1.Function == addr;
+            }
+        }
+        desc++;
     }
     return 1;
 }
@@ -252,11 +256,11 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
 
 #if defined(DLN_NEEDS_ALT_SEPARATOR) && DLN_NEEDS_ALT_SEPARATOR
 #define translit_separator(src) do { \
-	char *tmp = ALLOCA_N(char, strlen(src) + 1), *p = tmp, c; \
-	do { \
-	    *p++ = ((c = *file++) == '/') ? DLN_NEEDS_ALT_SEPARATOR : c; \
-	} while (c); \
-	(src) = tmp; \
+        char *tmp = ALLOCA_N(char, strlen(src) + 1), *p = tmp, c; \
+        do { \
+            *p++ = ((c = *file++) == '/') ? DLN_NEEDS_ALT_SEPARATOR : c; \
+        } while (c); \
+        (src) = tmp; \
     } while (0)
 #else
 #define translit_separator(str) (void)(str)
@@ -273,7 +277,7 @@ dln_incompatible_func(void *handle, const char *funcname, void *const fp, const
     if (!ex) return false;
     if (ex == fp) return false;
     if (dladdr(ex, &dli)) {
-	*libname = dli.dli_fname;
+        *libname = dli.dli_fname;
     }
     return true;
 }
@@ -287,15 +291,28 @@ dln_incompatible_library_p(void *handle, const char **libname)
 {
 #define check_func(func) \
     if (dln_incompatible_func(handle, EXTERNAL_PREFIX #func, (void *)&func, libname)) \
-	return true
+        return true
     check_func(ruby_xmalloc);
     return false;
 }
 COMPILER_WARNING_POP
 #endif
 
-#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
-    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
+#if !defined(MAC_OS_X_VERSION_MIN_REQUIRED)
+/* assume others than old Mac OS X have no problem */
+# 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>
 
 static bool
@@ -308,8 +325,6 @@ dln_disable_dlclose(void)
     if (rev < MAC_OS_X_VERSION_10_11) return true;
     return false;
 }
-#else
-# define dln_disable_dlclose() false
 #endif
 
 #if defined(_WIN32) || defined(USE_DLN_DLOPEN)
@@ -326,7 +341,7 @@ dln_open(const char *file)
     /* Convert the file path to wide char */
     WCHAR *winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
     if (!winfile) {
-	dln_memerror();
+        dln_memerror();
     }
 
     /* Load file */
@@ -334,15 +349,15 @@ dln_open(const char *file)
     free(winfile);
 
     if (!handle) {
-	error = dln_strerror();
-	goto failed;
+        error = dln_strerror();
+        goto failed;
     }
 
 # if defined(RUBY_EXPORT)
     if (!rb_w32_check_imported(handle, rb_libruby_handle())) {
-	FreeLibrary(handle);
-	error = incompatible;
-	goto failed;
+        FreeLibrary(handle);
+        error = incompatible;
+        goto failed;
     }
 # endif
 
@@ -367,24 +382,24 @@ dln_open(const char *file)
 
 # if defined(RUBY_EXPORT)
     {
-	const char *libruby_name = NULL;
-	if (dln_incompatible_library_p(handle, &libruby_name)) {
-	    if (dln_disable_dlclose()) {
-		/* dlclose() segfaults */
-		if (libruby_name) {
-		    dln_fatalerror("linked to incompatible %s - %s", libruby_name, file);
-		}
-		dln_fatalerror("%s - %s", incompatible, file);
-	    }
-	    else {
-		dlclose(handle);
-		if (libruby_name) {
-		    dln_loaderror("linked to incompatible %s - %s", libruby_name, file);
-		}
-		error = incompatible;
-		goto failed;
-	    }
-	}
+        const char *libruby_name = NULL;
+        if (dln_incompatible_library_p(handle, &libruby_name)) {
+            if (dln_disable_dlclose()) {
+                /* dlclose() segfaults */
+                if (libruby_name) {
+                    dln_fatalerror("linked to incompatible %s - %s", libruby_name, file);
+                }
+                dln_fatalerror("%s - %s", incompatible, file);
+            }
+            else {
+                dlclose(handle);
+                if (libruby_name) {
+                    dln_loaderror("linked to incompatible %s - %s", libruby_name, file);
+                }
+                error = incompatible;
+                goto failed;
+            }
+        }
     }
 # endif
 #endif
@@ -445,7 +460,7 @@ dln_load(const char *file)
     unsigned long long (*abi_version_fct)(void) = (unsigned long long(*)(void))dln_sym(handle, "ruby_abi_version");
     unsigned long long binary_abi_version = (*abi_version_fct)();
     if (binary_abi_version != ruby_abi_version() && abi_check_enabled_p()) {
-        dln_loaderror("ABI version of binary is incompatible with this Ruby. Try rebuilding this binary.");
+        dln_loaderror("incompatible ABI version of binary - %s", file);
     }
 #endif
 
@@ -460,17 +475,17 @@ dln_load(const char *file)
 
 #elif defined(_AIX)
     {
-	void (*init_fct)(void);
-
-	init_fct = (void(*)(void))load((char*)file, 1, 0);
-	if (init_fct == NULL) {
-	    aix_loaderror(file);
-	}
-	if (loadbind(0, (void*)dln_load, (void*)init_fct) == -1) {
-	    aix_loaderror(file);
-	}
-	(*init_fct)();
-	return (void*)init_fct;
+        void (*init_fct)(void);
+
+        init_fct = (void(*)(void))load((char*)file, 1, 0);
+        if (init_fct == NULL) {
+            aix_loaderror(file);
+        }
+        if (loadbind(0, (void*)dln_load, (void*)init_fct) == -1) {
+            aix_loaderror(file);
+        }
+        (*init_fct)();
+        return (void*)init_fct;
     }
 #else
     dln_notimplement();
diff --git a/dln_find.c b/dln_find.c
index 96e06d34c4..5d380f5d39 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -53,26 +53,26 @@ char *getenv();
 #endif
 
 static char *dln_find_1(const char *fname, const char *path, char *buf, size_t size, int exe_flag
-			DLN_FIND_EXTRA_ARG_DECL);
+                        DLN_FIND_EXTRA_ARG_DECL);
 
 char *
 dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size
-	       DLN_FIND_EXTRA_ARG_DECL)
+               DLN_FIND_EXTRA_ARG_DECL)
 {
     char *envpath = 0;
 
     if (!path) {
-	path = getenv(PATH_ENV);
-	if (path) path = envpath = strdup(path);
+        path = getenv(PATH_ENV);
+        if (path) path = envpath = strdup(path);
     }
 
     if (!path) {
-	path =
-	    "/usr/local/bin" PATH_SEP
-	    "/usr/ucb" PATH_SEP
-	    "/usr/bin" PATH_SEP
-	    "/bin" PATH_SEP
-	    ".";
+        path =
+            "/usr/local/bin" PATH_SEP
+            "/usr/ucb" PATH_SEP
+            "/usr/bin" PATH_SEP
+            "/bin" PATH_SEP
+            ".";
     }
     buf = dln_find_1(fname, path, buf, size, 1 DLN_FIND_EXTRA_ARG);
     if (envpath) free(envpath);
@@ -81,7 +81,7 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size
 
 char *
 dln_find_file_r(const char *fname, const char *path, char *buf, size_t size
-		DLN_FIND_EXTRA_ARG_DECL)
+                DLN_FIND_EXTRA_ARG_DECL)
 {
     if (!path) path = ".";
     return dln_find_1(fname, path, buf, size, 0 DLN_FIND_EXTRA_ARG);
@@ -89,8 +89,8 @@ dln_find_file_r(const char *fname, const char *path, char *buf, size_t size
 
 static char *
 dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
-	   int exe_flag /* non 0 if looking for executable. */
-	   DLN_FIND_EXTRA_ARG_DECL)
+           int exe_flag /* non 0 if looking for executable. */
+           DLN_FIND_EXTRA_ARG_DECL)
 {
     register const char *dp;
     register const char *ep;
@@ -99,7 +99,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
     size_t i, fnlen, fspace;
 #ifdef DOSISH
     static const char extension[][5] = {
-	EXECUTABLE_EXTS,
+        EXECUTABLE_EXTS,
     };
     size_t j;
     int is_abs = 0, has_path = 0;
@@ -110,21 +110,21 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
     static const char pathname_too_long[] = "openpath: pathname too long (ignored)\n\
 \tDirectory \"%.*s\"%s\n\tFile \"%.*s\"%s\n";
 #define PATHNAME_TOO_LONG() dln_warning(dln_warning_arg pathname_too_long, \
-					((bp - fbuf) > 100 ? 100 : (int)(bp - fbuf)), fbuf, \
-					((bp - fbuf) > 100 ? "..." : ""), \
-					(fnlen > 100 ? 100 : (int)fnlen), fname, \
-					(fnlen > 100 ? "..." : ""))
+                                        ((bp - fbuf) > 100 ? 100 : (int)(bp - fbuf)), fbuf, \
+                                        ((bp - fbuf) > 100 ? "..." : ""), \
+                                        (fnlen > 100 ? 100 : (int)fnlen), fname, \
+                                        (fnlen > 100 ? "..." : ""))
 
 #define RETURN_IF(expr) if (expr) return (char *)fname;
 
     RETURN_IF(!fname);
     fnlen = strlen(fname);
     if (fnlen >= size) {
-	dln_warning(dln_warning_arg
-		    "openpath: pathname too long (ignored)\n\tFile \"%.*s\"%s\n",
-		    (fnlen > 100 ? 100 : (int)fnlen), fname,
-		    (fnlen > 100 ? "..." : ""));
-	return NULL;
+        dln_warning(dln_warning_arg
+                    "openpath: pathname too long (ignored)\n\tFile \"%.*s\"%s\n",
+                    (fnlen > 100 ? 100 : (int)fnlen), fname,
+                    (fnlen > 100 ? "..." : ""));
+        return NULL;
     }
 #ifdef DOSISH
 # ifndef CharNext
@@ -132,52 +132,52 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 # endif
 # ifdef DOSISH_DRIVE_LETTER
     if (((p[0] | 0x20) - 'a') < 26  && p[1] == ':') {
-	p += 2;
-	is_abs = 1;
+        p += 2;
+        is_abs = 1;
     }
 # endif
     switch (*p) {
       case '/': case '\\':
-	is_abs = 1;
-	p++;
+        is_abs = 1;
+        p++;
     }
     has_path = is_abs;
     while (*p) {
-	switch (*p) {
-	  case '/': case '\\':
-	    has_path = 1;
-	    ext = 0;
-	    p++;
-	    break;
-	  case '.':
-	    ext = p;
-	    p++;
-	    break;
-	  default:
-	    p = CharNext(p);
-	}
+        switch (*p) {
+          case '/': case '\\':
+            has_path = 1;
+            ext = 0;
+            p++;
+            break;
+          case '.':
+            ext = p;
+            p++;
+            break;
+          default:
+            p = CharNext(p);
+        }
     }
     if (ext) {
-	for (j = 0; STRCASECMP(ext, extension[j]); ) {
-	    if (++j == sizeof(extension) / sizeof(extension[0])) {
-		ext = 0;
-		break;
-	    }
-	}
+        for (j = 0; STRCASECMP(ext, extension[j]); ) {
+            if (++j == sizeof(extension) / sizeof(extension[0])) {
+                ext = 0;
+                break;
+            }
+        }
     }
     ep = bp = 0;
     if (!exe_flag) {
-	RETURN_IF(is_abs);
+        RETURN_IF(is_abs);
     }
     else if (has_path) {
-	RETURN_IF(ext);
-	i = p - fname;
-	if (i + 1 > size) goto toolong;
-	fspace = size - i - 1;
-	bp = fbuf;
-	ep = p;
-	memcpy(fbuf, fname, i + 1);
-	goto needs_extension;
+        RETURN_IF(ext);
+        i = p - fname;
+        if (i + 1 > size) goto toolong;
+        fspace = size - i - 1;
+        bp = fbuf;
+        ep = p;
+        memcpy(fbuf, fname, i + 1);
+        goto needs_extension;
     }
     p = fname;
 #endif
@@ -189,85 +189,85 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 #undef RETURN_IF
 
     for (dp = path;; dp = ++ep) {
-	register size_t l;
-
-	/* extract a component */
-	ep = strchr(dp, PATH_SEP[0]);
-	if (ep == NULL)
-	    ep = dp+strlen(dp);
-
-	/* find the length of that component */
-	l = ep - dp;
-	bp = fbuf;
-	fspace = size - 2;
-	if (l > 0) {
-	    /*
-	    **	If the length of the component is zero length,
-	    **	start from the current directory.  If the
-	    **	component begins with "~", start from the
-	    **	user's $HOME environment variable.  Otherwise
-	    **	take the path literally.
-	    */
-
-	    if (*dp == '~' && (l == 1 ||
+        register size_t l;
+
+        /* extract a component */
+        ep = strchr(dp, PATH_SEP[0]);
+        if (ep == NULL)
+            ep = dp+strlen(dp);
+
+        /* find the length of that component */
+        l = ep - dp;
+        bp = fbuf;
+        fspace = size - 2;
+        if (l > 0) {
+            /*
+            **	If the length of the component is zero length,
+            **	start from the current directory.  If the
+            **	component begins with "~", start from the
+            **	user's $HOME environment variable.  Otherwise
+            **	take the path literally.
+            */
+
+            if (*dp == '~' && (l == 1 ||
 #if defined(DOSISH)
-			       dp[1] == '\\' ||
+                               dp[1] == '\\' ||
 #endif
-			       dp[1] == '/')) {
-		const char *home;
-
-		home = getenv("HOME");
-		if (home != NULL) {
-		    i = strlen(home);
-		    if (fspace < i)
-			goto toolong;
-		    fspace -= i;
-		    memcpy(bp, home, i);
-		    bp += i;
-		}
-		dp++;
-		l--;
-	    }
-	    if (l > 0) {
-		if (fspace < l)
-		    goto toolong;
-		fspace -= l;
-		memcpy(bp, dp, l);
-		bp += l;
-	    }
-
-	    /* add a "/" between directory and filename */
-	    if (ep[-1] != '/')
-		*bp++ = '/';
-	}
-
-	/* now append the file name */
-	i = fnlen;
-	if (fspace < i) {
+                               dp[1] == '/')) {
+                const char *home;
+
+                home = getenv("HOME");
+                if (home != NULL) {
+                    i = strlen(home);
+                    if (fspace < i)
+                        goto toolong;
+                    fspace -= i;
+                    memcpy(bp, home, i);
+                    bp += i;
+                }
+                dp++;
+                l--;
+            }
+            if (l > 0) {
+                if (fspace < l)
+                    goto toolong;
+                fspace -= l;
+                memcpy(bp, dp, l);
+                bp += l;
+            }
+
+            /* add a "/" between directory and filename */
+            if (ep[-1] != '/')
+                *bp++ = '/';
+        }
+
+        /* now append the file name */
+        i = fnlen;
+        if (fspace < i) {
             goto toolong;
-	}
-	fspace -= i;
-	memcpy(bp, fname, i + 1);
+        }
+        fspace -= i;
+        memcpy(bp, fname, i + 1);
 
 #if defined(DOSISH)
-	if (exe_flag && !ext) {
+        if (exe_flag && !ext) {
             goto needs_extension;
-	}
+        }
 #endif
 
 #ifndef S_ISREG
 # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
-	if (stat(fbuf, &st) == 0 && S_ISREG(st.st_mode)) {
-	    if (exe_flag == 0) return fbuf;
-	    /* looking for executable */
-	    if (eaccess(fbuf, X_OK) == 0) return fbuf;
-	}
+        if (stat(fbuf, &st) == 0 && S_ISREG(st.st_mode)) {
+            if (exe_flag == 0) return fbuf;
+            /* looking for executable */
+            if (eaccess(fbuf, X_OK) == 0) return fbuf;
+        }
       next:
-	/* if not, and no other alternatives, life is bleak */
-	if (*ep == '\0') {
-	    return NULL;
-	}
+        /* if not, and no other alternatives, life is bleak */
+        if (*ep == '\0') {
+            return NULL;
+        }
         continue;
 
       toolong:
@@ -287,6 +287,6 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
         }
         goto next;
 #endif
-	/* otherwise try the next component in the search path */
+        /* otherwise try the next component in the search path */
     }
 }
diff --git a/dmyenc.c b/dmyenc.c
index 7e006e826c..75b8a2da43 100644
--- a/dmyenc.c
+++ b/dmyenc.c
@@ -5,6 +5,6 @@ void
 Init_enc(void)
 {
     if (require("enc/encdb.so") == 1) {
-	require("enc/trans/transdb.so");
+        require("enc/trans/transdb.so");
     }
 }
diff --git a/doc/.document b/doc/.document
index 03d332367c..f589dda07c 100644
--- a/doc/.document
+++ b/doc/.document
@@ -5,3 +5,5 @@ contributing
 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/NEWS/NEWS-3.0.0.md b/doc/NEWS/NEWS-3.0.0.md
index 00c26fe585..bdbd47327b 100644
--- a/doc/NEWS/NEWS-3.0.0.md
+++ b/doc/NEWS/NEWS-3.0.0.md
@@ -512,6 +512,18 @@ Outstanding ones only.
 
     * This version is Ractor compatible.
 
+* URI
+
+    * URI.escape and URI.unescape have been removed.
+      Instead, use the following methods depending on your specific use case.
+
+        * CGI.escape
+        * URI.encode_www_form
+        * URI.encode_www_form_component
+        * CGI.unescape
+        * URI.decode_www_form
+        * URI.decode_www_form_component
+
 ## Compatibility issues
 
 Excluding feature bug fixes.
diff --git a/doc/case_mapping.rdoc b/doc/case_mapping.rdoc
index 29d7bc6c33..3c42154973 100644
--- a/doc/case_mapping.rdoc
+++ b/doc/case_mapping.rdoc
@@ -28,13 +28,13 @@ In Symbol:
 
 By default, all of these methods use full Unicode case mapping,
 which is suitable for most languages.
-See {Unicode Latin Case Chart}[https://www.unicode.org/charts/case].
+See {Section 3.13 (Default Case Algorithms) of the Unicode standard}[https://www.unicode.org/versions/latest/ch03.pdf].
 
 Non-ASCII case mapping and folding are supported for UTF-8,
 UTF-16BE/LE, UTF-32BE/LE, and ISO-8859-1~16 Strings/Symbols.
 
 Context-dependent case mapping as described in
-{Table 3-17 of the Unicode standard}[https://www.unicode.org/versions/Unicode13.0.0/ch03.pdf]
+{Table 3-17 (Context Specification for Casing) of the Unicode standard}[https://www.unicode.org/versions/latest/ch03.pdf]
 is currently not supported.
 
 In most cases, case conversions of a string have the same number of characters.
diff --git a/doc/command_injection.rdoc b/doc/command_injection.rdoc
index 8f1303bcf7..af09be23f0 100644
--- a/doc/command_injection.rdoc
+++ b/doc/command_injection.rdoc
@@ -8,7 +8,7 @@ They should not be called with unknown or unsanitized commands.
 These methods include:
 
 - Kernel.system
-- {`command` (backtick method)}[rdoc-ref:Kernel#`]
+- {\`command` (backtick method)}[rdoc-ref:Kernel#`]
   (also called by the expression <tt>%x[command]</tt>).
 - IO.popen(command).
 - IO.read(command).
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 6219ec605c..9cfd59d629 100644
--- a/doc/contributing/documentation_guide.md
+++ b/doc/contributing/documentation_guide.md
@@ -92,7 +92,7 @@ involving new files `doc/*.rdoc`:
 
     Example:
 
-    ```c
+    ```
     /*
      *  call-seq:
      *    each_byte {|byte| ... } -> self
@@ -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.
@@ -151,6 +164,28 @@ We might consider whether to suppress when:
 - The same reference is repeated many times
   (e.g., _RDoc_ on this page).
 
+### HTML Tags
+
+In general, avoid using HTML tags (even in formats where it's allowed)
+because `ri` (the Ruby Interactive reference tool)
+may not render them properly.
+
+### Tables
+
+In particular, avoid building tables with HTML tags
+(<tt><table></tt>, etc.).
+
+Alternatives are:
+
+- The GFM (GitHub Flavored Markdown) table extension,
+  which is enabled by default. See
+  {GFM tables extension}[https://github.github.com/gfm/#tables-extension-].
+
+- A {verbatim text block}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks],
+  using spaces and punctuation to format the text.
+  Note that {text markup}[rdoc-ref:RDoc::MarkupReference@Text+Markup]
+  will not be honored.
+
 ## Documenting Classes and Modules
 
 The general structure of the class or module documentation should be:
@@ -215,59 +250,85 @@ For methods written in Ruby, \RDoc documents the calling sequence automatically.
 
 For methods written in C, \RDoc cannot determine what arguments
 the method accepts, so those need to be documented using \RDoc directive
-[`:call-seq:`](rdoc-ref:RDoc::Markup@Method+arguments).
+[`call-seq:`](rdoc-ref:RDoc::Markup@Method+arguments).
 
-Example:
+For a singleton method, use the form:
 
-```c
-*  call-seq:
-*    array.count -> integer
-*    array.count(obj) -> integer
-*    array.count {|element| ... } -> integer
+```
+class_name.method_name(method_args) {|block_args| ... } -> return_type
 ```
 
-When creating the `call-seq`, use the form
+Example:
 
 ```
-receiver_type.method_name(arguments) {|block_arguments|} -> return_type
+*  call-seq:
+*    Hash.new(default_value = nil) -> new_hash
+*    Hash.new {|hash, key| ... } -> new_hash
 ```
 
-Omit the parentheses for cases where the method does not accept arguments,
-and omit the block for cases where a block is not accepted.
-
-In the cases where method can return multiple different types, separate the
-types with "or".  If the method can return any type, use "object".  If the
-method returns the receiver, use "self".
-
-In cases where the method accepts optional arguments, use a `call-seq` with
-an optional argument if the method has the same behavior when an argument is
-omitted as when the argument is passed with the default value.  For example,
-use:
+For an instance method, use the form
+(omitting any prefix, just as RDoc does for a Ruby-coded method):
 
 ```
-obj.respond_to?(symbol, include_all=false) -> true or false
+method_name(method_args) {|block_args| ... } -> return_type
 ```
+For example, in Array, use:
 
-Instead of:
+```
+*  call-seq:
+*    count -> integer
+*    count(obj) -> integer
+*    count {|element| ... } -> integer
+```
 
 ```
-obj.respond_to?(symbol) -> true or false
-obj.respond_to?(symbol, include_all) -> true or false
+* call-seq:
+*    <=> other -> -1, 0, 1, or nil
 ```
 
-However, as shown above for `Array#count`, use separate lines if the
-behavior is different if the argument is omitted.
+Arguments:
 
-Omit aliases from the `call-seq`, but mention them near the end (see below).
+- If the method does not accept arguments, omit the parentheses.
+- If the method accepts optional arguments:
 
+    - Separate each argument name and its default value with ` = `
+      (equal-sign with surrounding spaces).
+    - If the method has the same behavior with either an omitted
+      or an explicit argument, use a `call-seq` with optional arguments.
+      For example, use:
 
-A `call-seq` block should have `{|x| ... }`, not `{|x| block }` or `{|x| code }`.
+        ```
+        respond_to?(symbol, include_all = false) -> true or false
+        ```
 
-A `call-seq` output should:
+    - If the behavior is different with an omitted or an explicit argument,
+      use a `call-seq` with separate lines.
+      For example, in Enumerable, use:
 
-- Have `self`, not `receiver` or `array`.
-- Begin with `new_` if and only if the output object is a new instance
-  of the receiver's class, to emphasize that the output object is not `self`.
+        ```
+        *    max    -> element
+        *    max(n) -> array
+        ```
+
+Block:
+
+- If the method does not accept a block, omit the block.
+- If the method accepts a block, the `call-seq` should have `{|args| ... }`,
+  not `{|args| block }` or `{|args| code }`.
+
+Return types:
+
+- If the method can return multiple different types,
+  separate the types with "or" and, if necessary, commas.
+- If the method can return multiple types, use +object+.
+- If the method returns the receiver, use +self+.
+- If the method returns an object of the same class,
+  prefix `new_` if an only if the object is not  +self+;
+  example: `new_array`.
+
+Aliases:
+
+- Omit aliases from the `call-seq`, but mention them near the end (see below).
 
 ### Synopsis
 
@@ -341,7 +402,7 @@ that is a common case, such as `Hash#fetch` raising a `KeyError`.
 
 Mention aliases in the form
 
-```c
+```
 // Array#find_index is an alias for Array#index.
 ```
 
@@ -350,12 +411,22 @@ Mention aliases in the form
 In some cases, it is useful to document which methods are related to
 the current method.  For example, documentation for `Hash#[]` might
 mention `Hash#fetch` as a related method, and `Hash#merge` might mention
-`Hash#merge!` as a related method.  Consider which methods may be related
-to the current method, and if you think the reader would benefit it,
-at the end of the method documentation, add a line starting with
-"Related: " (e.g. "Related: #fetch").  Don't list more than three
-related methods. If you think more than three methods are related,
-pick the three you think are most important and list those three.
+`Hash#merge!` as a related method.
+
+- Consider which methods may be related
+  to the current method, and if you think the reader would benefit it,
+  at the end of the method documentation, add a line starting with
+  "Related: " (e.g. "Related: #fetch.").
+- Don't list more than three related methods.
+  If you think more than three methods are related,
+  list the three you think are most important.
+- Consider adding:
+
+    - A phrase suggesting how the related method is similar to,
+      or different from,the current method.
+      See an example at Time#getutc.
+    - Example code that illustrates the similarities and differences.
+      See examples at Time#ctime, Time#inspect, Time#to_s.
 
 ### Methods Accepting Multiple Argument Types
 
diff --git a/doc/contributing/testing_ruby.md b/doc/contributing/testing_ruby.md
index 74300d221d..6247686efc 100644
--- a/doc/contributing/testing_ruby.md
+++ b/doc/contributing/testing_ruby.md
@@ -20,6 +20,13 @@ We can run any of the make scripts [in parallel](building_ruby.md#label-Running+
     make btest OPTS=-v
     ```
 
+    To run individual bootstrap tests, we can either specify a list of filenames or use the `--sets` flag in the variable `BTESTS`:
+
+    ```
+    make btest BTESTS="bootstraptest/test_fork.rb bootstraptest/tes_gc.rb"
+    make btest BTESTS="--sets=fork,gc"
+    ```
+
     If we want to run the bootstrap test suite on Ruby (not Miniruby), we can use:
 
     ```
@@ -63,7 +70,7 @@ We can run any of the make scripts [in parallel](building_ruby.md#label-Running+
     first the file name, and then the test name, prefixed with `--name`. For example:
 
     ```
-    make test-all TESTS="../test/ruby/test_alias.rb --name=/test_aias_with_zsuper_method/"
+    make test-all TESTS="../test/ruby/test_alias.rb --name=/test_alias_with_zsuper_method/"
     ```
 
     To run these specs with logs, we can use:
diff --git a/doc/date/calendars.rdoc b/doc/date/calendars.rdoc
new file mode 100644
index 0000000000..b8690841b1
--- /dev/null
+++ b/doc/date/calendars.rdoc
@@ -0,0 +1,62 @@
+== Julian and Gregorian Calendars
+
+The difference between the
+{Julian calendar}[https://en.wikipedia.org/wiki/Julian_calendar]
+and the
+{Gregorian calendar}[https://en.wikipedia.org/wiki/Gregorian_calendar]
+may matter to your program if it uses dates before the switchovers.
+
+- October 15, 1582.
+- September 14, 1752.
+
+A date will be different in the two calendars, in general.
+
+=== Different switchover dates
+
+The reasons for the difference are religious/political histories.
+
+- On October 15, 1582, several countries changed
+  from the Julian calendar to the Gregorian calendar;
+  these included Italy, Poland, Portugal, and Spain.
+  Other contries in the Western world retained the Julian calendar.
+- On September 14, 1752, most of the British empire
+  changed from the Julian calendar to the Gregorian calendar.
+
+When your code uses a date before these switchover dates,
+it will matter whether it considers the switchover date
+to be the earlier date or the later date (or neither).
+
+See also {a concrete example here}[rdoc-ref:DateTime@When+should+you+use+DateTime+and+when+should+you+use+Time-3F].
+
+=== Argument +start+
+
+Certain methods in class \Date handle differences in the
+{Julian and Gregorian calendars}[rdoc-ref:calendars.rdoc@Julian+and+Gregorian+Calendars]
+by accepting an optional argument +start+, whose value may be:
+
+- Date::ITALY (the default): the created date is Julian
+  if before October 15, 1582, Gregorian otherwise:
+
+      d = Date.new(1582, 10, 15)
+      d.prev_day.julian? # => true
+      d.julian?          # => false
+      d.gregorian?       # => true
+
+- Date::ENGLAND: the created date is Julian if before September 14, 1752,
+  Gregorian otherwise:
+
+    d = Date.new(1752, 9, 14, Date::ENGLAND)
+    d.prev_day.julian? # => true
+    d.julian?          # => false
+    d.gregorian?       # => true
+
+- Date::JULIAN: the created date is Julian regardless of its value:
+
+    d = Date.new(1582, 10, 15, Date::JULIAN)
+    d.julian? # => true
+
+- Date::GREGORIAN: the created date is Gregorian regardless of its value:
+
+    d = Date.new(1752, 9, 14, Date::GREGORIAN)
+    d.prev_day.gregorian? # => true
+
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/examples/files.rdoc b/doc/examples/files.rdoc
new file mode 100644
index 0000000000..f736132770
--- /dev/null
+++ b/doc/examples/files.rdoc
@@ -0,0 +1,26 @@
+# English text with newlines.
+text = <<~EOT
+  First line
+  Second line
+
+  Fourth line
+  Fifth line
+EOT
+
+# Russian text.
+russian = "\u{442 435 441 442}" # => "тест"
+
+# Binary data.
+data = "\u9990\u9991\u9992\u9993\u9994"
+
+# Text file.
+File.write('t.txt', text)
+
+# File with Russian text.
+File.write('t.rus', russian)
+
+# File with binary data.
+f = File.new('t.dat', 'wb:UTF-16')
+f.write(data)
+f.close
+
diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index ada0fcf325..7e0c35194f 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -119,6 +119,10 @@ Yukihiro Matsumoto (matz)
   Masatoshi SEKI (seki), Takashi Kokubun (k0kubun)
   https://github.com/ruby/erb
   https://rubygems.org/gems/erb
+[lib/error_highlight.rb, lib/error_highlight/*]
+  Yusuke Endoh (mame)
+  https://github.com/ruby/error_highlight
+  https://rubygems.org/gems/error_highlight
 [lib/fileutils.rb]
   _unmaintained_
   https://github.com/ruby/fileutils
@@ -209,6 +213,10 @@ Yukihiro Matsumoto (matz)
   Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt)
   https://github.com/ruby/rdoc
   https://rubygems.org/gems/rdoc
+[lib/readline.rb]
+  aycabta
+  https://github.com/ruby/readline
+  https://rubygems.org/gems/readline
 [lib/reline.rb, lib/reline/*]
   aycabta
   https://github.com/ruby/reline
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/rdoc/markup_reference.rb b/doc/rdoc/markup_reference.rb
new file mode 100644
index 0000000000..66ec6786c0
--- /dev/null
+++ b/doc/rdoc/markup_reference.rb
@@ -0,0 +1,1257 @@
+require 'rdoc'
+
+# \Class \RDoc::MarkupReference exists only to provide a suitable home
+# for a reference document for \RDoc markup.
+#
+# All objects defined in this class -- classes, modules, methods, aliases,
+# attributes, and constants -- are solely for illustrating \RDoc markup,
+# and have no other legitimate use.
+#
+# = \RDoc Markup Reference
+#
+# Notes:
+#
+# - Examples in this reference are Ruby code and comments;
+#   certain differences from other sources
+#   (such as C code and comments) are noted.
+# - An example that shows rendered HTML output
+#   displays that output in a blockquote:
+#
+#   Rendered HTML:
+#   >>>
+#     Some stuff
+#
+# \RDoc-generated documentation is derived from and controlled by:
+#
+# - Single-line or multi-line comments that precede certain definitions;
+#   see {Markup in Comments}[rdoc-ref:RDoc::MarkupReference@Markup+in+Comments].
+# - \RDoc directives in trailing comments (on the same line as code);
+#   see <tt>:nodoc:</tt>, <tt>:doc:</tt>, and <tt>:notnew</tt>.
+# - \RDoc directives in single-line comments;
+#   see other {Directives}[rdoc-ref:RDoc::MarkupReference@Directives].
+# - The Ruby code itself (but not from C code);
+#   see {Documentation Derived from Ruby Code}[rdoc-ref:RDoc::MarkupReference@Documentation+Derived+from+Ruby+Code].
+#
+# == Markup in Comments
+#
+# The treatment of markup in comments varies according to the type of file:
+#
+# - <tt>.rb</tt> (Ruby code file): markup is parsed from Ruby comments.
+# - <tt>.c</tt> (C code file): markup is parsed from C comments.
+# - <tt>.rdoc</tt> (RDoc text file): markup is parsed from the entire file.
+#
+# The comment associated with
+# a Ruby class, module, method, alias, constant, or attribute
+# becomes the documentation for that defined object:
+#
+# - In a Ruby file, that comment immediately precedes
+#   the definition of the object.
+# - In a C file, that comment immediately precedes
+#   the function that implements a method,
+#   or otherwise immediately precedes the definition of the object.
+#
+# In either a Ruby or a C file,
+# \RDoc ignores comments that do not precede object definitions.
+#
+# In an \RDoc file, the text is not associated with any code object,
+# but may (depending on how the documentation is built),
+# become a separate page.
+#
+# Almost all examples on this page are all RDoc-like;
+# that is, they have no comment markers like Ruby <tt>#</tt>
+# or C <tt>/* ... */</tt>.
+#
+# === Margins
+#
+# In a multi-line comment,
+# \RDoc looks for the comment's natural left margin,
+# which becomes the <em>base margin</em> for the comment
+# and is the initial <em>current margin</em> for for the comment.
+#
+# The current margin can change, and does so, for example in a list.
+#
+# === Blocks
+#
+# It's convenient to think of \RDoc markup input as a sequence of _blocks_
+# of various types (details at the links):
+#
+# - {Paragraph}[rdoc-ref:RDoc::MarkupReference@Paragraphs]:
+#   an ordinary paragraph.
+# - {Verbatim text block}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks]:
+#   a block of text to be rendered literally.
+# - {Code block}[rdoc-ref:RDoc::MarkupReference@Code+Blocks]:
+#   a verbatim text block containing Ruby code,
+#   to be rendered with code highlighting.
+# - {Block quote}[rdoc-ref:RDoc::MarkupReference@Block+Quotes]:
+#   a longish quoted passage, to be rendered with indentation
+#   instead of quote marks.
+# - {List}[rdoc-ref:RDoc::MarkupReference@Lists]: items for
+#   a bullet list, numbered list, lettered list, or labeled list.
+# - {Heading}[rdoc-ref:RDoc::MarkupReference@Headings]:
+#   a section heading.
+# - {Horizontal rule}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules]:
+#   a line across the rendered page.
+# - {Directive}[rdoc-ref:RDoc::MarkupReference@Directives]:
+#   various special directions for the rendering.
+# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup]:
+#   text to be rendered in a special way.
+#
+# About the blocks:
+#
+# - Except for a paragraph, a block is distinguished by its indentation,
+#   or by unusual initial or embedded characters.
+# - Any block may appear independently
+#   (that is, not nested in another block);
+#   some blocks may be nested, as detailed below.
+#
+# ==== Paragraphs
+#
+# A paragraph consists of one or more non-empty lines of ordinary text,
+# each beginning at the current margin.
+#
+# Note: Here, <em>ordinary text</em> means text that is <em>not identified</em>
+# by indentation, or by unusual initial or embedded characters.
+# See below.
+#
+# Paragraphs are separated by one or more empty lines.
+#
+# Example input:
+#
+#   \RDoc produces HTML and command-line documentation for Ruby projects.
+#   \RDoc includes the rdoc and ri tools for generating and displaying
+#   documentation from the command-line.
+#
+#   You'll love it.
+#
+# Rendered HTML:
+# >>>
+#   \RDoc produces HTML and command-line documentation for Ruby projects.
+#   \RDoc includes the rdoc and ri tools for generating and displaying
+#   documentation from the command-line.
+#
+#   You'll love it.
+#
+# A paragraph may contain nested blocks, including:
+#
+# - {Verbatim text blocks}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks].
+# - {Code blocks}[rdoc-ref:RDoc::MarkupReference@Code+Blocks].
+# - {Block quotes}[rdoc-ref:RDoc::MarkupReference@Block+Quotes].
+# - {Lists}[rdoc-ref:RDoc::MarkupReference@Lists].
+# - {Headings}[rdoc-ref:RDoc::MarkupReference@Headings].
+# - {Horizontal rules}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules].
+# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
+#
+# ==== Verbatim Text Blocks
+#
+# Text indented farther than the current margin becomes a <em>verbatim text block</em>
+# (or a code block, described next).
+# In the rendered HTML, such text:
+#
+# - Is indented.
+# - Has a contrasting background color.
+#
+# The verbatim text block ends at the first line beginning at the current margin.
+#
+# Example input:
+#
+#   This is not verbatim text.
+#
+#     This is verbatim text.
+#       Whitespace is honored.     # See?
+#         Whitespace is honored.     # See?
+#
+#     This is still the same verbatim text block.
+#
+#   This is not verbatim text.
+#
+# Rendered HTML:
+# >>>
+#   This is not verbatim text.
+#
+#     This is verbatim text.
+#       Whitespace is honored.     # See?
+#         Whitespace is honored.     # See?
+#
+#     This is still the same verbatim text block.
+#
+#   This is not verbatim text.
+#
+# A verbatim text block may not contain nested blocks of any kind
+# -- it's verbatim.
+#
+# ==== Code Blocks
+#
+# A special case of verbatim text is the <em>code block</em>,
+# which is merely verbatim text that \RDoc recognizes as Ruby code:
+#
+# In the rendered HTML, the code block:
+#
+# - Is indented.
+# - Has a contrasting background color.
+# - Has syntax highlighting.
+#
+# Example input:
+#
+#   Consider this method:
+#
+#     def foo(name = '', value = 0)
+#       @name = name      # Whitespace is still honored.
+#       @value = value
+#     end
+#
+#
+# Rendered HTML:
+# >>>
+#   Consider this method:
+#
+#     def foo(name = '', value = 0)
+#       @name = name      # Whitespace is still honored.
+#       @value = value
+#     end
+#
+# Pro tip:  If your indented Ruby code does not get highlighted,
+# it may contain a syntax error.
+#
+# A code block may not contain nested blocks of any kind
+# -- it's verbatim.
+#
+# ==== Block Quotes
+#
+# You can use the characters <tt>>>></tt> (unindented),
+# followed by indented text, to treat the text
+# as a {block quote}[https://en.wikipedia.org/wiki/Block_quotation]:
+#
+# Example input:
+#
+#   Here's a block quote:
+#   >>>
+#     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer
+#     commodo quam iaculis massa posuere, dictum fringilla justo pulvinar.
+#     Quisque turpis erat, pharetra eu dui at, sollicitudin accumsan nulla.
+#
+#     Aenean congue ligula eu ligula molestie, eu pellentesque purus
+#     faucibus. In id leo non ligula condimentum lobortis. Duis vestibulum,
+#     diam in pellentesque aliquet, mi tellus placerat sapien, id euismod
+#     purus magna ut tortor.
+#
+# Rendered HTML:
+#
+# >>>
+#   Here's a block quote:
+#   >>>
+#     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer
+#     commodo quam iaculis massa posuere, dictum fringilla justo pulvinar.
+#     Quisque turpis erat, pharetra eu dui at, sollicitudin accumsan nulla.
+#
+#     Aenean congue ligula eu ligula molestie, eu pellentesque purus
+#     faucibus. In id leo non ligula condimentum lobortis. Duis vestibulum,
+#     diam in pellentesque aliquet, mi tellus placerat sapien, id euismod
+#     purus magna ut tortor.
+#
+# Note that, unlike verbatim text, single newlines are not honored,
+# but that a double newline begins a new paragraph in the block quote.
+#
+# A block quote may contain nested blocks, including:
+#
+# - Other block quotes.
+# - {Paragraphs}[rdoc-ref:RDoc::MarkupReference@Paragraphs].
+# - {Verbatim text blocks}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks].
+# - {Code blocks}[rdoc-ref:RDoc::MarkupReference@Code+Blocks].
+# - {Lists}[rdoc-ref:RDoc::MarkupReference@Lists].
+# - {Headings}[rdoc-ref:RDoc::MarkupReference@Headings].
+# - {Horizontal rules}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules].
+# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
+#
+# ==== Lists
+#
+# Each type of list item is marked by a special beginning:
+#
+# - Bullet list item: Begins with a hyphen or asterisk.
+# - Numbered list item: Begins with digits and a period.
+# - Lettered list item: Begins with an alphabetic character and a period.
+# - Labeled list item: Begins with one of:
+#   - Square-bracketed text.
+#   - A word followed by two colons.
+#
+# A list begins with a list item and continues, even across blank lines,
+# as long as list items of the same type are found at the same indentation level.
+#
+# A new list resets the current margin inward.
+# Additional lines of text aligned at that margin
+# are part of the continuing list item.
+#
+# A list item may be continued on additional lines that are aligned
+# with the first line.  See examples below.
+#
+# A list item may contain nested blocks, including:
+#
+# - Other lists of any type.
+# - {Paragraphs}[rdoc-ref:RDoc::MarkupReference@Paragraphs].
+# - {Verbatim text blocks}[rdoc-ref:RDoc::MarkupReference@Verbatim+Text+Blocks].
+# - {Code blocks}[rdoc-ref:RDoc::MarkupReference@Code+Blocks].
+# - {Block quotes}[rdoc-ref:RDoc::MarkupReference@Block+Quotes].
+# - {Headings}[rdoc-ref:RDoc::MarkupReference@Headings].
+# - {Horizontal rules}[rdoc-ref:RDoc::MarkupReference@Horizontal+Rules].
+# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
+#
+# ===== Bullet Lists
+#
+# A bullet list item begins with a hyphen or asterisk.
+#
+# Example input:
+#
+#   - An item.
+#   - Another.
+#   - An item spanning
+#     multiple lines.
+#
+#   * Yet another.
+#   - Last one.
+#
+# Rendered HTML:
+# >>>
+#   - An item.
+#   - Another.
+#   - An item spanning
+#     multiple lines.
+#
+#   * Yet another.
+#   - Last one.
+#
+# ===== Numbered Lists
+#
+# A numbered list item begins with digits and a period.
+#
+# The items are automatically re-numbered.
+#
+# Example input:
+#
+#   100. An item.
+#   10. Another.
+#   1. An item spanning
+#      multiple lines.
+#
+#   1. Yet another.
+#   1000. Last one.
+#
+# Rendered HTML:
+# >>>
+#   100. An item.
+#   10. Another.
+#   1. An item spanning
+#      multiple lines.
+#
+#   1. Yet another.
+#   1000. Last one.
+#
+# ===== Lettered Lists
+#
+# A numbered list item begins with a letters and a period.
+#
+# The items are automatically "re-lettered."
+#
+# Example input:
+#
+#   z. An item.
+#   y. Another.
+#   x. An item spanning
+#      multiple lines.
+#
+#   x. Yet another.
+#   a. Last one.
+#
+# Rendered HTML:
+# >>>
+#   z. An item.
+#   y. Another.
+#
+#   x. Yet another.
+#   a. Last one.
+#
+# ===== Labeled Lists
+#
+# A labeled list item begins with one of:
+#
+# - Square-bracketed text: the label and text are on two lines.
+# - A word followed by two colons: the label and text are on the same line.
+#
+# Example input:
+#
+#   [foo] An item.
+#   bat:: Another.
+#   [bag] An item spanning
+#         multiple lines.
+#
+#   [bar baz] Yet another.
+#   bam:: Last one.
+#
+# Rendered HTML:
+# >>>
+#   [foo] An item.
+#   bat:: Another.
+#   [bag] An item spanning
+#         multiple lines.
+#
+#   [bar baz] Yet another.
+#   bam:: Last one.
+#
+# ==== Headings
+#
+# A heading begins with up to six equal-signs, followed by heading text.
+# Whitespace between those and the heading text is optional.
+#
+# Examples:
+#
+#   = Section 1
+#   == Section 1.1
+#   === Section 1.1.1
+#   === Section 1.1.2
+#   == Section 1.2
+#   = Section 2
+#   = Foo
+#   == Bar
+#   === Baz
+#   ==== Bam
+#   ===== Bat
+#   ====== Bad
+#   ============Still a Heading (Level 6)
+#   \== Not a Heading
+#
+# A heading may contain only one type of nested block:
+#
+# - {Text Markup}[rdoc-ref:RDoc:MarkupReference@Text+Markup].
+#
+# ==== Horizontal Rules
+#
+# A horizontal rule consists of a line with three or more hyphens
+# and nothing more.
+#
+# Example input:
+#
+#   ---
+#   --- Not a horizontal rule.
+#
+#   -- Also not a horizontal rule.
+#   ---
+#
+# Rendered HTML:
+# >>>
+#   ---
+#   --- Not a horizontal rule.
+#
+#   -- Also not a horizontal rule.
+#   ---
+#
+# ==== Directives
+#
+# ===== Directives for Allowing or Suppressing Documentation
+#
+# - <tt># :stopdoc:</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies that \RDoc should ignore markup
+#     until next <tt>:startdoc:</tt> directive or end-of-file.
+#
+# - <tt># :startdoc:</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies that \RDoc should resume parsing markup.
+#
+# - <tt># :enddoc:</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies that \RDoc should ignore markup to end-of-file
+#     regardless of other directives.
+#
+# - <tt># :nodoc:</tt>:
+#
+#   - Appended to a line of code
+#     that defines a class, module, method, alias, constant, or attribute.
+#   - Specifies that the defined object should not be documented.
+#
+# - <tt># :nodoc: all</tt>:
+#
+#   - Appended to a line of code
+#     that defines a class or module.
+#   - Specifies that the class or module should not be documented.
+#     By default, however, a nested class or module _will_ be documented.
+#
+# - <tt># :doc:</tt>:
+#
+#   - Appended to a line of code
+#     that defines a class, module, method, alias, constant, or attribute.
+#   - Specifies the defined object should be documented, even if otherwise
+#     would not be documented.
+#
+# - <tt># :notnew:</tt> (aliased as <tt>:not_new:</tt> and <tt>:not-new:</tt>):
+#
+#   - Appended to a line of code
+#     that defines instance method +initialize+.
+#   - Specifies that singleton method +new+ should not be documented.
+#     By default, Ruby fakes a corresponding singleton method +new+,
+#     which \RDoc includes in the documentation.
+#     Note that instance method +initialize+ is private, and so by default
+#     is not documented.
+#
+# For Ruby code, but not for other \RDoc sources,
+# there is a shorthand for <tt>:stopdoc:</tt> and <tt>:startdoc:</tt>:
+#
+#   # Documented.
+#   #--
+#   # Not documented.
+#   #++
+#   # Documented.
+#
+# For C code, any of directives <tt>:startdoc:</tt>, <tt>:enddoc:</tt>,
+# and <tt>:nodoc:</tt> may appear in a stand-alone comment:
+#
+#   /* :startdoc: */
+#   /* :stopdoc: */
+#   /* :enddoc: */
+#
+# ===== Directive for Specifying \RDoc Source Format
+#
+# - <tt># :markup: _type_</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies the format for the \RDoc input;
+#     parameter +type+ is one of +markdown+, +rd+, +rdoc+, +tomdoc+.
+#
+# ===== Directives for HTML Output
+#
+# - <tt># :title: _text_</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies the title for the HTML output.
+#
+# - <tt># :main: _filename_</tt>:
+#   - Appears on a line by itself.
+#   - Specifies the HTML file to be displayed first.
+#
+# ===== Directives for Method Documentation
+#
+# - <tt># :call-seq:</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies the calling sequence to be reported in the HTML,
+#     overriding the actual calling sequence in the code.
+#     See method #call_seq_directive.
+#
+#   Note that \RDoc can build the calling sequence for a Ruby-coded method,
+#   but not for other languages.
+#   You may want to override that by explicitly giving a <tt>:call-seq:</tt>
+#   directive if you want to include:
+#
+#   - A return type, which is not automatically inferred.
+#   - Multiple calling sequences.
+#
+#   For C code, the directive may appear in a stand-alone comment.
+#
+# - <tt># :args: _arg_names_</tt> (aliased as <tt>:arg:</tt>):
+#
+#   - Appears on a line by itself.
+#   - Specifies the arguments to be reported in the HTML,
+#     overriding the actual arguments in the code.
+#     See method #args_directive.
+#
+# - <tt># :yields: _arg_names_</tt> (aliased as <tt>:yield:</tt>):
+#
+#   - Appears on a line by itself.
+#   - Specifies the yield arguments to be reported in the HTML,
+#     overriding the actual yield in the code.
+#     See method #yields_directive.
+#
+# ===== Directives for Organizing Documentation
+#
+# By default, \RDoc groups:
+#
+# - Singleton methods together in alphabetical order.
+# - Instance methods and their aliases together in alphabetical order.
+# - Attributes and their aliases together in alphabetical order.
+#
+# You can use directives to modify those behaviors.
+#
+# - <tt># :section: _section_title_</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies that following methods are to be grouped into the section
+#     with the given <em>section_title</em>,
+#     or into the default section if no title is given.
+#     The directive remains in effect until another such directive is given,
+#     but may be temporarily overridden by directive <tt>:category:</tt>.
+#     See below.
+#
+#   The comment block containing this directive:
+#
+#   - Must be separated by a blank line from the documentation for the next item.
+#   - May have one or more lines preceding the directive.
+#     These will be removed, along with any trailing lines that match them.
+#     Such lines may be visually helpful.
+#   - Lines of text that are not so removed become the descriptive text
+#     for the section.
+#
+#   Example:
+#
+#     # ----------------------------------------
+#     # :section: My Section
+#     # This is the section that I wrote.
+#     # See it glisten in the noon-day sun.
+#     # ----------------------------------------
+#
+#     ##
+#     # Comment for some_method
+#     def some_method
+#       # ...
+#     end
+#
+#   You can use directive <tt>:category:</tt> to temporarily
+#   override the current section.
+#
+# - <tt># :category: _section_title_</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies that just one following method is to be included
+#     in the given section, or in the default section if no title is given.
+#     Subsequent methods are to be grouped into the current section.
+#
+# ===== Directive for Including a File
+#
+# - <tt># :include: _filepath_</tt>:
+#
+#   - Appears on a line by itself.
+#   - Specifies that the contents of the given file
+#     are to be included at this point.
+#     The file content is shifted to have the same indentation as the colon
+#     at the start of the directive.
+#
+#     The file is searched for in the directories
+#     given with the <tt>--include</tt> command-line option,
+#     or by default in the current directory.
+#
+#   For C code, the directive may appear in a stand-alone comment
+#
+# ==== Text Markup
+#
+# Text markup is metatext that affects HTML rendering:
+#
+# - Typeface: italic, bold, monofont.
+# - Character conversions: copyright, trademark, certain punctuation.
+# - Links.
+# - Escapes: marking text as "not markup."
+#
+# ===== Typeface Markup
+#
+# Typeface markup can specify that text is to be rendered
+# as italic, bold, or monofont.
+#
+# Typeface markup may contain only one type of nested block:
+#
+# - More typeface markup:
+#   italic, bold, monofont.
+#
+# ====== Italic
+#
+# Text may be marked as italic via HTML tag <tt><i></tt> or <tt><em></tt>.
+#
+# Example input:
+#
+#   <i>Italicized words</i> in a paragraph.
+#
+#   >>>
+#     <i>Italicized words in a block quote</i>.
+#
+#   - <i>Italicized words</i> in a list item.
+#
+#   ====== <i>Italicized words</i> in a Heading
+#
+#   <i>Italicized passage containing *bold* and +monofont+.</i>
+#
+# Rendered HTML:
+# >>>
+#   <i>Italicized words</i> in a paragraph.
+#
+#   >>>
+#     <i>Italicized words in a block quote</i>.
+#
+#   - <i>Italicized words</i> in a list item.
+#
+#   ====== <i>Italicized words</i> in a Heading
+#
+#   <i>Italicized passage containing *bold* and +monofont+.</i>
+#
+# A single word may be italicized via a shorthand:
+# prefixed and suffixed underscores.
+#
+# Example input:
+#
+#   _Italic_ in a paragraph.
+#
+#   >>>
+#     _Italic_ in a block quote.
+#
+#   - _Italic_ in a list item.
+#
+#   ====== _Italic_ in a Heading
+#
+# Rendered HTML:
+# >>>
+#   _Italic_ in a paragraph.
+#
+#   >>>
+#     _Italic_ in a block quote.
+#
+#   - _Italic_ in a list item.
+#
+#   ====== _Italic_ in a Heading
+#
+# ====== Bold
+#
+# Text may be marked as bold via HTML tag <tt><b></tt>.
+#
+# Example input:
+#
+#   <b>Bold words</b> in a paragraph.
+#
+#   >>>
+#     <b>Bold words</b> in a block quote.
+#
+#   - <b>Bold words</b> in a list item.
+#
+#   ====== <b>Bold words</b> in a Heading
+#
+#   <b>Bold passage containing _italics_ and +monofont+.</b>
+#
+# Rendered HTML:
+#
+# >>>
+#   <b>Bold words</b> in a paragraph.
+#
+#   >>>
+#     <b>Bold words</b> in a block quote.
+#
+#   - <b>Bold words</b> in a list item.
+#
+#   ====== <b>Bold words</b> in a Heading
+#
+#   <b>Bold passage containing _italics_ and +monofont+.</b>
+#
+# A single word may be made bold via a shorthand:
+# prefixed and suffixed asterisks.
+#
+# Example input:
+#
+#   *Bold* in a paragraph.
+#
+#   >>>
+#     *Bold* in a block quote.
+#
+#   - *Bold* in a list item.
+#
+#   ===== *Bold* in a Heading
+#
+# Rendered HTML:
+#
+# >>>
+#   *Bold* in a paragraph.
+#
+#   >>>
+#     *Bold* in a block quote.
+#
+#   - *Bold* in a list item.
+#
+#   ===== *Bold* in a Heading
+#
+# ====== Monofont
+#
+# Text may be marked as monofont
+# -- sometimes called 'typewriter font' --
+# via HTML tag <tt><tt></tt> or <tt><code></tt>.
+#
+# Example input:
+#
+#   <tt>Monofont words</tt> in a paragraph.
+#
+#   >>>
+#     <tt>Monofont words</tt> in a block quote.
+#
+#   - <tt>Monofont words</tt> in a list item.
+#
+#   ====== <tt>Monofont words</tt> in heading
+#
+#   <tt>Monofont passage containing _italics_ and *bold*.</tt>
+#
+# Rendered HTML:
+#
+# >>>
+#   <tt>Monofont words</tt> in a paragraph.
+#
+#   >>>
+#     <tt>Monofont words</tt> in a block quote.
+#
+#   - <tt>Monofont words</tt> in a list item.
+#
+#   ====== <tt>Monofont words</tt> in heading
+#
+#   <tt>Monofont passage containing _italics_ and *bold*.</tt>
+#
+# A single word may be made monofont by a shorthand:
+# prefixed and suffixed plus-signs.
+#
+# Example input:
+#
+#   +Monofont+ in a paragraph.
+#
+#   >>>
+#     +Monofont+ in a block quote.
+#
+#   - +Monofont+ in a list item.
+#
+#   ====== +Monofont+ in a Heading
+#
+# Rendered HTML:
+#
+# >>>
+#   +Monofont+ in a paragraph.
+#
+#   >>>
+#     +Monofont+ in a block quote.
+#
+#   - +Monofont+ in a list item.
+#
+#   ====== +Monofont+ in a Heading
+#
+# ==== Character Conversions
+#
+# Certain combinations of characters may be converted to special characters;
+# whether the conversion occurs depends on whether the special character
+# is available in the current encoding.
+#
+# - <tt>(c)</tt> converts to (c) (copyright character); must be lowercase.
+#
+# - <tt>(r)</tt> converts to (r) (registered trademark character); must be lowercase.
+#
+# - <tt>'foo'</tt> converts to 'foo' (smart single-quotes).
+#
+# - <tt>"foo"</tt> converts to "foo" (smart double-quotes).
+#
+# - <tt>foo ... bar</tt> converts to foo ... bar (1-character ellipsis).
+#
+# - <tt>foo -- bar</tt> converts to foo -- bar (1-character en-dash).
+#
+# - <tt>foo --- bar</tt> converts to foo --- bar (1-character em-dash).
+#
+# ==== Links
+#
+# Certain strings in \RDoc text are converted to links.
+# Any such link may be suppressed by prefixing a backslash.
+# This section shows how to link to various
+# targets.
+#
+# [Class]
+#
+#   - On-page: <tt>DummyClass</tt> links to DummyClass.
+#   - Off-page: <tt>RDoc::Alias</tt> links to RDoc::Alias.
+#
+# [Module]
+#
+#   - On-page: <tt>DummyModule</tt> links to DummyModule.
+#   - Off-page: <tt>RDoc</tt> links to RDoc.
+#
+# [Constant]
+#
+#   - On-page: <tt>DUMMY_CONSTANT</tt> links to DUMMY_CONSTANT.
+#   - Off-page: <tt>RDoc::Text::MARKUP_FORMAT</tt> links to RDoc::Text::MARKUP_FORMAT.
+#
+# [Singleton Method]
+#
+#   - On-page: <tt>::dummy_singleton_method</tt> links to ::dummy_singleton_method.
+#   - Off-page<tt>RDoc::TokenStream::to_html</tt> links to RDoc::TokenStream::to_html.
+#
+#   Note: Occasionally \RDoc is not linked to a method whose name
+#   has only special characters. Check whether the links you were expecting
+#   are actually there.  If not, you'll need to put in an explicit link;
+#   see below.
+#
+#   Pro tip: The link to any method is available in the alphabetical table of contents
+#   at the top left of the page for the class or module.
+#
+# [Instance Method]
+#
+#   - On-page: <tt>#dummy_instance_method</tt> links to #dummy_instance_method.
+#   - Off-page: <tt>RDoc::Alias#html_name</tt> links to RDoc::Alias#html_name.
+#
+#     See the Note and Pro Tip immediately above.
+#
+# [Attribute]
+#
+#   - On-page: <tt>#dummy_attribute</tt> links to #dummy_attribute.
+#   - Off-page: <tt>RDoc::Alias#name</tt> links to RDoc::Alias#name.
+#
+# [Alias]
+#
+#   - On-page: <tt>#dummy_instance_alias</tt> links to #dummy_instance_alias.
+#   - Off-page: <tt>RDoc::Alias#new_name</tt> links to RDoc::Alias#new_name.
+#
+# [Protocol +http+]
+#
+#   - Linked: <tt>http://yahoo.com</tt> links to http://yahoo.com.
+#
+# [Protocol +https+]
+#
+#   - Linked: <tt>https://github.com</tt> links to https://github.com.
+#
+# [Protocol +www+]
+#
+#   - Linked: <tt>www.yahoo.com</tt> links to www.yahoo.com.
+#
+# [Protocol +ftp+]
+#
+#   - Linked: <tt>ftp://nosuch.site</tt> links to ftp://nosuch.site.
+#
+# [Protocol +mailto+]
+#
+#   - Linked:  <tt>mailto:/foo@bar.com</tt> links to mailto://foo@bar.com.
+#
+# [Protocol +irc+]
+#
+#   - link: <tt>irc://irc.freenode.net/ruby</tt> links to irc://irc.freenode.net/ruby.
+#
+# [Image Filename Extensions]
+#
+#   - Link: <tt>https://www.ruby-lang.org/images/header-ruby-logo@2x.png</tt> is
+#     converted to an in-line HTML +img+ tag, which displays the image in the HTML:
+#
+#     https://www.ruby-lang.org/images/header-ruby-logo@2x.png
+#
+#     Also works for +bmp+, +gif+, +jpeg+, and +jpg+ files.
+#
+#     Note: Works only for a fully qualified URL.
+#
+# [Heading]
+#
+#   - Link: <tt>RDoc::RD@LICENSE</tt> links to RDoc::RDoc::RD@LICENSE.
+#
+#   Note that spaces in the actual heading are represented by <tt>+</tt> characters
+#   in the linkable text.
+#
+#   - Link: <tt>RDoc::Options@Saved+Options</tt>
+#     links to RDoc::Options@Saved+Options.
+#
+#   Punctuation and other special characters must be escaped like CGI.escape.
+#
+#   Pro tip: The link to any heading is available in the alphabetical table of contents
+#   at the top left of the page for the class or module.
+#
+# [Section]
+#
+#   See {Directives for Organizing Documentation}[#class-RDoc::MarkupReference-label-Directives+for+Organizing+Documentation].
+#
+#   - Link: <tt>RDoc::Markup::ToHtml@Visitor</tt> links to RDoc::Markup::ToHtml@Visitor.
+#
+#   If a section and a heading share the same name, the link target is the section.
+#
+# [Single-Word Text Link]
+#
+#   Use square brackets to create single-word text link:
+#
+#   - <tt>GitHub[https://github.com]</tt> links to GitHub[https://github.com].
+#
+# [Multi-Word Text Link]
+#
+#   Use square brackets and curly braces to create a multi-word text link.
+#
+#   - <tt>{GitHub home page}[https://github.com]</tt> links to
+#     {GitHub home page}[https://github.com].
+#
+# [<tt>rdoc-ref</tt> Scheme]
+#
+#   A link with the <tt>rdoc-ref:</tt> scheme links to the referenced item,
+#   if that item exists.
+#   The referenced item may be a class, module, method, file, etc.
+#
+#   - Class: <tt>Alias[rdoc-ref:RDoc::Alias]</tt> links to Alias[rdoc-ref:RDoc::Alias].
+#   - Module: <tt>RDoc[rdoc-ref:RDoc]</tt> links to RDoc[rdoc-ref:RDoc].
+#   - Method: <tt>foo[rdoc-ref:RDoc::Markup::ToHtml#handle_regexp_RDOCLINK]</tt>
+#     links to foo[rdoc-ref:RDoc::Markup::ToHtml#handle_regexp_RDOCLINK].
+#   - Constant: <tt>bar[rdoc-ref:RDoc::Markup::ToHtml::LIST_TYPE_TO_HTML]</tt>
+#     links to bar[rdoc-ref:RDoc::Markup::ToHtml::LIST_TYPE_TO_HTML].
+#   - Attribute: <tt>baz[rdoc-ref:RDoc::Markup::ToHtml#code_object]</tt>
+#     links to baz[rdoc-ref:RDoc::Markup::ToHtml#code_object].
+#   - Alias: <tt>bad[rdoc-ref:RDoc::MarkupReference#dummy_instance_alias]</tt> links to
+#     bad[rdoc-ref:RDoc::MarkupReference#dummy_instance_alias].
+#
+#   If the referenced item does not exist, no link is generated
+#   and entire <tt>rdoc-ref:</tt> square-bracketed clause is removed
+#   from the resulting text.
+#
+#   - <tt>Nosuch[rdoc-ref:RDoc::Nosuch]</tt> is rendered as
+#     Nosuch[rdoc-ref:RDoc::Nosuch].
+#
+#
+# [<tt>rdoc-label</tt> Scheme]
+#
+#   [Simple]
+#
+#     You can specify a link target using this form,
+#     where the second part cites the id of an HTML element.
+#
+#     This link refers to the constant +DUMMY_CONSTANT+ on this page:
+#
+#     - <tt>{DUMMY_CONSTANT}[rdoc-label:DUMMY_CONSTANT]</tt>
+#
+#     Thus:
+#
+#     {DUMMY_CONSTANT}[rdoc-label:DUMMY_CONSTANT]
+#
+#   [With Return]
+#
+#     You can specify both a link target and a local label
+#     that can be used as the target for a return link.
+#     These two links refer to each other:
+#
+#     - <tt>{go to addressee}[rdoc-label:addressee:sender]</tt>
+#     - <tt>{return to sender}[rdoc-label:sender:addressee]</tt>
+#
+#     Thus:
+#
+#     {go to addressee}[rdoc-label:addressee:sender]
+#
+#     Some text.
+#
+#     {return to sender}[rdoc-label:sender:addressee]
+#
+# [<tt>link:</tt> Scheme]
+#
+#   - <tt>link:README_rdoc.html</tt> links to link:README_rdoc.html.
+#
+# [<tt>rdoc-image</tt> Scheme]
+#
+#   Use the <tt>rdoc-image</tt> scheme to display an image that is also a link:
+#
+#     # {rdoc-image:path/to/image}[link_target]
+#
+#   - Link: <tt>{rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[https://www.ruby-lang.org]</tt>
+#     displays image <tt>https://www.ruby-lang.org/images/header-ruby-logo@2x.png</tt>
+#     as a link to <tt>https://www.ruby-lang.org</tt>.
+#
+#     {rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[https://www.ruby-lang.org]
+#
+#   A relative path as the target also works:
+#
+#   - Link: <tt>{rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[./Alias.html]</tt> links to <tt>./Alias.html</tt>
+#
+#     {rdoc-image:https://www.ruby-lang.org/images/header-ruby-logo@2x.png}[./Alias.html]
+#
+# === Escaping Text
+#
+# Text that would otherwise be interpreted as markup
+# can be "escaped," so that it is not interpreted as markup;
+# the escape character is the backslash (<tt>'\\'</tt>).
+#
+# In a verbatim text block or a code block,
+# the escape character is always preserved:
+#
+# Example input:
+#
+#   This is not verbatim text.
+#
+#     This is verbatim text, with an escape character \.
+#
+#   This is not a code block.
+#
+#     def foo
+#       'String with an escape character.'
+#     end
+#
+# Rendered HTML:
+#
+# >>>
+#   This is not verbatim text.
+#
+#     This is verbatim text, with an escape character \.
+#
+#   This is not a code block.
+#
+#     def foo
+#       'This is a code block with an escape character \.'
+#     end
+#
+# In typeface markup (italic, bold, or monofont),
+# an escape character is preserved unless it is immediately
+# followed by nested typeface markup.
+#
+# Example input:
+#
+#   This list is about escapes; it contains:
+#
+#   - <tt>Monofont text with unescaped nested _italic_</tt>.
+#   - <tt>Monofont text with escaped nested \_italic_</tt>.
+#   - <tt>Monofont text with an escape character \</tt>.
+#
+# Rendered HTML:
+#
+# >>>
+#   This list is about escapes; it contains:
+#
+#   - <tt>Monofont text with unescaped nested _italic_</tt>.
+#   - <tt>Monofont text with escaped nested \_italic_</tt>.
+#   - <tt>Monofont text with an escape character \ </tt>.
+#
+# In other text-bearing blocks
+# (paragraphs, block quotes, list items, headings):
+#
+# - A single escape character immediately followed by markup
+#   escapes the markup.
+# - A single escape character followed by whitespace is preserved.
+# - A single escape character anywhere else is ignored.
+# - A double escape character is rendered as a single backslash.
+#
+#   Example input:
+#
+#     This list is about escapes; it contains:
+#
+#     - An unescaped class name, RDoc, that will become a link.
+#     - An escaped class name, \RDoc, that will not become a link.
+#     - An escape character followed by whitespace \ .
+#     - An escape character \that is ignored.
+#     - A double escape character \\ that is rendered
+#       as a single backslash.
+#
+#   Rendered HTML:
+#
+#   >>>
+#     This list is about escapes; it contains:
+#
+#     - An unescaped class name, RDoc, that will become a link.
+#     - An escaped class name, \RDoc, that will not become a link.
+#     - An escape character followed by whitespace \ .
+#     - An escape character \that is ignored.
+#     - A double escape character \\ that is rendered
+#       as a single backslash.
+#
+# == Documentation Derived from Ruby Code
+#
+# [Class]
+#
+#   By default, \RDoc documents:
+#
+#   - \Class name.
+#   - Parent class.
+#   - Singleton methods.
+#   - Instance methods.
+#   - Aliases.
+#   - Constants.
+#   - Attributes.
+#
+# [Module]
+#
+#   By default, \RDoc documents:
+#
+#   - \Module name.
+#   - \Singleton methods.
+#   - Instance methods.
+#   - Aliases.
+#   - Constants.
+#   - Attributes.
+#
+# [Method]
+#
+#   By default, \RDoc documents:
+#
+#   - \Method name.
+#   - Arguments.
+#   - Yielded values.
+#
+#   See #method.
+#
+# [Alias]
+#
+#   By default, \RDoc documents:
+#
+#   - Alias name.
+#   - Aliased name.
+#
+#   See #dummy_instance_alias and #dummy_instance_method.
+#
+# [Constant]
+#
+#   By default, \RDoc documents:
+#
+#   - \Constant name.
+#
+#   See DUMMY_CONSTANT.
+#
+# [Attribute]
+#
+#   By default, \RDoc documents:
+#
+#   - Attribute name.
+#   - Attribute type (<tt>[R]</tt>, <tt>[W]</tt>, or <tt>[RW]</tt>)
+#
+#   See #dummy_attribute.
+#
+class RDoc::MarkupReference
+
+  class DummyClass; end
+  module DummyModule; end
+  def self.dummy_singleton_method(foo, bar); end
+  def dummy_instance_method(foo, bar); end;
+  alias dummy_instance_alias dummy_instance_method
+  attr_accessor :dummy_attribute
+  alias dummy_attribute_alias dummy_attribute
+  DUMMY_CONSTANT = ''
+
+  # :call-seq:
+  #   call_seq_directive(foo, bar)
+  #   Can be anything -> bar
+  #   Also anything more -> baz or bat
+  #
+  # The <tt>:call-seq:</tt> directive overrides the actual calling sequence
+  # found in the Ruby code.
+  #
+  # - It can specify anything at all.
+  # - It can have multiple calling sequences.
+  #
+  # This one includes <tt>Can be anything -> foo</tt>, which is nonsense.
+  #
+  # Note that the "arrow" is two characters, hyphen and right angle-bracket,
+  # which is made into a single character in the HTML.
+  #
+  # Click on the calling sequence to see the code.
+  #
+  # Here is the <tt>:call-seq:</tt> directive given for the method:
+  #
+  #   :call-seq:
+  #     call_seq_directive(foo, bar)
+  #     Can be anything -> bar
+  #     Also anything more -> baz or bat
+  #
+  def call_seq_directive
+    nil
+  end
+
+  # The <tt>:args:</tt> directive overrides the actual arguments found in the Ruby code.
+  #
+  # Click on the calling sequence to see the code.
+  #
+  def args_directive(foo, bar) # :args: baz
+    nil
+  end
+
+  # The <tt>:yields:</tt> directive overrides the actual yield found in the Ruby code.
+  #
+  # Click on the calling sequence to see the code.
+  #
+  def yields_directive(foo, bar) # :yields: 'bat'
+    yield 'baz'
+  end
+
+  # This method is documented only by \RDoc, except for these comments.
+  #
+  # Click on the calling sequence to see the code.
+  #
+  def method(foo, bar)
+    yield 'baz'
+  end
+
+end
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 2b6a870026..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
 
@@ -550,12 +550,16 @@ characters, <i>anchoring</i> the match to a specific position.
 * <tt>(?<!</tt><i>pat</i><tt>)</tt> - <i>Negative lookbehind</i>
   assertion: ensures that the preceding characters do not match
   <i>pat</i>, but doesn't include those characters in the matched text
-* <tt>\K</tt> - Uses an positive lookbehind of the content preceding
-  <tt>\K</tt> in the regexp.  For example, the following two regexps are
-  almost equivalent:
 
-      /ab\Kc/
-      /(?<=ab)c/
+* <tt>\K</tt> - <i>Match reset</i>: the matched content preceding
+  <tt>\K</tt> in the regexp is excluded from the result.  For example,
+  the following two regexps are almost equivalent:
+
+      /ab\Kc/ =~ "abc"     #=> 0
+      /(?<=ab)c/ =~ "abc"  #=> 2
+
+  These match same string and <i>$&</i> equals <tt>"c"</tt>, while the
+  matched position is different.
 
   As are the following two regexps:
 
@@ -620,6 +624,11 @@ Options may also be used with <tt>Regexp.new</tt>:
     Regexp.new("abc # Comment", Regexp::EXTENDED)             #=> /abc # Comment/x
     Regexp.new("abc", Regexp::IGNORECASE | Regexp::MULTILINE) #=> /abc/mi
 
+    Regexp.new("abc", "i")           #=> /abc/i
+    Regexp.new("abc", "m")           #=> /abc/m
+    Regexp.new("abc # Comment", "x") #=> /abc # Comment/x
+    Regexp.new("abc", "im")          #=> /abc/mi
+
 == Free-Spacing Mode and Comments
 
 As mentioned above, the <tt>x</tt> option enables <i>free-spacing</i>
@@ -772,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
@@ -787,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/standard_library.rdoc b/doc/standard_library.rdoc
index 1d3580163e..7c9938c5b0 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -31,12 +31,12 @@ Benchmark:: Provides methods to measure and report the time used to execute code
 Bundler:: Manage your Ruby application's gem dependencies
 CGI:: Support for the Common Gateway Interface protocol
 CSV:: Provides an interface to read and write CSV files and data
-DEBUGGER__:: Debugging functionality for Ruby
 Delegator:: Provides three abilities to delegate method calls to an object
 DidYouMean:: "Did you mean?" experience in Ruby
 DRb:: Distributed object system for Ruby
 English:: Provides references to special global variables with less cryptic names
 ERB:: An easy to use but powerful templating system for Ruby
+ErrorHighlight:: Highlight error location in your code
 FileUtils:: Several file utility methods for copying, moving, removing, etc
 Find:: This module supports top-down traversal of a set of file paths
 Forwardable:: Provides delegation of specified methods to a designated object
@@ -54,6 +54,8 @@ OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
 PP:: Provides a PrettyPrinter for Ruby objects
 PrettyPrinter:: Implements a pretty printing algorithm for readable structure
 PStore:: Implements a file based persistence mechanism based on a Hash
+Readline:: Wrapper for Readline extencion and Reline
+Reline:: GNU Readline and Editline by pure Ruby implementation.
 Resolv::  Thread-aware DNS resolver library in Ruby
 resolv-replace.rb:: Replace Socket DNS with Resolv
 RDoc:: Produces HTML and command-line documentation for Ruby
@@ -113,3 +115,4 @@ Matrix:: Represents a mathematical matrix.
 Prime:: Prime numbers and factorization library
 RBS:: RBS is a language to describe the structure of Ruby programs
 TypeProf:: A type analysis tool for Ruby code based on abstract interpretation
+DEBUGGER__:: Debugging functionality for Ruby
diff --git a/doc/strftime_formatting.rdoc b/doc/strftime_formatting.rdoc
new file mode 100644
index 0000000000..30a629bf68
--- /dev/null
+++ b/doc/strftime_formatting.rdoc
@@ -0,0 +1,527 @@
+== Formats for Dates and Times
+
+Several Ruby time-related classes have instance method +strftime+,
+which returns a formatted string representing all or part of a date or time:
+
+- Date#strftime.
+- DateTime#strftime.
+- Time#strftime.
+
+Each of these methods takes optional argument +format+,
+which has zero or more embedded _format_ _specifications_ (see below).
+
+Each of these methods returns the string resulting from replacing each
+format specification embedded in +format+ with a string form
+of one or more parts of the date or time.
+
+A simple example:
+
+  Time.now.strftime('%H:%M:%S') # => "14:02:07"
+
+A format specification has the form:
+
+  %[flags][width]conversion
+
+It consists of:
+
+- A leading percent character.
+- Zero or more _flags_ (each is a character).
+- An optional _width_ _specifier_ (an integer).
+- A _conversion_ _specifier_ (a character).
+
+Except for the leading percent character,
+the only required part is the conversion specifier, so we begin with that.
+
+=== Conversion Specifiers
+
+==== \Date (Year, Month, Day)
+
+- <tt>%Y</tt> - Year including century, zero-padded:
+
+    Time.now.strftime('%Y')        # => "2022"
+    Time.new(-1000).strftime('%Y') # => "-1000" # Before common era.
+    Time.new(10000).strftime('%Y') # => "10000" # Far future.
+    Time.new(10).strftime('%Y')    # => "0010"  # Zero-padded by default.
+
+- <tt>%y</tt> - Year without century, in range (0.99), zero-padded:
+
+    Time.now.strftime('%y')    # => "22"
+    Time.new(1).strftime('%y') # => "01" # Zero-padded by default.
+
+- <tt>%C</tt> - Century, zero-padded:
+
+    Time.now.strftime('%C')        # => "20"
+    Time.new(-1000).strftime('%C') # => "-10" # Before common era.
+    Time.new(10000).strftime('%C') # => "100" # Far future.
+    Time.new(100).strftime('%C')   # => "01"  # Zero-padded by default.
+
+- <tt>%m</tt> - Month of the year, in range (1..12), zero-padded:
+
+    Time.new(2022, 1).strftime('%m')  # => "01" # Zero-padded by default.
+    Time.new(2022, 12).strftime('%m') # => "12"
+
+- <tt>%B</tt> - Full month name, capitalized:
+
+    Time.new(2022, 1).strftime('%B')  # => "January"
+    Time.new(2022, 12).strftime('%B') # => "December"
+
+- <tt>%b</tt> - Abbreviated month name, capitalized:
+
+    Time.new(2022, 1).strftime('%b')  # => "Jan"
+    Time.new(2022, 12).strftime('%h') # => "Dec"
+
+- <tt>%h</tt> - Same as <tt>%b</tt>.
+
+- <tt>%d</tt> - Day of the month, in range (1..31), zero-padded:
+
+    Time.new(2002, 1, 1).strftime('%d')  # => "01"
+    Time.new(2002, 1, 31).strftime('%d') # => "31"
+
+- <tt>%e</tt> - Day of the month, in range (1..31), blank-padded:
+
+    Time.new(2002, 1, 1).strftime('%e')  # => " 1"
+    Time.new(2002, 1, 31).strftime('%e') # => "31"
+
+- <tt>%j</tt> - Day of the year, in range (1..366), zero-padded:
+
+    Time.new(2002, 1, 1).strftime('%j')   # => "001"
+    Time.new(2002, 12, 31).strftime('%j') # => "365"
+
+==== \Time (Hour, Minute, Second, Subsecond)
+
+- <tt>%H</tt> - Hour of the day, in range (0..23), zero-padded:
+
+    Time.new(2022, 1, 1, 1).strftime('%H')  # => "01"
+    Time.new(2022, 1, 1, 13).strftime('%H') # => "13"
+
+- <tt>%k</tt> - Hour of the day, in range (0..23), blank-padded:
+
+    Time.new(2022, 1, 1, 1).strftime('%k')  # => " 1"
+    Time.new(2022, 1, 1, 13).strftime('%k') # => "13"
+
+- <tt>%I</tt> - Hour of the day, in range (1..12), zero-padded:
+
+    Time.new(2022, 1, 1, 1).strftime('%I')  # => "01"
+    Time.new(2022, 1, 1, 13).strftime('%I') # => "01"
+
+- <tt>%l</tt> - Hour of the day, in range (1..12), blank-padded:
+
+    Time.new(2022, 1, 1, 1).strftime('%l')  # => " 1"
+    Time.new(2022, 1, 1, 13).strftime('%l') # => " 1"
+
+- <tt>%P</tt> - Meridian indicator, lowercase:
+
+    Time.new(2022, 1, 1, 1).strftime('%P')  # => "am"
+    Time.new(2022, 1, 1, 13).strftime('%P') # => "pm"
+
+- <tt>%p</tt> - Meridian indicator, uppercase:
+
+    Time.new(2022, 1, 1, 1).strftime('%p')  # => "AM"
+    Time.new(2022, 1, 1, 13).strftime('%p') # => "PM"
+
+- <tt>%M</tt> - Minute of the hour, in range (0..59), zero-padded:
+
+    Time.new(2022, 1, 1, 1, 0, 0).strftime('%M') # => "00"
+
+- <tt>%S</tt> - Second of the minute in range (0..59), zero-padded:
+
+    Time.new(2022, 1, 1, 1, 0, 0, 0).strftime('%S') # => "00"
+
+- <tt>%L</tt> - Millisecond of the second, in range (0..999), zero-padded:
+
+    Time.new(2022, 1, 1, 1, 0, 0, 0).strftime('%L') # => "000"
+
+- <tt>%N</tt> - Fractional seconds, default width is 9 digits (nanoseconds):
+
+    t = Time.now       # => 2022-06-29 07:10:20.3230914 -0500
+    t.strftime('%N')   # => "323091400"                  # Default.
+
+  Use {width specifiers}[rdoc-ref:strftime_formatting.rdoc@Width+Specifiers]
+  to adjust units:
+
+      t.strftime('%3N')  # => "323"                      # Milliseconds.
+      t.strftime('%6N')  # => "323091"                   # Microseconds.
+      t.strftime('%9N')  # => "323091400"                # Nanoseconds.
+      t.strftime('%12N') # => "323091400000"             # Picoseconds.
+      t.strftime('%15N') # => "323091400000000"          # Femptoseconds.
+      t.strftime('%18N') # => "323091400000000000"       # Attoseconds.
+      t.strftime('%21N') # => "323091400000000000000"    # Zeptoseconds.
+      t.strftime('%24N') # => "323091400000000000000000" # Yoctoseconds.
+
+- <tt>%s</tt> - Number of seconds since the epoch:
+
+    Time.now.strftime('%s') # => "1656505136"
+
+==== Timezone
+
+- <tt>%z</tt> - Timezone as hour and minute offset from UTC:
+
+    Time.now.strftime('%z') # => "-0500"
+
+- <tt>%Z</tt> - Timezone name (platform-dependent):
+
+    Time.now.strftime('%Z') # => "Central Daylight Time"
+
+==== Weekday
+
+- <tt>%A</tt> - Full weekday name:
+
+    Time.now.strftime('%A') # => "Wednesday"
+
+- <tt>%a</tt> - Abbreviated weekday name:
+
+    Time.now.strftime('%a') # => "Wed"
+
+- <tt>%u</tt> - Day of the week, in range (1..7), Monday is 1:
+
+    t = Time.new(2022, 6, 26) # => 2022-06-26 00:00:00 -0500
+    t.strftime('%a')          # => "Sun"
+    t.strftime('%u')          # => "7"
+
+- <tt>%w</tt> - Day of the week, in range (0..6), Sunday is 0:
+
+    t = Time.new(2022, 6, 26) # => 2022-06-26 00:00:00 -0500
+    t.strftime('%a')          # => "Sun"
+    t.strftime('%w')          # => "0"
+
+==== Week Number
+
+- <tt>%U</tt> - Week number of the year, in range (0..53), zero-padded,
+  where each week begins on a Sunday:
+
+    t = Time.new(2022, 6, 26) # => 2022-06-26 00:00:00 -0500
+    t.strftime('%a')          # => "Sun"
+    t.strftime('%U')          # => "26"
+
+- <tt>%W</tt> - Week number of the year, in range (0..53), zero-padded,
+  where each week begins on a Monday:
+
+    t = Time.new(2022, 6, 26) # => 2022-06-26 00:00:00 -0500
+    t.strftime('%a')          # => "Sun"
+    t.strftime('%W')          # => "25"
+
+==== Week Dates
+
+See {ISO 8601 week dates}[https://en.wikipedia.org/wiki/ISO_8601#Week_dates].
+
+    t0 = Time.new(2023, 1, 1) # => 2023-01-01 00:00:00 -0600
+    t1 = Time.new(2024, 1, 1) # => 2024-01-01 00:00:00 -0600
+
+- <tt>%G</tt> - Week-based year:
+
+    t0.strftime('%G') # => "2022"
+    t1.strftime('%G') # => "2024"
+
+- <tt>%g</tt> - Week-based year without century, in range (0..99), zero-padded:
+
+    t0.strftime('%g') # => "22"
+    t1.strftime('%g') # => "24"
+
+- <tt>%V</tt> - Week number of the week-based year, in range (1..53),
+  zero-padded:
+
+    t0.strftime('%V') # => "52"
+    t1.strftime('%V') # => "01"
+
+==== Literals
+
+- <tt>%n</tt> - Newline character "\n":
+
+    Time.now.strftime('%n') # => "\n"
+
+- <tt>%t</tt> - Tab character "\t":
+
+    Time.now.strftime('%t') # => "\t"
+
+- <tt>%%</tt> - Percent character '%':
+
+    Time.now.strftime('%%') # => "%"
+
+==== Shorthand Conversion Specifiers
+
+Each shorthand specifier here is shown with its corresponding
+longhand specifier.
+
+- <tt>%c</tt> - \Date and time:
+
+    Time.now.strftime('%c')             # => "Wed Jun 29 08:01:41 2022"
+    Time.now.strftime('%a %b %e %T %Y') # => "Wed Jun 29 08:02:07 2022"
+
+- <tt>%D</tt> - \Date:
+
+    Time.now.strftime('%D')       # => "06/29/22"
+    Time.now.strftime('%m/%d/%y') # => "06/29/22"
+
+- <tt>%F</tt> - ISO 8601 date:
+
+    Time.now.strftime('%F')       # => "2022-06-29"
+    Time.now.strftime('%Y-%m-%d') # => "2022-06-29"
+
+- <tt>%v</tt> - VMS date:
+
+    Time.now.strftime('%v')         # => "29-JUN-2022"
+    Time.now.strftime('%e-%^b-%4Y') # => "29-JUN-2022"
+
+- <tt>%x</tt> - Same as <tt>%D</tt>.
+
+- <tt>%X</tt> - Same as <tt>%T</tt>.
+
+- <tt>%r</tt> - 12-hour time:
+
+    Time.new(2022, 1, 1, 1).strftime('%r')           # => "01:00:00 AM"
+    Time.new(2022, 1, 1, 1).strftime('%I:%M:%S %p')  # => "01:00:00 AM"
+    Time.new(2022, 1, 1, 13).strftime('%r')          # => "01:00:00 PM"
+    Time.new(2022, 1, 1, 13).strftime('%I:%M:%S %p') # => "01:00:00 PM"
+
+- <tt>%R</tt> - 24-hour time:
+
+    Time.new(2022, 1, 1, 1).strftime('%R')     # => "01:00"
+    Time.new(2022, 1, 1, 1).strftime('%H:%M')  # => "01:00"
+    Time.new(2022, 1, 1, 13).strftime('%R')    # => "13:00"
+    Time.new(2022, 1, 1, 13).strftime('%H:%M') # => "13:00"
+
+- <tt>%T</tt> - 24-hour time:
+
+    Time.new(2022, 1, 1, 1).strftime('%T')        # => "01:00:00"
+    Time.new(2022, 1, 1, 1).strftime('%H:%M:%S')  # => "01:00:00"
+    Time.new(2022, 1, 1, 13).strftime('%T')       # => "13:00:00"
+    Time.new(2022, 1, 1, 13).strftime('%H:%M:%S') # => "13:00:00"
+
+- <tt>%+</tt> (not supported in Time#strftime) - \Date and time:
+
+    DateTime.now.strftime('%+')
+    # => "Wed Jun 29 08:31:53 -05:00 2022"
+    DateTime.now.strftime('%a %b %e %H:%M:%S %Z %Y')
+    # => "Wed Jun 29 08:32:18 -05:00 2022"
+
+=== Flags
+
+Flags may affect certain formatting specifications.
+
+Multiple flags may be given with a single conversion specified;
+order does not matter.
+
+==== Padding Flags
+
+- <tt>0</tt> - Pad with zeroes:
+
+    Time.new(10).strftime('%0Y') # => "0010"
+
+- <tt>_</tt> - Pad with blanks:
+
+    Time.new(10).strftime('%_Y') # => "  10"
+
+- <tt>-</tt> - Don't pad:
+
+    Time.new(10).strftime('%-Y') # => "10"
+
+==== Casing Flags
+
+- <tt>^</tt> - Upcase result:
+
+    Time.new(2022, 1).strftime('%B')  # => "January" # No casing flag.
+    Time.new(2022, 1).strftime('%^B') # => "JANUARY"
+
+- <tt>#</tt> - Swapcase result:
+
+    Time.now.strftime('%p')  # => "AM"
+    Time.now.strftime('%^p') # => "AM"
+    Time.now.strftime('%#p') # => "am"
+
+==== Timezone Flags
+
+- <tt>:</tt> - Put timezone as colon-separated hours and minutes:
+
+    Time.now.strftime('%:z')  # => "-05:00"
+
+- <tt>::</tt> - Put timezone as colon-separated hours, minutes, and seconds:
+
+    Time.now.strftime('%::z') # => "-05:00:00"
+
+=== Width Specifiers
+
+The integer width specifier gives a minimum width for the returned string:
+
+  Time.new(2002).strftime('%Y')       # => "2002"     # No width specifier.
+  Time.new(2002).strftime('%10Y')     # => "0000002002"
+  Time.new(2002, 12).strftime('%B')   # => "December" # No width specifier.
+  Time.new(2002, 12).strftime('%10B') # => "  December"
+  Time.new(2002, 12).strftime('%3B')  # => "December" # Ignored if too small.
+
+== Specialized Format Strings
+
+Here are a few specialized format strings,
+each based on an external standard.
+
+=== HTTP Format
+
+The HTTP date format is based on
+{RFC 2616}[https://datatracker.ietf.org/doc/html/rfc2616],
+and treats dates in the format <tt>'%a, %d %b %Y %T GMT'</tt>:
+
+  d = Date.new(2001, 2, 3) # => #<Date: 2001-02-03>
+  # Return HTTP-formatted string.
+  httpdate = d.httpdate    # => "Sat, 03 Feb 2001 00:00:00 GMT"
+  # Return new date parsed from HTTP-formatted string.
+  Date.httpdate(httpdate)  # => #<Date: 2001-02-03>
+  # Return hash parsed from HTTP-formatted string.
+  Date._httpdate(httpdate)
+  # => {:wday=>6, :mday=>3, :mon=>2, :year=>2001, :hour=>0, :min=>0, :sec=>0, :zone=>"GMT", :offset=>0}
+
+=== RFC 3339 Format
+
+The RFC 3339 date format is based on
+{RFC 3339}[https://datatracker.ietf.org/doc/html/rfc3339]:
+
+  d = Date.new(2001, 2, 3) # => #<Date: 2001-02-03>
+  # Return 3339-formatted string.
+  rfc3339 = d.rfc3339      # => "2001-02-03T00:00:00+00:00"
+  # Return new date parsed from 3339-formatted string.
+  Date.rfc3339(rfc3339)    # => #<Date: 2001-02-03>
+  # Return hash parsed from 3339-formatted string.
+  Date._rfc3339(rfc3339)
+  # => {:year=>2001, :mon=>2, :mday=>3, :hour=>0, :min=>0, :sec=>0, :zone=>"+00:00", :offset=>0}
+
+=== RFC 2822 Format
+
+The RFC 2822 date format is based on
+{RFC 2822}[https://datatracker.ietf.org/doc/html/rfc2822],
+and treats dates in the format <tt>'%a, %-d %b %Y %T %z'</tt>]:
+
+  d = Date.new(2001, 2, 3) # => #<Date: 2001-02-03>
+  # Return 2822-formatted string.
+  rfc2822 = d.rfc2822      # => "Sat, 3 Feb 2001 00:00:00 +0000"
+  # Return new date parsed from 2822-formatted string.
+  Date.rfc2822(rfc2822)    # => #<Date: 2001-02-03>
+  # Return hash parsed from 2822-formatted string.
+  Date._rfc2822(rfc2822)
+  # => {:wday=>6, :mday=>3, :mon=>2, :year=>2001, :hour=>0, :min=>0, :sec=>0, :zone=>"+0000", :offset=>0}
+
+=== JIS X 0301 Format
+
+The JIS X 0301 format includes the
+{Japanese era name}[https://en.wikipedia.org/wiki/Japanese_era_name],
+and treats dates in the format <tt>'%Y-%m-%d'</tt>
+with the first letter of the romanized era name prefixed:
+
+  d = Date.new(2001, 2, 3) # => #<Date: 2001-02-03>
+  # Return 0301-formatted string.
+  jisx0301 = d.jisx0301    # => "H13.02.03"
+  # Return new date parsed from 0301-formatted string.
+  Date.jisx0301(jisx0301)  # => #<Date: 2001-02-03>
+  # Return hash parsed from 0301-formatted string.
+  Date._jisx0301(jisx0301) # => {:year=>2001, :mon=>2, :mday=>3}
+
+=== ISO 8601 Format Specifications
+
+This section shows format specifications that are compatible with
+{ISO 8601}[https://en.wikipedia.org/wiki/ISO_8601].
+Details for various formats may be seen at the links.
+
+Examples in this section assume:
+
+  t = Time.now # => 2022-06-29 16:49:25.465246 -0500
+
+==== Dates
+
+See {ISO 8601 dates}[https://en.wikipedia.org/wiki/ISO_8601#Dates].
+
+- {Years}[https://en.wikipedia.org/wiki/ISO_8601#Years]:
+
+  - Basic year (+YYYY+):
+
+      t.strftime('%Y') # => "2022"
+
+  - Expanded year (<tt>±YYYYY</tt>):
+
+      t.strftime('+%5Y') # => "+02022"
+      t.strftime('-%5Y') # => "-02022"
+
+- {Calendar dates}[https://en.wikipedia.org/wiki/ISO_8601#Calendar_dates]:
+
+  - Basic date (+YYYYMMDD+):
+
+      t.strftime('%Y%m%d') # => "20220629"
+
+  - Extended date (<tt>YYYY-MM-DD</tt>):
+
+      t.strftime('%Y-%m-%d') # => "2022-06-29"
+
+  - Reduced extended date (<tt>YYYY-MM</tt>):
+
+      t.strftime('%Y-%m') # => "2022-06"
+
+- {Week dates}[https://en.wikipedia.org/wiki/ISO_8601#Week_dates]:
+
+  - Basic date (+YYYYWww+ or +YYYYWwwD+):
+
+      t.strftime('%Y%Ww')   # => "202226w"
+      t.strftime('%Y%Ww%u') # => "202226w3"
+
+  - Extended date (<tt>YYYY-Www</tt> or <tt>YYYY-Www-D<tt>):
+
+      t.strftime('%Y-%Ww')    # => "2022-26w"
+      t.strftime('%Y-%Ww-%u') # => "2022-26w-3"
+
+- {Ordinal dates}[https://en.wikipedia.org/wiki/ISO_8601#Ordinal_dates]:
+
+  - Basic date (+YYYYDDD+):
+
+      t.strftime('%Y%j') # => "2022180"
+
+  - Extended date (<tt>YYYY-DDD</tt>):
+
+      t.strftime('%Y-%j') # => "2022-180"
+
+==== Times
+
+See {ISO 8601 times}[https://en.wikipedia.org/wiki/ISO_8601#Times].
+
+- Times:
+
+  - Basic time (+Thhmmss.sss+, +Thhmmss+, +Thhmm+, or +Thh+):
+
+      t.strftime('T%H%M%S.%L') # => "T164925.465"
+      t.strftime('T%H%M%S')    # => "T164925"
+      t.strftime('T%H%M')      # => "T1649"
+      t.strftime('T%H')        # => "T16"
+
+  - Extended time (+Thh:mm:ss.sss+, +Thh:mm:ss+, or +Thh:mm+):
+
+      t.strftime('T%H:%M:%S.%L') # => "T16:49:25.465"
+      t.strftime('T%H:%M:%S')    # => "T16:49:25"
+      t.strftime('T%H:%M')       # => "T16:49"
+
+- {Time zone designators}[https://en.wikipedia.org/wiki/ISO_8601#Time_zone_designators]:
+
+  - Timezone (+time+ represents a valid time,
+    +hh+ represents a valid 2-digit hour,
+    and +mm+ represents a valid 2-digit minute):
+
+    - Basic timezone (<tt>time±hhmm</tt>, <tt>time±hh</tt>, or +timeZ+):
+
+        t.strftime('T%H%M%S%z')              # => "T164925-0500"
+        t.strftime('T%H%M%S%z').slice(0..-3) # => "T164925-05"
+        t.strftime('T%H%M%SZ')               # => "T164925Z"
+
+    - Extended timezone (<tt>time±hh:mm</tt>):
+
+        t.strftime('T%H:%M:%S%z') # => "T16:49:25-0500"
+
+  - See also:
+
+    - {Local time (unqualified)}[https://en.wikipedia.org/wiki/ISO_8601#Local_time_(unqualified)].
+    - {Coordinated Universal Time (UTC)}[https://en.wikipedia.org/wiki/ISO_8601#Coordinated_Universal_Time_(UTC)].
+    - {Time offsets from UTC}[https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC].
+
+==== Combined \Date and \Time
+
+See {ISO 8601 Combined date and time representations}[https://en.wikipedia.org/wiki/ISO_8601#Combined_date_and_time_representations].
+
+An ISO 8601 combined date and time representation may be any
+ISO 8601 date and any ISO 8601 time,
+separated by the letter +T+.
+
+For the relevant +strftime+ formats, see
+{Dates}[rdoc-ref:strftime_formatting.rdoc@Dates]
+and {Times}[rdoc-ref:strftime_formatting.rdoc@Times] above.
diff --git a/doc/string/start_with_p.rdoc b/doc/string/start_with_p.rdoc
index 1cfed76296..5d1f9f9543 100644
--- a/doc/string/start_with_p.rdoc
+++ b/doc/string/start_with_p.rdoc
@@ -1,6 +1,6 @@
 Returns whether +self+ starts with any of the given +string_or_regexp+.
 
-Matches patterns against the beginning of+self+.
+Matches patterns against the beginning of +self+.
 For each given +string_or_regexp+, the pattern is:
 
 - +string_or_regexp+ itself, if it is a Regexp.
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/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc
index 6122f6e08e..024815a5a6 100644
--- a/doc/syntax/modules_and_classes.rdoc
+++ b/doc/syntax/modules_and_classes.rdoc
@@ -155,8 +155,8 @@ Ruby has three types of visibility.  The default is +public+.  A public method
 may be called from any other object.
 
 The second visibility is +protected+.  When calling a protected method the
-sender must be a subclass of the receiver or the receiver must be a subclass of
-the sender.  Otherwise a NoMethodError will be raised.
+sender must inherit the Class or Module which defines the method.  Otherwise a
+NoMethodError will be raised.
 
 Protected visibility is most frequently used to define <code>==</code> and
 other comparison methods where the author does not wish to expose an object's
diff --git a/doc/time/in.rdoc b/doc/time/in.rdoc
deleted file mode 100644
index f47db76a35..0000000000
--- a/doc/time/in.rdoc
+++ /dev/null
@@ -1,7 +0,0 @@
-- <tt>in: zone</tt>: a timezone _zone_, which may be:
-  - A string offset from UTC.
-  - A single letter offset from UTC, in the range <tt>'A'..'Z'</tt>,
-    <tt>'J'</tt> (the so-called military timezone) excluded.
-  - An integer number of seconds.
-  - A timezone object;
-    see {Timezone Argument}[#class-Time-label-Timezone+Argument] for details.
diff --git a/doc/time/mon-min.rdoc b/doc/time/mon-min.rdoc
deleted file mode 100644
index 5bd430c74a..0000000000
--- a/doc/time/mon-min.rdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-- +month+: a month value, which may be:
-  - An integer month in the range <tt>1..12</tt>.
-  - A 3-character string that matches regular expression
-    <tt>/jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec/i</tt>.
-- +day+: an integer day in the range <tt>1..31</tt>
-  (less than 31 for some months).
-- +hour+: an integer hour in the range <tt>0..23</tt>.
-- +min+: an integer minute in the range <tt>0..59</tt>.
diff --git a/doc/time/msec.rdoc b/doc/time/msec.rdoc
deleted file mode 100644
index ce5d1e6145..0000000000
--- a/doc/time/msec.rdoc
+++ /dev/null
@@ -1,2 +0,0 @@
-- +msec+ is the number of milliseconds (Integer, Float, or Rational)
-  in the range <tt>0..1000</tt>.
diff --git a/doc/time/nsec.rdoc b/doc/time/nsec.rdoc
deleted file mode 100644
index a2dfe2d608..0000000000
--- a/doc/time/nsec.rdoc
+++ /dev/null
@@ -1,2 +0,0 @@
-- +nsec+ is the number of nanoseconds (Integer, Float, or Rational)
-  in the range <tt>0..1000000000</tt>.
diff --git a/doc/time/sec.rdoc b/doc/time/sec.rdoc
deleted file mode 100644
index 049c712110..0000000000
--- a/doc/time/sec.rdoc
+++ /dev/null
@@ -1,2 +0,0 @@
-- +sec+ is the number of seconds (Integer, Float, or Rational)
-  in the range <tt>0..60</tt>.
diff --git a/doc/time/sec_i.rdoc b/doc/time/sec_i.rdoc
deleted file mode 100644
index 99c8eddc65..0000000000
--- a/doc/time/sec_i.rdoc
+++ /dev/null
@@ -1 +0,0 @@
-- +isec_i+ is the integer number of seconds in the range <tt>0..60</tt>.
diff --git a/doc/time/usec.rdoc b/doc/time/usec.rdoc
deleted file mode 100644
index bb5a46419a..0000000000
--- a/doc/time/usec.rdoc
+++ /dev/null
@@ -1,2 +0,0 @@
-- +usec+ is the number of microseconds (Integer, Float, or Rational)
-  in the range <tt>0..1000000</tt>.
diff --git a/doc/time/year.rdoc b/doc/time/year.rdoc
deleted file mode 100644
index 2222b830d7..0000000000
--- a/doc/time/year.rdoc
+++ /dev/null
@@ -1 +0,0 @@
-- +year+: an integer year.
diff --git a/doc/time/zone_and_in.rdoc b/doc/time/zone_and_in.rdoc
deleted file mode 100644
index e09e22874b..0000000000
--- a/doc/time/zone_and_in.rdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-- +zone+: a timezone, which may be:
-  - A string offset from UTC.
-  - A single letter offset from UTC, in the range <tt>'A'..'Z'</tt>,
-    <tt>'J'</tt> (the so-called military timezone) excluded.
-  - An integer number of seconds.
-  - A timezone object;
-    see {Timezone Argument}[#class-Time-label-Timezone+Argument] for details.
-- <tt>in: zone</tt>: a timezone _zone_, which may be as above.
diff --git a/doc/timezones.rdoc b/doc/timezones.rdoc
new file mode 100644
index 0000000000..c3aae88fde
--- /dev/null
+++ b/doc/timezones.rdoc
@@ -0,0 +1,108 @@
+== Timezones
+
+=== Timezone Specifiers
+
+Certain \Time methods accept arguments that specify timezones:
+
+- Time.at: keyword argument +in:+.
+- Time.new: positional argument +zone+ or keyword argument +in:+.
+- Time.now: keyword argument +in:+.
+- Time#getlocal: positional argument +zone+.
+- Time#localtime: positional argument +zone+.
+
+The value given with any of these must be one of the following
+(each detailed below):
+
+- {Hours/minutes offset}[rdoc-ref:timezones.rdoc@Hours-2FMinutes+Offsets].
+- {Single-letter offset}[rdoc-ref:timezones.rdoc@Single-Letter+Offsets].
+- {Integer offset}[rdoc-ref:timezones.rdoc@Integer+Offsets].
+- {Timezone object}[rdoc-ref:timezones.rdoc@Timezone+Objects].
+
+==== Hours/Minutes Offsets
+
+The zone value may be a string offset from UTC
+in the form <tt>'+HH:MM'</tt> or <tt>'-HH:MM'</tt>,
+where:
+
+- +HH+ is the 2-digit hour in the range <tt>0..23</tt>.
+- +MM+ is the 2-digit minute in the range <tt>0..59</tt>.
+
+Examples:
+
+  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
+  Time.at(t, in: '-23:59')            # => 1999-12-31 20:16:01 -2359
+  Time.at(t, in: '+23:59')            # => 2000-01-02 20:14:01 +2359
+
+==== Single-Letter Offsets
+
+The zone value may be a  letter in the range <tt>'A'..'I'</tt>
+or <tt>'K'..'Z'</tt>;
+see {List of military time zones}[https://en.wikipedia.org/wiki/List_of_military_time_zones]:
+
+  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
+  Time.at(t, in: 'A')                 # => 2000-01-01 21:15:01 +0100
+  Time.at(t, in: 'I')                 # => 2000-01-02 05:15:01 +0900
+  Time.at(t, in: 'K')                 # => 2000-01-02 06:15:01 +1000
+  Time.at(t, in: 'Y')                 # => 2000-01-01 08:15:01 -1200
+  Time.at(t, in: 'Z')                 # => 2000-01-01 20:15:01 UTC
+
+==== \Integer Offsets
+
+The zone value may be an integer number of seconds
+in the range <tt>-86399..86399</tt>:
+
+  t = Time.utc(2000, 1, 1, 20, 15, 1) # => 2000-01-01 20:15:01 UTC
+  Time.at(t, in: -86399)              # => 1999-12-31 20:15:02 -235959
+  Time.at(t, in: 86399)               # => 2000-01-02 20:15:00 +235959
+
+==== Timezone Objects
+
+In most cases, the zone value may be an object
+responding to certain timezone methods.
+
+\Exceptions (timezone object not allowed):
+
+- Time.new with positional argument +zone+.
+- Time.now with keyword argument +in:+.
+
+The timezone methods are:
+
+- +local_to_utc+:
+
+  - Called when Time.new is invoked with +tz+
+    as the value of positional argument +zone+ or keyword argument +in:+.
+  - Argument: a <tt>Time::tm</tt> object.
+  - Returns: a \Time-like object in the UTC timezone.
+
+- +utc_to_local+:
+
+  - Called when Time.at or Time.now is invoked with +tz+
+    as the value for keyword argument +in:+,
+    and when Time#getlocal or Time#localtime is called with +tz+
+    as the value for positional argument +zone+.
+  - Argument: a <tt>Time::tm</tt> object.
+  - Returns: a \Time-like object in the local timezone.
+
+A custom timezone class may have these instance methods,
+which will be called if defined:
+
+- +abbr+:
+
+  - Called when Time#strftime is invoked with a format involving <tt>%Z</tt>.
+  - Argument: a <tt>Time::tm</tt> object.
+  - Returns: a string abbreviation for the timezone name.
+
+- +dst?+:
+
+  - Called when Time.at or Time.now is invoked with +tz+
+    as the value for keyword argument +in:+,
+    and when Time#getlocal or Time#localtime is called with +tz+
+    as the value for positional argument +zone+.
+  - Argument: a <tt>Time::tm</tt> object.
+  - Returns: whether the time is daylight saving time.
+
+- +name+:
+
+  - Called when <tt>Marshal.dump(t) is invoked
+  - Argument: none.
+  - Returns: the string name of the timezone.
diff --git a/doc/yjit/yjit.md b/doc/yjit/yjit.md
index fd45096beb..67b2ffa5f0 100644
--- a/doc/yjit/yjit.md
+++ b/doc/yjit/yjit.md
@@ -8,46 +8,54 @@
 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)
 - MoreVMs 2021 talk: [YJIT: Building a New JIT Compiler Inside CRuby](https://www.youtube.com/watch?v=vucLAqv7qpc)
 - ECOOP 2016 talk: [Interprocedural Type Specialization of JavaScript Programs Without Type Analysis](https://www.youtube.com/watch?v=sRNBY7Ss97A)
 - ECOOP 2016 paper: [Interprocedural Type Specialization of JavaScript Programs Without Type Analysis](https://drops.dagstuhl.de/opus/volltexte/2016/6101/pdf/LIPIcs-ECOOP-2016-7.pdf)
 - 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.
-- Currently supports only x86-64 CPUs.
-
-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
 
@@ -57,6 +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.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.
 
@@ -67,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 --disable--install-rdoc
-make -j install
+./configure --enable-yjit --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc
+make -j && make install
 ```
 
 or
 
+```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 && make install
 ```
-# Configure in dev (debug) mode for development, build and install
+
+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=dev --prefix=$HOME/.rubies/ruby-yjit --disable-install-doc --disable--install-rdoc
-make -j install
+./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 --disable--install-rdoc --with-opt-dir="$(brew --prefix openssl):$(brew --prefix readline):$(brew --prefix libyaml)"
-make -j install
+./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 && 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
 
@@ -126,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
+
+YJIT allocates memory for JIT code and metadata. Enabling YJIT generally results in more 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.
+This section goes over tips on minimizing YJIT memory usage in case it uses more than your capacity.
 
-- Use exceptions for error recovery only, not as part of normal control-flow
+### 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,
@@ -204,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.
@@ -241,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`)
@@ -273,49 +339,49 @@ 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
 ```
 
-## Running YJIT on M1
+## Running x86 YJIT on Apple's Rosetta
 
-It is possible to run YJIT on an Apple M1 via Rosetta.  You can find basic
+For development purposes, it is possible to run x86 YJIT on an Apple M1 via Rosetta.  You can find basic
 instructions below, but there are a few caveats listed further down.
 
 First, install Rosetta:
 
-```
+```sh
 $ softwareupdate --install-rosetta
 ```
 
@@ -323,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
@@ -337,16 +403,15 @@ i386
 
 You may need to set the default target for `rustc` to x86-64, e.g.
 
-```
+```sh
 $ rustup default stable-x86_64-apple-darwin
 ```
 
 While in your i386 shell, install Cargo and Homebrew, then hack away!
 
-### M1 Caveats
+### Rosetta Caveats
 
 1. You must install a version of Homebrew for each architecture
 2. Cargo will install in $HOME/.cargo by default, and I don't know a good way to change architectures after install
-3. `dev` won't work if you have i386 Homebrew installed on an M1
 
 If you use Fish shell you can [read this link](https://tenderlovemaking.com/2022/01/07/homebrew-rosetta-and-ruby.html) for information on making the dev environment easier.
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 5e5d39cd76..9d0c367134 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -22,6 +22,7 @@ TRANSSODIR = $(ENCSODIR)/trans
 DLEXT = @DLEXT@
 OBJEXT = @OBJEXT@
 LIBEXT = @LIBEXT@
+EXEEXT = @EXEEXT@
 TIMESTAMPDIR  = $(EXTOUT)/.timestamp
 ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
 ENC_TRANS_SO_D = $(TIMESTAMPDIR)/.enc-trans.so.time
@@ -35,6 +36,7 @@ RUBY_SO_NAME = @RUBY_SO_NAME@
 LIBRUBY = @LIBRUBY@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
+BUILTRUBY = $(topdir)/miniruby$(EXEEXT)
 
 empty =
 AR = @AR@
@@ -49,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/ascii.c b/enc/ascii.c
index a2fef2f879..ae7db97f25 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -33,8 +33,8 @@
 # include "encindex.h"
 #endif
 
-#ifndef ENCINDEX_ASCII
-# define ENCINDEX_ASCII 0
+#ifndef ENCINDEX_ASCII_8BIT
+# define ENCINDEX_ASCII_8BIT 0
 #endif
 
 OnigEncodingDefine(ascii, ASCII) = {
@@ -55,7 +55,7 @@ OnigEncodingDefine(ascii, ASCII) = {
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
   onigenc_single_byte_ascii_only_case_map,
-  ENCINDEX_ASCII,
+  ENCINDEX_ASCII_8BIT,
   ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("BINARY", "ASCII-8BIT")
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/encdb.c b/enc/encdb.c
index a1936df804..8247e9ff6a 100644
--- a/enc/encdb.c
+++ b/enc/encdb.c
@@ -17,7 +17,7 @@
 #define ENC_DEFINE(name) rb_encdb_declare(name)
 #define ENC_SET_BASE(name, orig) rb_enc_set_base((name), (orig))
 #define ENC_SET_DUMMY(name, orig) rb_enc_set_dummy(name)
-#define ENC_DUMMY_UNICODE(name) rb_encdb_set_unicode(rb_enc_set_dummy(ENC_REPLICATE((name), name "BE")))
+#define ENC_DUMMY_UNICODE(name) ENC_DUMMY(name)
 
 void
 Init_encdb(void)
diff --git a/enc/jis/props.h.blt b/enc/jis/props.h.blt
index 54aa94f8bc..508a084449 100644
--- a/enc/jis/props.h.blt
+++ b/enc/jis/props.h.blt
@@ -69,7 +69,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(/*const char *str, unsigned int len*/);
+static const struct enc_property *onig_jis_property(register const char *str, register size_t len);
 #line 43 "enc/jis/props.kwd"
 struct enc_property;
 
@@ -82,7 +82,7 @@ struct enc_property;
 
 #ifndef GPERF_DOWNCASE
 #define GPERF_DOWNCASE 1
-static unsigned char gperf_downcase[256] =
+static const unsigned char gperf_downcase[256] =
   {
       0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
diff --git a/enc/jis/props.kwd b/enc/jis/props.kwd
index 659cf0aff4..9606828459 100644
--- a/enc/jis/props.kwd
+++ b/enc/jis/props.kwd
@@ -37,7 +37,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
+static const struct enc_property *onig_jis_property(register const char *str, register size_t len);
 %}
 
 struct enc_property;
diff --git a/enc/jis/props.src b/enc/jis/props.src
index 659cf0aff4..9606828459 100644
--- a/enc/jis/props.src
+++ b/enc/jis/props.src
@@ -37,7 +37,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
+static const struct enc_property *onig_jis_property(register const char *str, register size_t len);
 %}
 
 struct enc_property;
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/trans/newline.trans b/enc/trans/newline.trans
index 9e763407f9..95e082f5bd 100644
--- a/enc/trans/newline.trans
+++ b/enc/trans/newline.trans
@@ -17,10 +17,16 @@
   map_cr["0a"] = "0d"
 
   transcode_generate_node(ActionMap.parse(map_cr), "cr_newline")
+
+  map_normalize = {}
+  map_normalize["{00-ff}"] = :func_so
+
+  transcode_generate_node(ActionMap.parse(map_normalize), "lf_newline")
 %>
 
 <%= transcode_generated_code %>
 
+#define lf_newline universal_newline
 #define STATE (sp[0])
 #define NORMAL 0
 #define JUST_AFTER_CR 1
@@ -126,10 +132,24 @@ rb_cr_newline = {
     0, 0, 0, 0
 };
 
+static const rb_transcoder
+rb_lf_newline = {
+    "", "lf_newline", lf_newline,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    1, /* max_input */
+    2, /* max_output */
+    asciicompat_converter, /* asciicompat_type */
+    2, universal_newline_init, universal_newline_init, /* state_size, state_init, state_fini */
+    0, 0, 0, fun_so_universal_newline,
+    universal_newline_finish
+};
+
 void
 Init_newline(void)
 {
     rb_register_transcoder(&rb_universal_newline);
     rb_register_transcoder(&rb_crlf_newline);
     rb_register_transcoder(&rb_cr_newline);
+    rb_register_transcoder(&rb_lf_newline);
 }
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 99a3eeca19..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,
@@ -40642,11 +41711,7 @@ struct uniname2ctype_struct {
 };
 #define uniname2ctype_offset(str) offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_##str)
 
-static const struct uniname2ctype_struct *uniname2ctype_p(
-#if !(1+0) /* if ANSI, old style not to conflict with generated prototype */
-    const char *, unsigned int
-#endif
-);
+static const struct uniname2ctype_struct *uniname2ctype_p(register const char *str, register size_t len);
 
 #ifndef USE_UNICODE_PROPERTIES
 #define TOTAL_KEYWORDS 15
@@ -40657,9 +41722,9 @@ static const struct uniname2ctype_struct *uniname2ctype_p(
 /* 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
@@ -40708,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 */
@@ -40944,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")];
@@ -40958,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")];
@@ -41078,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")];
@@ -41126,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")];
@@ -41235,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")];
@@ -41244,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")];
@@ -41302,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")];
@@ -41321,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")];
@@ -41338,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")];
@@ -41401,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")];
@@ -41443,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")];
@@ -41453,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")];
@@ -41461,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")];
@@ -41474,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")];
@@ -41492,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")];
@@ -41512,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")];
@@ -41524,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")];
@@ -41549,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")];
@@ -41583,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")];
@@ -41599,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")];
@@ -41606,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")];
@@ -41619,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")];
@@ -41849,6 +42927,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "innewa",
     "sk",
     "control",
+    "inkawi",
     "inancientsymbols",
     "palm",
     "inlycian",
@@ -41863,6 +42942,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inwarangciti",
     "sora",
     "inopticalcharacterrecognition",
+    "kawi",
     "inoldsogdian",
     "inmalayalam",
     "bamum",
@@ -41995,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",
@@ -42043,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",
@@ -42156,7 +43236,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "indogra",
     "arab",
     "medefaidrin",
-    "hatran",
     "inshorthandformatcontrols",
     "phli",
     "inimperialaramaic",
@@ -42165,7 +43244,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inanatolianhieroglyphs",
     "punctuation",
     "graphemeextend",
-    "hatr",
     "cwl",
     "vith",
     "ingeometricshapes",
@@ -42223,7 +43301,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "oidc",
     "bopo",
     "cuneiform",
-    "hex",
     "caseignorable",
     "inoldpersian",
     "cwu",
@@ -42242,10 +43319,8 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "oids",
     "inarabicextendeda",
     "modifierletter",
-    "gujr",
     "incjksymbolsandpunctuation",
     "olower",
-    "gujarati",
     "bopomofo",
     "inlisu",
     "inoldpermic",
@@ -42259,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",
@@ -42274,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",
@@ -42328,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",
@@ -42370,7 +43446,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "java",
     "inphagspa",
     "lepcha",
-    "inenclosedcjklettersandmonths",
+    "indevanagariextendeda",
     "intifinagh",
     "intagalog",
     "incombiningdiacriticalmarkssupplement",
@@ -42380,6 +43456,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "insymbolsandpictographsextendeda",
     "syriac",
     "inbengali",
+    "nagm",
     "extendedpictographic",
     "buhd",
     "javanese",
@@ -42388,6 +43465,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "inlatin1supplement",
     "ingothic",
     "invariationselectors",
+    "hex",
     "inverticalforms",
     "ebase",
     "incurrencysymbols",
@@ -42401,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",
@@ -42423,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",
@@ -42443,7 +43520,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "noncharactercodepoint",
     "oldhungarian",
     "insymbolsforlegacycomputing",
-    "hangul",
     "insmallformvariants",
     "inhangulsyllables",
     "emojipresentation",
@@ -42455,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",
@@ -42480,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",
@@ -42514,7 +43596,6 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "kayahli",
     "inplayingcards",
     "elym",
-    "injavanese",
     "graphemeclusterbreak=l",
     "graphemeclusterbreak=control",
     "ogrext",
@@ -42530,6 +43611,7 @@ static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
     "cypriot",
     "any",
     "otheruppercase",
+    "rjng",
     "wspace",
     "inindicsiyaqnumbers",
     "inprivateusearea",
@@ -42537,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",
@@ -42550,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",
@@ -42639,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},
@@ -42663,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},
@@ -42684,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},
@@ -42713,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},
@@ -42737,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},
@@ -42802,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},
@@ -42832,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},
@@ -43014,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},
@@ -43048,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},
@@ -43062,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},
@@ -43086,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},
@@ -43114,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},
@@ -43122,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},
@@ -43277,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},
@@ -43295,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},
@@ -43319,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},
@@ -43352,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},
@@ -43463,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},
@@ -43653,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},
@@ -43674,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},
@@ -43782,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},
@@ -43819,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},
@@ -43894,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},
@@ -43989,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},
@@ -44050,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},
@@ -44156,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},
@@ -44168,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},
@@ -44188,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},
@@ -44246,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},
@@ -44263,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},
@@ -44281,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},
@@ -44308,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},
@@ -44320,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},
@@ -44380,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},
@@ -44388,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},
@@ -44398,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
@@ -44529,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 */
     };
 
@@ -44560,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/enc/utf_16_32.h b/enc/utf_16_32.h
index 9f9216d8ff..4d669019bf 100644
--- a/enc/utf_16_32.h
+++ b/enc/utf_16_32.h
@@ -1,5 +1,5 @@
 #include "regenc.h"
 /* dummy for unsupported, stateful encoding */
-#define ENC_DUMMY_UNICODE(name) ENC_REPLICATE(name, name "BE")
+#define ENC_DUMMY_UNICODE(name) ENC_DUMMY(name)
 ENC_DUMMY_UNICODE("UTF-16");
 ENC_DUMMY_UNICODE("UTF-32");
diff --git a/encindex.h b/encindex.h
index 8457a7b39f..e6ddb1b0c2 100644
--- a/encindex.h
+++ b/encindex.h
@@ -20,7 +20,7 @@ extern "C" {
 #endif
 
 enum ruby_preserved_encindex {
-    RUBY_ENCINDEX_ASCII,
+    RUBY_ENCINDEX_ASCII_8BIT,
     RUBY_ENCINDEX_UTF_8,
     RUBY_ENCINDEX_US_ASCII,
 
@@ -40,7 +40,7 @@ enum ruby_preserved_encindex {
     RUBY_ENCINDEX_BUILTIN_MAX
 };
 
-#define ENCINDEX_ASCII       RUBY_ENCINDEX_ASCII
+#define ENCINDEX_ASCII_8BIT  RUBY_ENCINDEX_ASCII_8BIT
 #define ENCINDEX_UTF_8       RUBY_ENCINDEX_UTF_8
 #define ENCINDEX_US_ASCII    RUBY_ENCINDEX_US_ASCII
 #define ENCINDEX_UTF_16BE    RUBY_ENCINDEX_UTF_16BE
@@ -54,7 +54,7 @@ enum ruby_preserved_encindex {
 #define ENCINDEX_Windows_31J RUBY_ENCINDEX_Windows_31J
 #define ENCINDEX_BUILTIN_MAX RUBY_ENCINDEX_BUILTIN_MAX
 
-#define rb_ascii8bit_encindex() RUBY_ENCINDEX_ASCII
+#define rb_ascii8bit_encindex() RUBY_ENCINDEX_ASCII_8BIT
 #define rb_utf8_encindex()      RUBY_ENCINDEX_UTF_8
 #define rb_usascii_encindex()   RUBY_ENCINDEX_US_ASCII
 
diff --git a/encoding.c b/encoding.c
index 876b03e36f..2f4b47bdfa 100644
--- a/encoding.c
+++ b/encoding.c
@@ -17,6 +17,7 @@
 #include "internal.h"
 #include "internal/enc.h"
 #include "internal/encoding.h"
+#include "internal/error.h"
 #include "internal/inits.h"
 #include "internal/load.h"
 #include "internal/object.h"
@@ -49,16 +50,14 @@ void rb_encdb_declare(const char *name);
 int rb_encdb_replicate(const char *name, const char *orig);
 int rb_encdb_dummy(const char *name);
 int rb_encdb_alias(const char *alias, const char *orig);
-void rb_encdb_set_unicode(int index);
 #pragma GCC visibility pop
 #endif
 
 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);
@@ -210,7 +186,7 @@ check_encoding(rb_encoding *enc)
 {
     int index = rb_enc_to_index(enc);
     if (rb_enc_from_index(index) != enc)
-	return -1;
+        return -1;
     if (rb_enc_autoload_p(enc)) {
         index = rb_enc_autoload(enc);
     }
@@ -221,7 +197,7 @@ static int
 enc_check_encoding(VALUE obj)
 {
     if (!is_obj_encoding(obj)) {
-	return -1;
+        return -1;
     }
     return check_encoding(RDATA(obj)->data);
 }
@@ -231,7 +207,7 @@ static void
 not_encoding(VALUE enc)
 {
     rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Encoding)",
-	     rb_obj_class(enc));
+             rb_obj_class(enc));
 }
 
 static rb_encoding *
@@ -239,7 +215,7 @@ must_encoding(VALUE enc)
 {
     int index = enc_check_encoding(enc);
     if (index < 0) {
-	not_encoding(enc);
+        not_encoding(enc);
     }
     return DATA_PTR(enc);
 }
@@ -249,16 +225,16 @@ must_encindex(int index)
 {
     rb_encoding *enc = rb_enc_from_index(index);
     if (!enc) {
-	rb_raise(rb_eEncodingError, "encoding index out of bound: %d",
-		 index);
+        rb_raise(rb_eEncodingError, "encoding index out of bound: %d",
+                 index);
     }
     if (ENC_TO_ENCINDEX(enc) != (int)(index & ENC_INDEX_MASK)) {
-	rb_raise(rb_eEncodingError, "wrong encoding index %d for %s (expected %d)",
-		 index, rb_enc_name(enc), ENC_TO_ENCINDEX(enc));
+        rb_raise(rb_eEncodingError, "wrong encoding index %d for %s (expected %d)",
+                 index, rb_enc_name(enc), ENC_TO_ENCINDEX(enc));
     }
     if (rb_enc_autoload_p(enc) && rb_enc_autoload(enc) == -1) {
-	rb_loaderror("failed to load encoding (%s)",
-		     rb_enc_name(enc));
+        rb_loaderror("failed to load encoding (%s)",
+                     rb_enc_name(enc));
     }
     return enc;
 }
@@ -271,16 +247,16 @@ rb_to_encoding_index(VALUE enc)
 
     idx = enc_check_encoding(enc);
     if (idx >= 0) {
-	return idx;
+        return idx;
     }
     else if (NIL_P(enc = rb_check_string_type(enc))) {
-	return -1;
+        return -1;
     }
     if (!rb_enc_asciicompat(rb_enc_get(enc))) {
-	return -1;
+        return -1;
     }
     if (!(name = rb_str_to_cstr(enc))) {
-	return -1;
+        return -1;
     }
     return rb_enc_find_index(name);
 }
@@ -292,10 +268,10 @@ name_for_encoding(volatile VALUE *enc)
     const char *n;
 
     if (!rb_enc_asciicompat(rb_enc_get(name))) {
-	rb_raise(rb_eArgError, "invalid encoding name (non ASCII)");
+        rb_raise(rb_eArgError, "invalid encoding name (non ASCII)");
     }
     if (!(n = rb_str_to_cstr(name))) {
-	rb_raise(rb_eArgError, "invalid encoding name (NUL byte)");
+        rb_raise(rb_eArgError, "invalid encoding name (NUL byte)");
     }
     return n;
 }
@@ -314,7 +290,7 @@ str_to_encindex(VALUE enc)
 {
     int idx = str_find_encindex(enc);
     if (idx < 0) {
-	rb_raise(rb_eArgError, "unknown encoding name - %"PRIsVALUE, enc);
+        rb_raise(rb_eArgError, "unknown encoding name - %"PRIsVALUE, enc);
     }
     return 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
@@ -365,20 +335,20 @@ enc_register_at(struct enc_table *enc_table, int index, const char *name, rb_enc
 
     if (!valid_encoding_name_p(name)) return -1;
     if (!ent->name) {
-	ent->name = name = strdup(name);
+        ent->name = name = strdup(name);
     }
     else if (STRCASECMP(name, ent->name)) {
-	return -1;
+        return -1;
     }
     encoding = (rb_raw_encoding *)ent->enc;
     if (!encoding) {
-	encoding = xmalloc(sizeof(rb_encoding));
+        encoding = xmalloc(sizeof(rb_encoding));
     }
     if (base_encoding) {
-	*encoding = *base_encoding;
+        *encoding = *base_encoding;
     }
     else {
-	memset(encoding, 0, sizeof(*ent->enc));
+        memset(encoding, 0, sizeof(*ent->enc));
     }
     encoding->name = name;
     encoding->ruby_encoding_index = index;
@@ -405,7 +375,7 @@ static rb_encoding *
 enc_from_index(struct enc_table *enc_table, int index)
 {
     if (UNLIKELY(index < 0 || enc_table->count <= (index &= ENC_INDEX_MASK))) {
-	return 0;
+        return 0;
     }
     return enc_table->list[index].enc;
 }
@@ -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:    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,9 +422,9 @@ 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;
+        return (int)idx;
     }
     return -1;
 }
@@ -484,10 +444,13 @@ 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);
+        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);
     }
 }
 
@@ -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);
@@ -569,7 +528,10 @@ rb_enc_replicate(const char *name, rb_encoding *encoding)
 static VALUE
 enc_replicate_m(VALUE encoding, VALUE name)
 {
-    int idx = rb_enc_replicate(name_for_encoding(&name), rb_to_encoding(encoding));
+    int idx;
+    rb_warn_deprecated_to_remove("3.3", "Encoding#replicate", "the original encoding");
+
+    idx = rb_enc_replicate(name_for_encoding(&name), rb_to_encoding(encoding));
     RB_GC_GUARD(name);
     return rb_enc_from_encoding_index(idx);
 }
@@ -581,11 +543,11 @@ enc_replicate_with_index(struct enc_table *enc_table, const char *name, rb_encod
         idx = enc_register(enc_table, name, origenc);
     }
     else {
-	idx = enc_register_at(enc_table, idx, name, origenc);
+        idx = enc_register_at(enc_table, idx, name, origenc);
     }
     if (idx >= 0) {
-	set_base_encoding(enc_table, idx, origenc);
-	set_encoding_const(name, rb_enc_from_index(idx));
+        set_base_encoding(enc_table, idx, origenc);
+        set_encoding_const(name, rb_enc_from_index(idx));
     }
     else {
         rb_raise(rb_eArgError, "failed to replicate encoding");
@@ -705,7 +667,7 @@ static int
 enc_alias_internal(struct enc_table *enc_table, const char *alias, int idx)
 {
     return st_insert2(enc_table->names, (st_data_t)alias, (st_data_t)idx,
-		      enc_dup_name);
+                      enc_dup_name);
 }
 
 static int
@@ -713,7 +675,7 @@ enc_alias(struct enc_table *enc_table, const char *alias, int idx)
 {
     if (!valid_encoding_name_p(alias)) return -1;
     if (!enc_alias_internal(enc_table, alias, idx))
-	set_encoding_const(alias, enc_from_index(enc_table, idx));
+        set_encoding_const(alias, enc_from_index(enc_table, idx));
     return idx;
 }
 
@@ -724,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;
         }
@@ -756,29 +718,23 @@ rb_encdb_alias(const char *alias, const char *orig)
     return r;
 }
 
-void
-rb_encdb_set_unicode(int index)
-{
-    rb_raw_encoding *enc = (rb_raw_encoding *)rb_enc_from_index(index);
-    ASSUME(enc);
-    enc->flags |= ONIGENC_FLAG_UNICODE;
-}
-
 static void
 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)
-    ENC_REGISTER(ASCII);
+    ENC_REGISTER(ASCII_8BIT);
     ENC_REGISTER(UTF_8);
     ENC_REGISTER(US_ASCII);
-    global_enc_ascii = enc_table->list[ENCINDEX_ASCII].enc;
+    global_enc_ascii = enc_table->list[ENCINDEX_ASCII_8BIT].enc;
     global_enc_utf_8 = enc_table->list[ENCINDEX_UTF_8].enc;
     global_enc_us_ascii = enc_table->list[ENCINDEX_US_ASCII].enc;
 #undef ENC_REGISTER
+#undef OnigEncodingASCII_8BIT
 #define ENCDB_REGISTER(name, enc) enc_register_at(enc_table, ENCINDEX_##enc, name, NULL)
     ENCDB_REGISTER("UTF-16BE", UTF_16BE);
     ENCDB_REGISTER("UTF-16LE", UTF_16LE);
@@ -813,9 +769,9 @@ load_encoding(const char *name)
     int idx;
 
     while (s < e) {
-	if (!ISALNUM(*s)) *s = '_';
-	else if (ISUPPER(*s)) *s = (char)TOLOWER(*s);
-	++s;
+        if (!ISALNUM(*s)) *s = '_';
+        else if (ISUPPER(*s)) *s = (char)TOLOWER(*s);
+        ++s;
     }
     enclib = rb_fstring(enclib);
     ruby_debug = Qfalse;
@@ -848,16 +804,16 @@ enc_autoload_body(struct enc_table *enc_table, rb_encoding *enc)
 
     if (base) {
         int i = 0;
-	do {
-	    if (i >= enc_table->count) return -1;
-	} while (enc_table->list[i].enc != base && (++i, 1));
-	if (rb_enc_autoload_p(base)) {
-	    if (rb_enc_autoload(base) < 0) return -1;
-	}
-	i = enc->ruby_encoding_index;
-	enc_register_at(enc_table, i & ENC_INDEX_MASK, rb_enc_name(enc), base);
+        do {
+            if (i >= enc_table->count) return -1;
+        } while (enc_table->list[i].enc != base && (++i, 1));
+        if (rb_enc_autoload_p(base)) {
+            if (rb_enc_autoload(base) < 0) return -1;
+        }
+        i = enc->ruby_encoding_index;
+        enc_register_at(enc_table, i & ENC_INDEX_MASK, rb_enc_name(enc), base);
         ((rb_raw_encoding *)enc)->ruby_encoding_index = i;
-	i &= ENC_INDEX_MASK;
+        i &= ENC_INDEX_MASK;
         return i;
     }
     else {
@@ -880,25 +836,23 @@ 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);
+        i = load_encoding(name);
     }
     else if (!(enc = rb_enc_from_index(i))) {
-	if (i != UNSPECIFIED_ENCODING) {
-	    rb_raise(rb_eArgError, "encoding %s is not registered", name);
-	}
+        if (i != UNSPECIFIED_ENCODING) {
+            rb_raise(rb_eArgError, "encoding %s is not registered", name);
+        }
     }
     else if (rb_enc_autoload_p(enc)) {
-	if (rb_enc_autoload(enc) < 0) {
-	    rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
-		    name);
-	    return 0;
-	}
+        if (rb_enc_autoload(enc) < 0) {
+            rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
+                    name);
+            return 0;
+        }
     }
     return i;
 }
@@ -931,11 +885,11 @@ enc_capable(VALUE obj)
       case T_REGEXP:
       case T_FILE:
       case T_SYMBOL:
-	return TRUE;
+        return TRUE;
       case T_DATA:
-	if (is_data_encoding(obj)) return TRUE;
+        if (is_data_encoding(obj)) return TRUE;
       default:
-	return FALSE;
+        return FALSE;
     }
 }
 
@@ -957,11 +911,11 @@ enc_get_index_str(VALUE str)
 {
     int i = ENCODING_GET_INLINED(str);
     if (i == ENCODING_INLINE_MAX) {
-	VALUE iv;
+        VALUE iv;
 
 #if 0
-	iv = rb_ivar_get(str, rb_id_encoding());
-	i = NUM2INT(iv);
+        iv = rb_ivar_get(str, rb_id_encoding());
+        i = NUM2INT(iv);
 #else
         /*
          * Tentatively, assume ASCII-8BIT, if encoding index instance
@@ -969,7 +923,7 @@ enc_get_index_str(VALUE str)
          * all instance variables are removed in `obj_free`.
          */
         iv = rb_attr_get(str, rb_id_encoding());
-        i = NIL_P(iv) ? ENCINDEX_ASCII : NUM2INT(iv);
+        i = NIL_P(iv) ? ENCINDEX_ASCII_8BIT : NUM2INT(iv);
 #endif
     }
     return i;
@@ -982,31 +936,31 @@ rb_enc_get_index(VALUE obj)
     VALUE tmp;
 
     if (SPECIAL_CONST_P(obj)) {
-	if (!SYMBOL_P(obj)) return -1;
-	obj = rb_sym2str(obj);
+        if (!SYMBOL_P(obj)) return -1;
+        obj = rb_sym2str(obj);
     }
     switch (BUILTIN_TYPE(obj)) {
       case T_STRING:
       case T_SYMBOL:
       case T_REGEXP:
-	i = enc_get_index_str(obj);
-	break;
+        i = enc_get_index_str(obj);
+        break;
       case T_FILE:
-	tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0);
-	if (NIL_P(tmp)) {
-	    tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
-	}
-	if (is_obj_encoding(tmp)) {
-	    i = enc_check_encoding(tmp);
-	}
-	break;
+        tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0);
+        if (NIL_P(tmp)) {
+            tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
+        }
+        if (is_obj_encoding(tmp)) {
+            i = enc_check_encoding(tmp);
+        }
+        break;
       case T_DATA:
-	if (is_data_encoding(obj)) {
-	    i = enc_check_encoding(obj);
-	}
-	break;
+        if (is_data_encoding(obj)) {
+            i = enc_check_encoding(obj);
+        }
+        break;
       default:
-	break;
+        break;
     }
     return i;
 }
@@ -1019,8 +973,8 @@ enc_set_index(VALUE obj, int idx)
     }
 
     if (idx < ENCODING_INLINE_MAX) {
-	ENCODING_SET_INLINED(obj, idx);
-	return;
+        ENCODING_SET_INLINED(obj, idx);
+        return;
     }
     ENCODING_SET_INLINED(obj, ENCODING_INLINE_MAX);
     rb_ivar_set(obj, rb_id_encoding(), INT2NUM(idx));
@@ -1044,19 +998,19 @@ rb_enc_associate_index(VALUE obj, int idx)
     rb_check_frozen(obj);
     oldidx = rb_enc_get_index(obj);
     if (oldidx == idx)
-	return obj;
+        return obj;
     if (SPECIAL_CONST_P(obj)) {
-	rb_raise(rb_eArgError, "cannot set encoding");
+        rb_raise(rb_eArgError, "cannot set encoding");
     }
     enc = must_encindex(idx);
     if (!ENC_CODERANGE_ASCIIONLY(obj) ||
-	!rb_enc_asciicompat(enc)) {
-	ENC_CODERANGE_CLEAR(obj);
+        !rb_enc_asciicompat(enc)) {
+        ENC_CODERANGE_CLEAR(obj);
     }
     termlen = rb_enc_mbminlen(enc);
     oldtermlen = rb_enc_mbminlen(rb_enc_from_index(oldidx));
     if (oldtermlen != termlen && RB_TYPE_P(obj, T_STRING)) {
-	rb_str_change_terminator_length(obj, oldtermlen, termlen);
+        rb_str_change_terminator_length(obj, oldtermlen, termlen);
     }
     enc_set_index(obj, idx);
     return obj;
@@ -1078,9 +1032,9 @@ static rb_encoding*
 rb_encoding_check(rb_encoding* enc, VALUE str1, VALUE str2)
 {
     if (!enc)
-	rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
-		 rb_enc_name(rb_enc_get(str1)),
-		 rb_enc_name(rb_enc_get(str2)));
+        rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
+                 rb_enc_name(rb_enc_get(str1)),
+                 rb_enc_name(rb_enc_get(str2)));
     return enc;
 }
 
@@ -1109,48 +1063,48 @@ enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
 
     isstr2 = RB_TYPE_P(str2, T_STRING);
     if (isstr2 && RSTRING_LEN(str2) == 0)
-	return enc1;
+        return enc1;
     isstr1 = RB_TYPE_P(str1, T_STRING);
     if (isstr1 && isstr2 && RSTRING_LEN(str1) == 0)
-	return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2;
+        return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2;
     if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
-	return 0;
+        return 0;
     }
 
     /* objects whose encoding is the same of contents */
     if (!isstr2 && idx2 == ENCINDEX_US_ASCII)
-	return enc1;
+        return enc1;
     if (!isstr1 && idx1 == ENCINDEX_US_ASCII)
-	return enc2;
+        return enc2;
 
     if (!isstr1) {
-	VALUE tmp = str1;
-	int idx0 = idx1;
-	str1 = str2;
-	str2 = tmp;
-	idx1 = idx2;
-	idx2 = idx0;
-	idx0 = isstr1;
-	isstr1 = isstr2;
-	isstr2 = idx0;
+        VALUE tmp = str1;
+        int idx0 = idx1;
+        str1 = str2;
+        str2 = tmp;
+        idx1 = idx2;
+        idx2 = idx0;
+        idx0 = isstr1;
+        isstr1 = isstr2;
+        isstr2 = idx0;
     }
     if (isstr1) {
-	int cr1, cr2;
-
-	cr1 = rb_enc_str_coderange(str1);
-	if (isstr2) {
-	    cr2 = rb_enc_str_coderange(str2);
-	    if (cr1 != cr2) {
-		/* may need to handle ENC_CODERANGE_BROKEN */
-		if (cr1 == ENC_CODERANGE_7BIT) return enc2;
-		if (cr2 == ENC_CODERANGE_7BIT) return enc1;
-	    }
-	    if (cr2 == ENC_CODERANGE_7BIT) {
-		return enc1;
-	    }
-	}
-	if (cr1 == ENC_CODERANGE_7BIT)
-	    return enc2;
+        int cr1, cr2;
+
+        cr1 = rb_enc_str_coderange(str1);
+        if (isstr2) {
+            cr2 = rb_enc_str_coderange(str2);
+            if (cr1 != cr2) {
+                /* may need to handle ENC_CODERANGE_BROKEN */
+                if (cr1 == ENC_CODERANGE_7BIT) return enc2;
+                if (cr2 == ENC_CODERANGE_7BIT) return enc1;
+            }
+            if (cr2 == ENC_CODERANGE_7BIT) {
+                return enc1;
+            }
+        }
+        if (cr1 == ENC_CODERANGE_7BIT)
+            return enc2;
     }
     return 0;
 }
@@ -1165,10 +1119,10 @@ enc_compatible_str(VALUE str1, VALUE str2)
         return 0;
 
     if (idx1 == idx2) {
-	return rb_enc_from_index(idx1);
+        return rb_enc_from_index(idx1);
     }
     else {
-	return enc_compatible_latter(str1, str2, idx1, idx2);
+        return enc_compatible_latter(str1, str2, idx1, idx2);
     }
 }
 
@@ -1182,7 +1136,7 @@ rb_enc_compatible(VALUE str1, VALUE str2)
         return 0;
 
     if (idx1 == idx2) {
-	return rb_enc_from_index(idx1);
+        return rb_enc_from_index(idx1);
     }
 
     return enc_compatible_latter(str1, str2, idx1, idx2);
@@ -1207,7 +1161,7 @@ rb_obj_encoding(VALUE obj)
 {
     int idx = rb_enc_get_index(obj);
     if (idx < 0) {
-	rb_raise(rb_eTypeError, "unknown encoding");
+        rb_raise(rb_eTypeError, "unknown encoding");
     }
     return rb_enc_from_encoding_index(idx & ENC_INDEX_MASK);
 }
@@ -1274,7 +1228,7 @@ rb_enc_codepoint_len(const char *p, const char *e, int *len_p, rb_encoding *enc)
         rb_raise(rb_eArgError, "empty string");
     r = rb_enc_precise_mbclen(p, e, enc);
     if (!MBCLEN_CHARFOUND_P(r)) {
-	rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+        rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
     }
     if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r);
     return rb_enc_mbc_to_codepoint(p, e, enc);
@@ -1285,7 +1239,7 @@ rb_enc_codelen(int c, rb_encoding *enc)
 {
     int n = ONIGENC_CODE_TO_MBCLEN(enc,c);
     if (n == 0) {
-	rb_raise(rb_eArgError, "invalid codepoint 0x%x in %s", c, rb_enc_name(enc));
+        rb_raise(rb_eArgError, "invalid codepoint 0x%x in %s", c, rb_enc_name(enc));
     }
     return n;
 }
@@ -1317,16 +1271,16 @@ enc_inspect(VALUE self)
     rb_encoding *enc;
 
     if (!is_data_encoding(self)) {
-	not_encoding(self);
+        not_encoding(self);
     }
     if (!(enc = DATA_PTR(self)) || rb_enc_from_index(rb_enc_to_index(enc)) != enc) {
-	rb_raise(rb_eTypeError, "broken Encoding");
+        rb_raise(rb_eTypeError, "broken Encoding");
     }
     return rb_enc_sprintf(rb_usascii_encoding(),
-			  "#<%"PRIsVALUE":%s%s%s>", rb_obj_class(self),
-			  rb_enc_name(enc),
-			  (ENC_DUMMY_P(enc) ? " (dummy)" : ""),
-			  rb_enc_autoload_p(enc) ? " (autoload)" : "");
+                          "#<%"PRIsVALUE":%s%s%s>", rb_obj_class(self),
+                          rb_enc_name(enc),
+                          (ENC_DUMMY_P(enc) ? " (dummy)" : ""),
+                          rb_enc_autoload_p(enc) ? " (autoload)" : "");
 }
 
 /*
@@ -1350,8 +1304,8 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
     VALUE *arg = (VALUE *)args;
 
     if ((int)idx == (int)arg[0]) {
-	VALUE str = rb_fstring_cstr((char *)name);
-	rb_ary_push(arg[1], str);
+        VALUE str = rb_fstring_cstr((char *)name);
+        rb_ary_push(arg[1], str);
     }
     return ST_CONTINUE;
 }
@@ -1371,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];
 }
 
@@ -1400,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;
 }
 
@@ -1438,7 +1382,7 @@ enc_find(VALUE klass, VALUE enc)
 {
     int idx;
     if (is_obj_encoding(enc))
-	return enc;
+        return enc;
     idx = str_to_encindex(enc);
     if (idx == UNSPECIFIED_ENCODING) return Qnil;
     return rb_enc_from_encoding_index(idx);
@@ -1520,7 +1464,7 @@ rb_ascii8bit_encoding(void)
 int
 rb_ascii8bit_encindex(void)
 {
-    return ENCINDEX_ASCII;
+    return ENCINDEX_ASCII_8BIT;
 }
 
 rb_encoding *
@@ -1556,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();
+        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;
 }
@@ -1578,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;
+    int idx = enc_registered(&global_enc_table, "filesystem");
+    if (idx < 0) idx = ENCINDEX_ASCII_8BIT;
     return idx;
 }
 
@@ -1607,15 +1548,22 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha
     int overridden = FALSE;
 
     if (def->index != -2)
-	/* Already set */
-	overridden = TRUE;
+        /* Already set */
+        overridden = TRUE;
 
     GLOBAL_ENC_TABLE_ENTER(enc_table);
     {
         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 {
@@ -1807,45 +1755,45 @@ set_encoding_const(const char *name, rb_encoding *enc)
 
     if (ISDIGIT(*s)) return;
     if (ISUPPER(*s)) {
-	hasupper = 1;
-	while (*++s && (ISALNUM(*s) || *s == '_')) {
-	    if (ISLOWER(*s)) haslower = 1;
-	}
+        hasupper = 1;
+        while (*++s && (ISALNUM(*s) || *s == '_')) {
+            if (ISLOWER(*s)) haslower = 1;
+        }
     }
     if (!*s) {
-	if (s - name > ENCODING_NAMELEN_MAX) return;
-	valid = 1;
-	rb_define_const(rb_cEncoding, name, encoding);
+        if (s - name > ENCODING_NAMELEN_MAX) return;
+        valid = 1;
+        rb_define_const(rb_cEncoding, name, encoding);
     }
     if (!valid || haslower) {
-	size_t len = s - name;
-	if (len > ENCODING_NAMELEN_MAX) return;
-	if (!haslower || !hasupper) {
-	    do {
-		if (ISLOWER(*s)) haslower = 1;
-		if (ISUPPER(*s)) hasupper = 1;
-	    } while (*++s && (!haslower || !hasupper));
-	    len = s - name;
-	}
-	len += strlen(s);
-	if (len++ > ENCODING_NAMELEN_MAX) return;
-	MEMCPY(s = ALLOCA_N(char, len), name, char, len);
-	name = s;
-	if (!valid) {
-	    if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
-	    for (; *s; ++s) {
-		if (!ISALNUM(*s)) *s = '_';
-	    }
-	    if (hasupper) {
-		rb_define_const(rb_cEncoding, name, encoding);
-	    }
-	}
-	if (haslower) {
-	    for (s = (char *)name; *s; ++s) {
-		if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
-	    }
-	    rb_define_const(rb_cEncoding, name, encoding);
-	}
+        size_t len = s - name;
+        if (len > ENCODING_NAMELEN_MAX) return;
+        if (!haslower || !hasupper) {
+            do {
+                if (ISLOWER(*s)) haslower = 1;
+                if (ISUPPER(*s)) hasupper = 1;
+            } while (*++s && (!haslower || !hasupper));
+            len = s - name;
+        }
+        len += strlen(s);
+        if (len++ > ENCODING_NAMELEN_MAX) return;
+        MEMCPY(s = ALLOCA_N(char, len), name, char, len);
+        name = s;
+        if (!valid) {
+            if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
+            for (; *s; ++s) {
+                if (!ISALNUM(*s)) *s = '_';
+            }
+            if (hasupper) {
+                rb_define_const(rb_cEncoding, name, encoding);
+            }
+        }
+        if (haslower) {
+            for (s = (char *)name; *s; ++s) {
+                if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
+            }
+            rb_define_const(rb_cEncoding, name, encoding);
+        }
     }
 }
 
@@ -1875,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;
 }
 
@@ -1896,14 +1837,14 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
     VALUE key, str = rb_ary_entry(ary, idx);
 
     if (NIL_P(str)) {
-	rb_encoding *enc = rb_enc_from_index(idx);
+        rb_encoding *enc = rb_enc_from_index(idx);
 
-	if (!enc) return ST_CONTINUE;
-	if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
-	    return ST_CONTINUE;
-	}
-	str = rb_fstring_cstr(rb_enc_name(enc));
-	rb_ary_store(ary, idx, str);
+        if (!enc) return ST_CONTINUE;
+        if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
+            return ST_CONTINUE;
+        }
+        str = rb_fstring_cstr(rb_enc_name(enc));
+        rb_ary_store(ary, idx, str);
     }
     key = rb_fstring_cstr((char *)name);
     rb_hash_aset(aliases, key, str);
@@ -1929,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];
 }
@@ -1999,18 +1939,12 @@ 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);
 
     for (i = 0; i < enc_table->count; ++i) {
-	rb_ary_push(list, enc_new(enc_table->list[i].enc));
+        rb_ary_push(list, enc_new(enc_table->list[i].enc));
     }
 
     rb_marshal_define_compat(rb_cEncoding, Qnil, 0, enc_m_loader);
@@ -2027,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 205ea6a451..b3c715e0a1 100644
--- a/enum.c
+++ b/enum.c
@@ -65,9 +65,9 @@ static VALUE
 enum_yield(int argc, VALUE ary)
 {
     if (argc > 1)
-	return rb_yield_force_blockarg(ary);
+        return rb_yield_force_blockarg(ary);
     if (argc == 1)
-	return rb_yield(ary);
+        return rb_yield(ary);
     return rb_yield_values2(0, 0);
 }
 
@@ -77,9 +77,9 @@ enum_yield_array(VALUE ary)
     long len = RARRAY_LEN(ary);
 
     if (len > 1)
-	return rb_yield_force_blockarg(ary);
+        return rb_yield_force_blockarg(ary);
     if (len == 1)
-	return rb_yield(RARRAY_AREF(ary, 0));
+        return rb_yield(RARRAY_AREF(ary, 0));
     return rb_yield_values2(0, 0);
 }
 
@@ -90,7 +90,7 @@ grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     ENUM_WANT_SVALUE();
 
     if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
-	rb_ary_push(memo->v2, i);
+        rb_ary_push(memo->v2, i);
     }
     return Qnil;
 }
@@ -106,7 +106,7 @@ grep_regexp_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     converted_element = SYMBOL_P(i) ? i : rb_check_string_type(i);
     match = NIL_P(converted_element) ? Qfalse : rb_reg_match_p(memo->v1, i, 0);
     if (match == memo->u3.value) {
-	rb_ary_push(memo->v2, i);
+        rb_ary_push(memo->v2, i);
     }
     return Qnil;
 }
@@ -118,7 +118,7 @@ grep_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     ENUM_WANT_SVALUE();
 
     if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
-	rb_ary_push(memo->v2, enum_yield(argc, i));
+        rb_ary_push(memo->v2, enum_yield(argc, i));
     }
     return Qnil;
 }
@@ -130,14 +130,14 @@ enum_grep0(VALUE obj, VALUE pat, VALUE test)
     struct MEMO *memo = MEMO_NEW(pat, ary, test);
     rb_block_call_func_t fn;
     if (rb_block_given_p()) {
-	fn = grep_iter_i;
+        fn = grep_iter_i;
     }
     else if (RB_TYPE_P(pat, T_REGEXP) &&
       LIKELY(rb_method_basic_definition_p(CLASS_OF(pat), idEqq))) {
-	fn = grep_regexp_i;
+        fn = grep_regexp_i;
     }
     else {
-	fn = grep_i;
+        fn = grep_i;
     }
     rb_block_call(obj, id_each, 0, 0, fn, (VALUE)memo);
 
@@ -214,13 +214,13 @@ static void
 imemo_count_up(struct MEMO *memo)
 {
     if (memo->flags & COUNT_BIGNUM) {
-	MEMO_V3_SET(memo, rb_int_succ(memo->u3.value));
+        MEMO_V3_SET(memo, rb_int_succ(memo->u3.value));
     }
     else if (++memo->u3.cnt == 0) {
-	/* overflow */
-	unsigned long buf[2] = {0, 1};
-	MEMO_V3_SET(memo, rb_big_unpack(buf, 2));
-	memo->flags |= COUNT_BIGNUM;
+        /* overflow */
+        unsigned long buf[2] = {0, 1};
+        MEMO_V3_SET(memo, rb_big_unpack(buf, 2));
+        memo->flags |= COUNT_BIGNUM;
     }
 }
 
@@ -228,10 +228,10 @@ static VALUE
 imemo_count_value(struct MEMO *memo)
 {
     if (memo->flags & COUNT_BIGNUM) {
-	return memo->u3.value;
+        return memo->u3.value;
     }
     else {
-	return ULONG2NUM(memo->u3.cnt);
+        return ULONG2NUM(memo->u3.cnt);
     }
 }
 
@@ -243,7 +243,7 @@ count_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (rb_equal(i, memo->v1)) {
-	imemo_count_up(memo);
+        imemo_count_up(memo);
     }
     return Qnil;
 }
@@ -254,7 +254,7 @@ count_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     struct MEMO *memo = MEMO_CAST(memop);
 
     if (RTEST(rb_yield_values2(argc, argv))) {
-	imemo_count_up(memo);
+        imemo_count_up(memo);
     }
     return Qnil;
 }
@@ -302,18 +302,18 @@ enum_count(int argc, VALUE *argv, VALUE obj)
     rb_block_call_func *func;
 
     if (argc == 0) {
-	if (rb_block_given_p()) {
-	    func = count_iter_i;
-	}
-	else {
-	    func = count_all_i;
-	}
+        if (rb_block_given_p()) {
+            func = count_iter_i;
+        }
+        else {
+            func = count_all_i;
+        }
     }
     else {
-	rb_scan_args(argc, argv, "1", &item);
-	if (rb_block_given_p()) {
-	    rb_warn("given block not used");
-	}
+        rb_scan_args(argc, argv, "1", &item);
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
         func = count_i;
     }
 
@@ -328,10 +328,10 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (RTEST(enum_yield(argc, i))) {
-	struct MEMO *memo = MEMO_CAST(memop);
-	MEMO_V1_SET(memo, i);
-	memo->u3.cnt = 1;
-	rb_iter_break();
+        struct MEMO *memo = MEMO_CAST(memop);
+        MEMO_V1_SET(memo, i);
+        memo->u3.cnt = 1;
+        rb_iter_break();
     }
     return Qnil;
 }
@@ -368,10 +368,10 @@ enum_find(int argc, VALUE *argv, VALUE obj)
     memo = MEMO_NEW(Qundef, 0, 0);
     rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)memo);
     if (memo->u3.cnt) {
-	return memo->v1;
+        return memo->v1;
     }
     if (!NIL_P(if_none)) {
-	return rb_funcallv(if_none, id_call, 0, 0);
+        return rb_funcallv(if_none, id_call, 0, 0);
     }
     return Qnil;
 }
@@ -384,8 +384,8 @@ find_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (rb_equal(i, memo->v2)) {
-	MEMO_V1_SET(memo, imemo_count_value(memo));
-	rb_iter_break();
+        MEMO_V1_SET(memo, imemo_count_value(memo));
+        rb_iter_break();
     }
     imemo_count_up(memo);
     return Qnil;
@@ -397,8 +397,8 @@ find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     struct MEMO *memo = MEMO_CAST(memop);
 
     if (RTEST(rb_yield_values2(argc, argv))) {
-	MEMO_V1_SET(memo, imemo_count_value(memo));
-	rb_iter_break();
+        MEMO_V1_SET(memo, imemo_count_value(memo));
+        rb_iter_break();
     }
     imemo_count_up(memo);
     return Qnil;
@@ -440,10 +440,10 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
         func = find_index_iter_i;
     }
     else {
-	rb_scan_args(argc, argv, "1", &condition_value);
-	if (rb_block_given_p()) {
-	    rb_warn("given block not used");
-	}
+        rb_scan_args(argc, argv, "1", &condition_value);
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
         func = find_index_i;
     }
 
@@ -458,7 +458,7 @@ find_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
     ENUM_WANT_SVALUE();
 
     if (RTEST(enum_yield(argc, i))) {
-	rb_ary_push(ary, i);
+        rb_ary_push(ary, i);
     }
     return Qnil;
 }
@@ -566,7 +566,7 @@ reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
     ENUM_WANT_SVALUE();
 
     if (!RTEST(enum_yield(argc, i))) {
-	rb_ary_push(ary, i);
+        rb_ary_push(ary, i);
     }
     return Qnil;
 }
@@ -658,10 +658,10 @@ flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
     tmp = rb_check_array_type(i);
 
     if (NIL_P(tmp)) {
-	rb_ary_push(ary, i);
+        rb_ary_push(ary, i);
     }
     else {
-	rb_ary_concat(ary, tmp);
+        rb_ary_concat(ary, tmp);
     }
     return Qnil;
 }
@@ -779,11 +779,11 @@ inject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->v1 == Qundef) {
-	MEMO_V1_SET(memo, i);
+    if (UNDEF_P(memo->v1)) {
+        MEMO_V1_SET(memo, i);
     }
     else {
-	MEMO_V1_SET(memo, rb_yield_values(2, memo->v1, i));
+        MEMO_V1_SET(memo, rb_yield_values(2, memo->v1, i));
     }
     return Qnil;
 }
@@ -796,18 +796,18 @@ inject_op_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->v1 == Qundef) {
-	MEMO_V1_SET(memo, i);
+    if (UNDEF_P(memo->v1)) {
+        MEMO_V1_SET(memo, i);
     }
     else if (SYMBOL_P(name = memo->u3.value)) {
-	const ID mid = SYM2ID(name);
-	MEMO_V1_SET(memo, rb_funcallv_public(memo->v1, mid, 1, &i));
+        const ID mid = SYM2ID(name);
+        MEMO_V1_SET(memo, rb_funcallv_public(memo->v1, mid, 1, &i));
     }
     else {
-	VALUE args[2];
-	args[0] = name;
-	args[1] = i;
-	MEMO_V1_SET(memo, rb_f_send(numberof(args), args, memo->v1));
+        VALUE args[2];
+        args[0] = name;
+        args[1] = i;
+        MEMO_V1_SET(memo, rb_f_send(numberof(args), args, memo->v1));
     }
     return Qnil;
 }
@@ -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)
@@ -835,9 +835,9 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
 
     id = SYM2ID(op);
     if (id == idPLUS) {
-	if (RB_INTEGER_TYPE_P(v) &&
-	    rb_method_basic_definition_p(rb_cInteger, idPLUS) &&
-	    rb_obj_respond_to(v, idPLUS, FALSE)) {
+        if (RB_INTEGER_TYPE_P(v) &&
+            rb_method_basic_definition_p(rb_cInteger, idPLUS) &&
+            rb_obj_respond_to(v, idPLUS, FALSE)) {
             n = 0;
             for (; i < RARRAY_LEN(ary); i++) {
                 e = RARRAY_AREF(ary, i);
@@ -1021,25 +1021,25 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
 
     switch (num_args) {
       case 0:
-	init = Qundef;
-	break;
+        init = Qundef;
+        break;
       case 1:
-	if (rb_block_given_p()) {
-	    break;
-	}
-	id = rb_check_id(&init);
-	op = id ? ID2SYM(id) : init;
-	init = Qundef;
-	iter = inject_op_i;
-	break;
+        if (rb_block_given_p()) {
+            break;
+        }
+        id = rb_check_id(&init);
+        op = id ? ID2SYM(id) : init;
+        init = Qundef;
+        iter = inject_op_i;
+        break;
       case 2:
-	if (rb_block_given_p()) {
-	    rb_warning("given block not used");
-	}
-	id = rb_check_id(&op);
-	if (id) op = ID2SYM(id);
-	iter = inject_op_i;
-	break;
+        if (rb_block_given_p()) {
+            rb_warning("given block not used");
+        }
+        id = rb_check_id(&op);
+        if (id) op = ID2SYM(id);
+        iter = inject_op_i;
+        break;
     }
 
     if (iter == inject_op_i &&
@@ -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;
 }
 
@@ -1063,10 +1063,10 @@ partition_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arys))
     ENUM_WANT_SVALUE();
 
     if (RTEST(enum_yield(argc, i))) {
-	ary = memo->v1;
+        ary = memo->v1;
     }
     else {
-	ary = memo->v2;
+        ary = memo->v2;
     }
     rb_ary_push(ary, i);
     return Qnil;
@@ -1124,11 +1124,11 @@ group_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
     group = enum_yield(argc, i);
     values = rb_hash_aref(hash, group);
     if (!RB_TYPE_P(values, T_ARRAY)) {
-	values = rb_ary_new3(1, i);
-	rb_hash_aset(hash, group, values);
+        values = rb_ary_new3(1, i);
+        rb_hash_aset(hash, group, values);
     }
     else {
-	rb_ary_push(values, i);
+        rb_ary_push(values, i);
     }
     return Qnil;
 }
@@ -1288,12 +1288,12 @@ enum_first(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo;
     rb_check_arity(argc, 0, 1);
     if (argc > 0) {
-	return enum_take(obj, argv[0]);
+        return enum_take(obj, argv[0]);
     }
     else {
-	memo = MEMO_NEW(Qnil, 0, 0);
-	rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)memo);
-	return memo->v1;
+        memo = MEMO_NEW(Qnil, 0, 0);
+        rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)memo);
+        return memo->v1;
     }
 }
 
@@ -1354,18 +1354,18 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
     v = enum_yield(argc, i);
 
     if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
+        rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
     if (RARRAY_LEN(data->buf) != SORT_BY_BUFSIZE*2) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
+        rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
 
     RARRAY_ASET(data->buf, data->n*2, v);
     RARRAY_ASET(data->buf, data->n*2+1, i);
     data->n++;
     if (data->n == SORT_BY_BUFSIZE) {
-	rb_ary_concat(ary, data->buf);
-	data->n = 0;
+        rb_ary_concat(ary, data->buf);
+        data->n = 0;
     }
     return Qnil;
 }
@@ -1373,19 +1373,18 @@ 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;
 
     if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
+        rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
 
     a = *(VALUE *)ap;
     b = *(VALUE *)bp;
 
-    return OPTIMIZED_CMP(a, b, cmp_opt);
+    return OPTIMIZED_CMP(a, b);
 }
 
 /*
@@ -1481,13 +1480,13 @@ enum_sort_by(VALUE obj)
     RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
     if (RB_TYPE_P(obj, T_ARRAY) && RARRAY_LEN(obj) <= LONG_MAX/2) {
-	ary = rb_ary_new2(RARRAY_LEN(obj)*2);
+        ary = rb_ary_new2(RARRAY_LEN(obj)*2);
     }
     else {
-	ary = rb_ary_new();
+        ary = rb_ary_new();
     }
     RBASIC_CLEAR_CLASS(ary);
-    buf = rb_ary_tmp_new(SORT_BY_BUFSIZE*2);
+    buf = rb_ary_hidden_new(SORT_BY_BUFSIZE*2);
     rb_ary_store(buf, SORT_BY_BUFSIZE*2-1, Qnil);
     memo = MEMO_NEW(0, 0, 0);
     data = (struct sort_by_data *)&memo->v1;
@@ -1498,8 +1497,8 @@ enum_sort_by(VALUE obj)
     ary = data->ary;
     buf = data->buf;
     if (data->n) {
-	rb_ary_resize(buf, data->n*2);
-	rb_ary_concat(ary, buf);
+        rb_ary_resize(buf, data->n*2);
+        rb_ary_concat(ary, buf);
     }
     if (RARRAY_LEN(ary) > 2) {
         RARRAY_PTR_USE(ary, ptr,
@@ -1507,10 +1506,10 @@ enum_sort_by(VALUE obj)
                                   sort_by_cmp, (void *)ary));
     }
     if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
+        rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
     for (i=1; i<RARRAY_LEN(ary); i+=2) {
-	RARRAY_ASET(ary, i/2, RARRAY_AREF(ary, i));
+        RARRAY_ASET(ary, i/2, RARRAY_AREF(ary, i));
     }
     rb_ary_resize(ary, RARRAY_LEN(ary)/2);
     RBASIC_SET_CLASS_RAW(ary, rb_cArray);
@@ -1556,8 +1555,8 @@ enum_##name##_func(VALUE result, struct MEMO *memo)
 DEFINE_ENUMFUNCS(all)
 {
     if (!RTEST(result)) {
-	MEMO_V1_SET(memo, Qfalse);
-	rb_iter_break();
+        MEMO_V1_SET(memo, Qfalse);
+        rb_iter_break();
     }
     return Qnil;
 }
@@ -1617,8 +1616,8 @@ enum_all(int argc, VALUE *argv, VALUE obj)
 DEFINE_ENUMFUNCS(any)
 {
     if (RTEST(result)) {
-	MEMO_V1_SET(memo, Qtrue);
-	rb_iter_break();
+        MEMO_V1_SET(memo, Qtrue);
+        rb_iter_break();
     }
     return Qnil;
 }
@@ -1677,13 +1676,13 @@ enum_any(int argc, VALUE *argv, VALUE obj)
 DEFINE_ENUMFUNCS(one)
 {
     if (RTEST(result)) {
-	if (memo->v1 == Qundef) {
-	    MEMO_V1_SET(memo, Qtrue);
-	}
-	else if (memo->v1 == Qtrue) {
-	    MEMO_V1_SET(memo, Qfalse);
-	    rb_iter_break();
-	}
+        if (UNDEF_P(memo->v1)) {
+            MEMO_V1_SET(memo, Qtrue);
+        }
+        else if (memo->v1 == Qtrue) {
+            MEMO_V1_SET(memo, Qfalse);
+            rb_iter_break();
+        }
     }
     return Qnil;
 }
@@ -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
 }
 
@@ -1745,7 +1743,7 @@ nmin_filter(struct nmin_data *data)
     long i, j;
 
     if (data->curlen <= data->n)
-	return;
+        return;
 
     n = data->n;
     beg = RARRAY_PTR(data->buf);
@@ -1765,46 +1763,46 @@ nmin_filter(struct nmin_data *data)
 } while (0)
 
     while (1) {
-	long pivot_index = left + (right-left)/2;
-	long num_pivots = 1;
-
-	SWAP(pivot_index, right);
-	pivot_index = right;
-
-	store_index = left;
-	i = left;
-	while (i <= right-num_pivots) {
-	    int c = data->cmpfunc(GETPTR(i), GETPTR(pivot_index), data);
-	    if (data->rev)
-		c = -c;
-	    if (c == 0) {
-	        SWAP(i, right-num_pivots);
-		num_pivots++;
-		continue;
-	    }
-	    if (c < 0) {
-		SWAP(i, store_index);
-		store_index++;
-	    }
-	    i++;
-	}
-	j = store_index;
-	for (i = right; right-num_pivots < i; i--) {
-	    if (i <= j)
-	        break;
-	    SWAP(j, i);
-	    j++;
-	}
-
-	if (store_index <= n && n <= store_index+num_pivots)
-	    break;
-
-	if (n < store_index) {
-	    right = store_index-1;
-	}
-	else {
-	    left = store_index+num_pivots;
-	}
+        long pivot_index = left + (right-left)/2;
+        long num_pivots = 1;
+
+        SWAP(pivot_index, right);
+        pivot_index = right;
+
+        store_index = left;
+        i = left;
+        while (i <= right-num_pivots) {
+            int c = data->cmpfunc(GETPTR(i), GETPTR(pivot_index), data);
+            if (data->rev)
+                c = -c;
+            if (c == 0) {
+                SWAP(i, right-num_pivots);
+                num_pivots++;
+                continue;
+            }
+            if (c < 0) {
+                SWAP(i, store_index);
+                store_index++;
+            }
+            i++;
+        }
+        j = store_index;
+        for (i = right; right-num_pivots < i; i--) {
+            if (i <= j)
+                break;
+            SWAP(j, i);
+            j++;
+        }
+
+        if (store_index <= n && n <= store_index+num_pivots)
+            break;
+
+        if (n < store_index) {
+            right = store_index-1;
+        }
+        else {
+            left = store_index+num_pivots;
+        }
     }
 #undef GETPTR
 #undef SWAP
@@ -1823,11 +1821,11 @@ nmin_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
     ENUM_WANT_SVALUE();
 
     if (data->by)
-	cmpv = enum_yield(argc, i);
+        cmpv = enum_yield(argc, i);
     else
-	cmpv = i;
+        cmpv = i;
 
-    if (data->limit != Qundef) {
+    if (!UNDEF_P(data->limit)) {
         int c = data->cmpfunc(&cmpv, &data->limit, data);
         if (data->rev)
             c = -c;
@@ -1836,13 +1834,13 @@ nmin_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
     }
 
     if (data->by)
-	rb_ary_push(data->buf, cmpv);
+        rb_ary_push(data->buf, cmpv);
     rb_ary_push(data->buf, i);
 
     data->curlen++;
 
     if (data->curlen == data->bufmax) {
-	nmin_filter(data);
+        nmin_filter(data);
     }
 
     return Qnil;
@@ -1863,28 +1861,28 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
         rb_raise(rb_eArgError, "too big size");
     data.bufmax = data.n * 4;
     data.curlen = 0;
-    data.buf = rb_ary_tmp_new(data.bufmax * (by ? 2 : 1));
+    data.buf = rb_ary_hidden_new(data.bufmax * (by ? 2 : 1));
     data.limit = Qundef;
     data.cmpfunc = by ? nmin_cmp :
                    rb_block_given_p() ? nmin_block_cmp :
-		   nmin_cmp;
+                   nmin_cmp;
     data.rev = rev;
     data.by = by;
     if (ary) {
-	long i;
-	for (i = 0; i < RARRAY_LEN(obj); i++) {
-	    VALUE args[1];
-	    args[0] = RARRAY_AREF(obj, i);
+        long i;
+        for (i = 0; i < RARRAY_LEN(obj); i++) {
+            VALUE args[1];
+            args[0] = RARRAY_AREF(obj, i);
             nmin_i(obj, (VALUE)&data, 1, args, Qundef);
-	}
+        }
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, nmin_i, (VALUE)&data);
+        rb_block_call(obj, id_each, 0, 0, nmin_i, (VALUE)&data);
     }
     nmin_filter(&data);
     result = data.buf;
     if (by) {
-	long i;
+        long i;
         RARRAY_PTR_USE(result, ptr, {
             ruby_qsort(ptr,
                        RARRAY_LEN(result)/2,
@@ -1894,7 +1892,7 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
                 ptr[i/2] = ptr[i];
             }
         });
-	rb_ary_resize(result, RARRAY_LEN(result)/2);
+        rb_ary_resize(result, RARRAY_LEN(result)/2);
     }
     else {
         RARRAY_PTR_USE(result, ptr, {
@@ -1962,15 +1960,15 @@ 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;
 }
 
 DEFINE_ENUMFUNCS(none)
 {
     if (RTEST(result)) {
-	MEMO_V1_SET(memo, Qfalse);
-	rb_iter_break();
+        MEMO_V1_SET(memo, Qfalse);
+        rb_iter_break();
     }
     return Qnil;
 }
@@ -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,13 +2034,13 @@ min_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->min == Qundef) {
-	memo->min = i;
+    if (UNDEF_P(memo->min)) {
+        memo->min = i;
     }
     else {
-	if (OPTIMIZED_CMP(i, memo->min, memo->cmp_opt) < 0) {
-	    memo->min = i;
-	}
+        if (OPTIMIZED_CMP(i, memo->min) < 0) {
+            memo->min = i;
+        }
     }
     return Qnil;
 }
@@ -2056,14 +2053,14 @@ min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->min == Qundef) {
-	memo->min = i;
+    if (UNDEF_P(memo->min)) {
+        memo->min = i;
     }
     else {
-	cmp = rb_yield_values(2, i, memo->min);
-	if (rb_cmpint(cmp, i, memo->min) < 0) {
-	    memo->min = i;
-	}
+        cmp = rb_yield_values(2, i, memo->min);
+        if (rb_cmpint(cmp, i, memo->min) < 0) {
+            memo->min = i;
+        }
     }
     return Qnil;
 }
@@ -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,22 +2135,19 @@ 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);
+        rb_block_call(obj, id_each, 0, 0, min_ii, memo);
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, min_i, memo);
+        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,13 +2157,13 @@ max_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->max == Qundef) {
-	memo->max = i;
+    if (UNDEF_P(memo->max)) {
+        memo->max = i;
     }
     else {
-	if (OPTIMIZED_CMP(i, memo->max, memo->cmp_opt) > 0) {
-	    memo->max = i;
-	}
+        if (OPTIMIZED_CMP(i, memo->max) > 0) {
+            memo->max = i;
+        }
     }
     return Qnil;
 }
@@ -2182,14 +2176,14 @@ max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
     ENUM_WANT_SVALUE();
 
-    if (memo->max == Qundef) {
-	memo->max = i;
+    if (UNDEF_P(memo->max)) {
+        memo->max = i;
     }
     else {
-	cmp = rb_yield_values(2, i, memo->max);
-	if (rb_cmpint(cmp, i, memo->max) > 0) {
-	    memo->max = i;
-	}
+        cmp = rb_yield_values(2, i, memo->max);
+        if (rb_cmpint(cmp, i, memo->max) > 0) {
+            memo->max = i;
+        }
     }
     return Qnil;
 }
@@ -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,16 +2257,14 @@ 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);
+        rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)memo);
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)memo);
+        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,19 +2279,19 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
 {
     int n;
 
-    if (memo->min == Qundef) {
-	memo->min = i;
-	memo->max = j;
+    if (UNDEF_P(memo->min)) {
+        memo->min = i;
+        memo->max = j;
     }
     else {
-	n = OPTIMIZED_CMP(i, memo->min, memo->cmp_opt);
-	if (n < 0) {
-	    memo->min = i;
-	}
-	n = OPTIMIZED_CMP(j, memo->max, memo->cmp_opt);
-	if (n > 0) {
-	    memo->max = j;
-	}
+        n = OPTIMIZED_CMP(i, memo->min);
+        if (n < 0) {
+            memo->min = i;
+        }
+        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,19 +2331,19 @@ minmax_ii_update(VALUE i, VALUE j, struct minmax_t *memo)
 {
     int n;
 
-    if (memo->min == Qundef) {
-	memo->min = i;
-	memo->max = j;
+    if (UNDEF_P(memo->min)) {
+        memo->min = i;
+        memo->max = j;
     }
     else {
-	n = rb_cmpint(rb_yield_values(2, i, memo->min), i, memo->min);
-	if (n < 0) {
-	    memo->min = i;
-	}
-	n = rb_cmpint(rb_yield_values(2, j, memo->max), j, memo->max);
-	if (n > 0) {
-	    memo->max = j;
-	}
+        n = rb_cmpint(rb_yield_values(2, i, memo->min), i, memo->min);
+        if (n < 0) {
+            memo->min = i;
+        }
+        n = rb_cmpint(rb_yield_values(2, j, memo->max), j, memo->max);
+        if (n > 0) {
+            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,24 +2413,22 @@ 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)
-	    minmax_ii_update(m->last, m->last, m);
+        rb_block_call(obj, id_each, 0, 0, minmax_ii, memo);
+        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)
-	    minmax_i_update(m->last, m->last, m);
+        rb_block_call(obj, id_each, 0, 0, minmax_i, memo);
+        if (!UNDEF_P(m->last))
+            minmax_i_update(m->last, m->last, m);
     }
-    if (m->min != Qundef) {
-	return rb_assoc_new(m->min, m->max);
+    if (!UNDEF_P(m->min)) {
+        return rb_assoc_new(m->min, m->max);
     }
     return rb_assoc_new(Qnil, Qnil);
 }
@@ -2447,20 +2436,19 @@ 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) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    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) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    else if (OPTIMIZED_CMP(v, memo->v1) < 0) {
+        MEMO_V1_SET(memo, v);
+        MEMO_V2_SET(memo, i);
     }
     return Qnil;
 }
@@ -2522,20 +2510,19 @@ 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) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    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) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    else if (OPTIMIZED_CMP(v, memo->v1) > 0) {
+        MEMO_V1_SET(memo, v);
+        MEMO_V2_SET(memo, i);
     }
     return Qnil;
 }
@@ -2606,30 +2593,27 @@ 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) {
-	memo->min_bv = v1;
-	memo->max_bv = v2;
-	memo->min = i1;
-	memo->max = i2;
+    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) {
-	    memo->min_bv = v1;
-	    memo->min = i1;
-	}
-	if (OPTIMIZED_CMP(v2, memo->max_bv, cmp_opt) > 0) {
-	    memo->max_bv = v2;
-	    memo->max = i2;
-	}
+        if (OPTIMIZED_CMP(v1, memo->min_bv) < 0) {
+            memo->min_bv = v1;
+            memo->min = i1;
+        }
+        if (OPTIMIZED_CMP(v2, memo->max_bv) > 0) {
+            memo->max_bv = v2;
+            memo->max = i2;
+        }
     }
 }
 
 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);
@@ -2717,8 +2701,8 @@ member_i(RB_BLOCK_CALL_FUNC_ARGLIST(iter, args))
     struct MEMO *memo = MEMO_CAST(args);
 
     if (rb_equal(rb_enum_values_pack(argc, argv), memo->v1)) {
-	MEMO_V2_SET(memo, Qtrue);
-	rb_iter_break();
+        MEMO_V2_SET(memo, Qtrue);
+        rb_iter_break();
     }
     return Qnil;
 }
@@ -2935,14 +2919,14 @@ each_slice_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
     rb_ary_push(ary, i);
 
     if (RARRAY_LEN(ary) == size) {
-	v = rb_yield(ary);
+        v = rb_yield(ary);
 
-	if (memo->v2) {
-	    MEMO_V1_SET(memo, rb_ary_new2(size));
-	}
-	else {
-	    rb_ary_clear(ary);
-	}
+        if (memo->v2) {
+            MEMO_V1_SET(memo, rb_ary_new2(size));
+        }
+        else {
+            rb_ary_clear(ary);
+        }
     }
 
     return v;
@@ -3018,14 +3002,14 @@ each_cons_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     ENUM_WANT_SVALUE();
 
     if (RARRAY_LEN(ary) == size) {
-	rb_ary_shift(ary);
+        rb_ary_shift(ary);
     }
     rb_ary_push(ary, i);
     if (RARRAY_LEN(ary) == size) {
-	if (memo->v2) {
-	    ary = rb_ary_dup(ary);
-	}
-	v = rb_yield(ary);
+        if (memo->v2) {
+            ary = rb_ary_dup(ary);
+        }
+        v = rb_yield(ary);
     }
     return v;
 }
@@ -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;
 }
 
 /*
@@ -3130,20 +3113,20 @@ zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
     tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
     rb_ary_store(tmp, 0, rb_enum_values_pack(argc, argv));
     for (i=0; i<RARRAY_LEN(args); i++) {
-	VALUE e = RARRAY_AREF(args, i);
+        VALUE e = RARRAY_AREF(args, i);
 
-	if (RARRAY_LEN(e) <= n) {
-	    rb_ary_push(tmp, Qnil);
-	}
-	else {
-	    rb_ary_push(tmp, RARRAY_AREF(e, n));
-	}
+        if (RARRAY_LEN(e) <= n) {
+            rb_ary_push(tmp, Qnil);
+        }
+        else {
+            rb_ary_push(tmp, RARRAY_AREF(e, n));
+        }
     }
     if (NIL_P(result)) {
-	enum_yield_array(tmp);
+        enum_yield_array(tmp);
     }
     else {
-	rb_ary_push(result, tmp);
+        rb_ary_push(result, tmp);
     }
 
     RB_GC_GUARD(args);
@@ -3177,26 +3160,26 @@ zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
     tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
     rb_ary_store(tmp, 0, rb_enum_values_pack(argc, argv));
     for (i=0; i<RARRAY_LEN(args); i++) {
-	if (NIL_P(RARRAY_AREF(args, i))) {
-	    rb_ary_push(tmp, Qnil);
-	}
-	else {
-	    VALUE v[2];
-
-	    v[1] = RARRAY_AREF(args, i);
-	    rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, (VALUE)0);
-	    if (v[0] == Qundef) {
-		RARRAY_ASET(args, i, Qnil);
-		v[0] = Qnil;
-	    }
-	    rb_ary_push(tmp, v[0]);
-	}
+        if (NIL_P(RARRAY_AREF(args, i))) {
+            rb_ary_push(tmp, Qnil);
+        }
+        else {
+            VALUE v[2];
+
+            v[1] = RARRAY_AREF(args, i);
+            rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, (VALUE)0);
+            if (UNDEF_P(v[0])) {
+                RARRAY_ASET(args, i, Qnil);
+                v[0] = Qnil;
+            }
+            rb_ary_push(tmp, v[0]);
+        }
     }
     if (NIL_P(result)) {
-	enum_yield_array(tmp);
+        enum_yield_array(tmp);
     }
     else {
-	rb_ary_push(result, tmp);
+        rb_ary_push(result, tmp);
     }
 
     RB_GC_GUARD(args);
@@ -3283,26 +3266,26 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
 
     argv = RARRAY_PTR(args);
     for (i=0; i<argc; i++) {
-	VALUE ary = rb_check_array_type(argv[i]);
-	if (NIL_P(ary)) {
-	    allary = FALSE;
-	    break;
-	}
-	argv[i] = ary;
+        VALUE ary = rb_check_array_type(argv[i]);
+        if (NIL_P(ary)) {
+            allary = FALSE;
+            break;
+        }
+        argv[i] = ary;
     }
     if (!allary) {
-	static const VALUE sym_each = STATIC_ID2SYM(id_each);
-	CONST_ID(conv, "to_enum");
-	for (i=0; i<argc; i++) {
-	    if (!rb_respond_to(argv[i], id_each)) {
-		rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
-			 rb_obj_class(argv[i]));
+        static const VALUE sym_each = STATIC_ID2SYM(id_each);
+        CONST_ID(conv, "to_enum");
+        for (i=0; i<argc; i++) {
+            if (!rb_respond_to(argv[i], id_each)) {
+                rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
+                         rb_obj_class(argv[i]));
             }
-	    argv[i] = rb_funcallv(argv[i], conv, 1, &sym_each);
-	}
+            argv[i] = rb_funcallv(argv[i], conv, 1, &sym_each);
+        }
     }
     if (!rb_block_given_p()) {
-	result = rb_ary_new();
+        result = rb_ary_new();
     }
 
     /* TODO: use NODE_DOT2 as memo(v, v, -) */
@@ -3344,7 +3327,7 @@ enum_take(VALUE obj, VALUE n)
     long len = NUM2LONG(n);
 
     if (len < 0) {
-	rb_raise(rb_eArgError, "attempt to take negative size");
+        rb_raise(rb_eArgError, "attempt to take negative size");
     }
 
     if (len == 0) return rb_ary_new2(0);
@@ -3398,10 +3381,10 @@ drop_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
     struct MEMO *memo = MEMO_CAST(args);
     if (memo->u3.cnt == 0) {
-	rb_ary_push(memo->v1, rb_enum_values_pack(argc, argv));
+        rb_ary_push(memo->v1, rb_enum_values_pack(argc, argv));
     }
     else {
-	memo->u3.cnt--;
+        memo->u3.cnt--;
     }
     return Qnil;
 }
@@ -3433,7 +3416,7 @@ enum_drop(VALUE obj, VALUE n)
     long len = NUM2LONG(n);
 
     if (len < 0) {
-	rb_raise(rb_eArgError, "attempt to drop negative size");
+        rb_raise(rb_eArgError, "attempt to drop negative size");
     }
 
     result = rb_ary_new();
@@ -3450,10 +3433,10 @@ drop_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     ENUM_WANT_SVALUE();
 
     if (!memo->u3.state && !RTEST(enum_yield(argc, i))) {
-	memo->u3.state = TRUE;
+        memo->u3.state = TRUE;
     }
     if (memo->u3.state) {
-	rb_ary_push(memo->v1, i);
+        rb_ary_push(memo->v1, i);
     }
     return Qnil;
 }
@@ -3508,8 +3491,8 @@ enum_cycle_size(VALUE self, VALUE args, VALUE eobj)
     VALUE size;
 
     if (args && (RARRAY_LEN(args) > 0)) {
-	n = RARRAY_AREF(args, 0);
-	if (!NIL_P(n)) mul = NUM2LONG(n);
+        n = RARRAY_AREF(args, 0);
+        if (!NIL_P(n)) mul = NUM2LONG(n);
     }
 
     size = enum_size(self, args, 0);
@@ -3572,7 +3555,7 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
     if (len == 0) return Qnil;
     while (n < 0 || 0 < --n) {
         for (i=0; i<len; i++) {
-	    enum_yield_array(RARRAY_AREF(ary, i));
+            enum_yield_array(RARRAY_AREF(ary, i));
         }
     }
     return Qnil;
@@ -3599,22 +3582,22 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
 
     if (v == alone) {
         if (!NIL_P(argp->prev_value)) {
-	    s = rb_assoc_new(argp->prev_value, argp->prev_elts);
+            s = rb_assoc_new(argp->prev_value, argp->prev_elts);
             rb_funcallv(argp->yielder, id_lshift, 1, &s);
             argp->prev_value = argp->prev_elts = Qnil;
         }
-	v = rb_assoc_new(v, rb_ary_new3(1, i));
+        v = rb_assoc_new(v, rb_ary_new3(1, i));
         rb_funcallv(argp->yielder, id_lshift, 1, &v);
     }
     else if (NIL_P(v) || v == separator) {
         if (!NIL_P(argp->prev_value)) {
-	    v = rb_assoc_new(argp->prev_value, argp->prev_elts);
+            v = rb_assoc_new(argp->prev_value, argp->prev_elts);
             rb_funcallv(argp->yielder, id_lshift, 1, &v);
             argp->prev_value = argp->prev_elts = Qnil;
         }
     }
     else if (SYMBOL_P(v) && (s = rb_sym2str(v), RSTRING_PTR(s)[0] == '_')) {
-	rb_raise(rb_eRuntimeError, "symbols beginning with an underscore are reserved");
+        rb_raise(rb_eRuntimeError, "symbols beginning with an underscore are reserved");
     }
     else {
         if (NIL_P(argp->prev_value)) {
@@ -3626,7 +3609,7 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
                 rb_ary_push(argp->prev_elts, i);
             }
             else {
-		s = rb_assoc_new(argp->prev_value, argp->prev_elts);
+                s = rb_assoc_new(argp->prev_value, argp->prev_elts);
                 rb_funcallv(argp->yielder, id_lshift, 1, &s);
                 argp->prev_value = v;
                 argp->prev_elts = rb_ary_new3(1, i);
@@ -3652,8 +3635,8 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
     rb_block_call(enumerable, id_each, 0, 0, chunk_ii, arg);
     memo = MEMO_FOR(struct chunk_arg, arg);
     if (!NIL_P(memo->prev_elts)) {
-	arg = rb_assoc_new(memo->prev_value, memo->prev_elts);
-	rb_funcallv(memo->yielder, id_lshift, 1, &arg);
+        arg = rb_assoc_new(memo->prev_value, memo->prev_elts);
+        rb_funcallv(memo->yielder, id_lshift, 1, &arg);
     }
     return 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,15 +4138,15 @@ 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);
     }
     else {
-	VALUE args[2];
-	args[0] = memo->prev_elt;
-	args[1] = i;
+        VALUE args[2];
+        args[0] = memo->prev_elt;
+        args[1] = i;
         split_p = RTEST(rb_funcallv(memo->pred, id_call, 2, args));
         UPDATE_MEMO;
 
@@ -4192,7 +4175,7 @@ slicewhen_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
     VALUE enumerable;
     VALUE arg;
     struct slicewhen_arg *memo =
-	NEW_PARTIAL_MEMO_FOR(struct slicewhen_arg, arg, inverted);
+        NEW_PARTIAL_MEMO_FOR(struct slicewhen_arg, arg, inverted);
 
     enumerable = rb_ivar_get(enumerator, id_slicewhen_enum);
     memo->pred = rb_attr_get(enumerator, id_slicewhen_pred);
@@ -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;
@@ -4665,7 +4648,7 @@ enum_uniq(VALUE obj)
 {
     VALUE hash, ret;
     rb_block_call_func *const func =
-	rb_block_given_p() ? uniq_iter : uniq_func;
+        rb_block_given_p() ? uniq_iter : uniq_func;
 
     hash = rb_obj_hide(rb_hash_new());
     rb_block_call(obj, id_each, 0, 0, func, hash);
@@ -4808,7 +4791,7 @@ enum_compact(VALUE obj)
  * - #grep_v: Returns elements selected by a given object
  *   or objects returned by a given block.
  * - #reduce, #inject: Returns the object formed by combining all elements.
- * - #sum: Returns the sum of the elements, using method +++.
+ * - #sum: Returns the sum of the elements, using method <tt>+</tt>.
  * - #zip: Combines each element with elements from other enumerables;
  *   returns the n-tuples or calls the block with each.
  * - #cycle: Calls the block with each element, cycling repeatedly.
diff --git a/enumerator.c b/enumerator.c
index be469ee38b..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
@@ -125,14 +157,17 @@
  */
 VALUE rb_cEnumerator;
 static VALUE rb_cLazy;
-static ID id_rewind, id_new, id_to_enum;
+static ID id_rewind, id_new, id_to_enum, id_each_entry;
 static ID id_next, id_result, id_receiver, id_arguments, id_memo, id_method, id_force;
 static ID id_begin, id_end, id_step, id_exclude_end;
 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 {
@@ -194,6 +231,12 @@ struct enum_chain {
     long pos;
 };
 
+static VALUE rb_cEnumProduct;
+
+struct enum_product {
+    VALUE enums;
+};
+
 VALUE rb_cArithSeq;
 
 /*
@@ -240,9 +283,9 @@ enumerator_memsize(const void *p)
 static const rb_data_type_t enumerator_data_type = {
     "enumerator",
     {
-	enumerator_mark,
-	enumerator_free,
-	enumerator_memsize,
+        enumerator_mark,
+        enumerator_free,
+        enumerator_memsize,
         enumerator_compact,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
@@ -254,8 +297,8 @@ enumerator_ptr(VALUE obj)
     struct enumerator *ptr;
 
     TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, ptr);
-    if (!ptr || ptr->obj == Qundef) {
-	rb_raise(rb_eArgError, "uninitialized enumerator");
+    if (!ptr || UNDEF_P(ptr->obj)) {
+        rb_raise(rb_eArgError, "uninitialized enumerator");
     }
     return ptr;
 }
@@ -287,9 +330,9 @@ proc_entry_memsize(const void *p)
 static const rb_data_type_t proc_entry_data_type = {
     "proc_entry",
     {
-	proc_entry_mark,
-	proc_entry_free,
-	proc_entry_memsize,
+        proc_entry_mark,
+        proc_entry_free,
+        proc_entry_memsize,
         proc_entry_compact,
     },
 };
@@ -371,12 +414,12 @@ obj_to_enum(int argc, VALUE *argv, VALUE obj)
     VALUE enumerator, meth = sym_each;
 
     if (argc > 0) {
-	--argc;
-	meth = *argv++;
+        --argc;
+        meth = *argv++;
     }
     enumerator = rb_enumeratorize_with_size(obj, meth, argc, argv, 0);
     if (rb_block_given_p()) {
-	enumerator_ptr(enumerator)->size = rb_block_proc();
+        enumerator_ptr(enumerator)->size = rb_block_proc();
     }
     return enumerator;
 }
@@ -402,7 +445,7 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar
     TypedData_Get_Struct(enum_obj, struct enumerator, &enumerator_data_type, ptr);
 
     if (!ptr) {
-	rb_raise(rb_eArgError, "unallocated enumerator");
+        rb_raise(rb_eArgError, "unallocated enumerator");
     }
 
     ptr->obj  = obj;
@@ -482,14 +525,14 @@ enumerator_init_copy(VALUE obj, VALUE orig)
     if (!OBJ_INIT_COPY(obj, orig)) return obj;
     ptr0 = enumerator_ptr(orig);
     if (ptr0->fib) {
-	/* Fibers cannot be copied */
-	rb_raise(rb_eTypeError, "can't copy execution context");
+        /* Fibers cannot be copied */
+        rb_raise(rb_eTypeError, "can't copy execution context");
     }
 
     TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, ptr1);
 
     if (!ptr1) {
-	rb_raise(rb_eArgError, "unallocated enumerator");
+        rb_raise(rb_eArgError, "unallocated enumerator");
     }
 
     ptr1->obj  = ptr0->obj;
@@ -513,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)
@@ -547,8 +590,8 @@ enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg)
     ID meth = e->meth;
 
     if (e->args) {
-	argc = RARRAY_LENINT(e->args);
-	argv = RARRAY_CONST_PTR(e->args);
+        argc = RARRAY_LENINT(e->args);
+        argv = RARRAY_CONST_PTR(e->args);
     }
     return rb_block_call_kw(e->obj, meth, argc, argv, func, arg, e->kw_splat);
 }
@@ -592,25 +635,29 @@ 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;
-	if (args) {
+        VALUE args = (e = enumerator_ptr(obj = rb_obj_dup(obj)))->args;
+        if (args) {
 #if SIZEOF_INT < SIZEOF_LONG
-	    /* check int range overflow */
-	    rb_long2int(RARRAY_LEN(args) + argc);
+            /* check int range overflow */
+            rb_long2int(RARRAY_LEN(args) + argc);
 #endif
-	    args = rb_ary_dup(args);
-	    rb_ary_cat(args, argv, argc);
-	}
-	else {
-	    args = rb_ary_new4(argc, argv);
-	}
-	e->args = args;
+            args = rb_ary_dup(args);
+            rb_ary_cat(args, argv, argc);
+        }
+        else {
+            args = rb_ary_new4(argc, argv);
+        }
+        e->args = args;
         e->size = Qnil;
         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);
 }
 
@@ -622,7 +669,7 @@ enumerator_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
     MEMO_V1_SET(memo, rb_int_succ(idx));
 
     if (argc <= 1)
-	return rb_yield_values(2, val, idx);
+        return rb_yield_values(2, val, idx);
 
     return rb_yield_values(2, rb_ary_new4(argc, argv), idx);
 }
@@ -679,7 +726,7 @@ static VALUE
 enumerator_with_object_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memo))
 {
     if (argc <= 1)
-	return rb_yield_values(2, val, memo);
+        return rb_yield_values(2, val, memo);
 
     return rb_yield_values(2, rb_ary_new4(argc, argv), memo);
 }
@@ -729,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;
     }
@@ -763,22 +810,30 @@ 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();
 
     if (!e->fib || !rb_fiber_alive_p(e->fib)) {
-	next_init(obj, e);
+        next_init(obj, e);
     }
 
     vs = rb_fiber_resume(e->fib, 1, &curr);
     if (e->stop_exc) {
-	e->fib = 0;
-	e->dst = Qnil;
-	e->lookahead = Qundef;
-	e->feedvalue = Qundef;
-	rb_exc_raise(e->stop_exc);
+        e->fib = 0;
+        e->dst = Qnil;
+        e->lookahead = Qundef;
+        e->feedvalue = Qundef;
+        rb_exc_raise(e->stop_exc);
     }
     return vs;
 }
@@ -834,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;
@@ -895,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;
@@ -1019,8 +1074,8 @@ enumerator_feed(VALUE obj, VALUE v)
 {
     struct enumerator *e = enumerator_ptr(obj);
 
-    if (e->feedvalue != Qundef) {
-	rb_raise(rb_eTypeError, "feed value already set");
+    if (!UNDEF_P(e->feedvalue)) {
+        rb_raise(rb_eTypeError, "feed value already set");
     }
     e->feedvalue = v;
 
@@ -1064,37 +1119,37 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
 
     cname = rb_obj_class(obj);
 
-    if (!e || e->obj == Qundef) {
-	return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(cname));
+    if (!e || UNDEF_P(e->obj)) {
+        return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(cname));
     }
 
     if (recur) {
-	str = rb_sprintf("#<%"PRIsVALUE": ...>", rb_class_path(cname));
-	return str;
+        str = rb_sprintf("#<%"PRIsVALUE": ...>", rb_class_path(cname));
+        return str;
     }
 
     if (e->procs) {
-	long i;
-
-	eobj = generator_ptr(e->obj)->obj;
-	/* In case procs chained enumerator traversing all proc entries manually */
-	if (rb_obj_class(eobj) == cname) {
-	    str = rb_inspect(eobj);
-	}
-	else {
-	    str = rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE">", rb_class_path(cname), eobj);
-	}
-	for (i = 0; i < RARRAY_LEN(e->procs); i++) {
-	    str = rb_sprintf("#<%"PRIsVALUE": %"PRIsVALUE, cname, str);
-	    append_method(RARRAY_AREF(e->procs, i), str, e->meth, e->args);
-	    rb_str_buf_cat2(str, ">");
-	}
-	return str;
+        long i;
+
+        eobj = generator_ptr(e->obj)->obj;
+        /* In case procs chained enumerator traversing all proc entries manually */
+        if (rb_obj_class(eobj) == cname) {
+            str = rb_inspect(eobj);
+        }
+        else {
+            str = rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE">", rb_class_path(cname), eobj);
+        }
+        for (i = 0; i < RARRAY_LEN(e->procs); i++) {
+            str = rb_sprintf("#<%"PRIsVALUE": %"PRIsVALUE, cname, str);
+            append_method(RARRAY_AREF(e->procs, i), str, e->meth, e->args);
+            rb_str_buf_cat2(str, ">");
+        }
+        return str;
     }
 
     eobj = rb_attr_get(obj, id_receiver);
     if (NIL_P(eobj)) {
-	eobj = e->obj;
+        eobj = e->obj;
     }
 
     /* (1..100).each_cons(2) => "#<Enumerator: 1..100:each_cons(2)>" */
@@ -1129,48 +1184,48 @@ append_method(VALUE obj, VALUE str, ID default_method, VALUE default_args)
 
     method = rb_attr_get(obj, id_method);
     if (method != Qfalse) {
-	if (!NIL_P(method)) {
-	    Check_Type(method, T_SYMBOL);
-	    method = rb_sym2str(method);
-	}
-	else {
-	    method = rb_id2str(default_method);
-	}
-	rb_str_buf_cat2(str, ":");
-	rb_str_buf_append(str, method);
+        if (!NIL_P(method)) {
+            Check_Type(method, T_SYMBOL);
+            method = rb_sym2str(method);
+        }
+        else {
+            method = rb_id2str(default_method);
+        }
+        rb_str_buf_cat2(str, ":");
+        rb_str_buf_append(str, method);
     }
 
     eargs = rb_attr_get(obj, id_arguments);
     if (NIL_P(eargs)) {
-	eargs = default_args;
+        eargs = default_args;
     }
     if (eargs != Qfalse) {
-	long   argc = RARRAY_LEN(eargs);
-	const VALUE *argv = RARRAY_CONST_PTR(eargs); /* WB: no new reference */
+        long   argc = RARRAY_LEN(eargs);
+        const VALUE *argv = RARRAY_CONST_PTR(eargs); /* WB: no new reference */
 
-	if (argc > 0) {
-	    VALUE kwds = Qnil;
+        if (argc > 0) {
+            VALUE kwds = Qnil;
 
-	    rb_str_buf_cat2(str, "(");
+            rb_str_buf_cat2(str, "(");
 
             if (RB_TYPE_P(argv[argc-1], T_HASH) && !RHASH_EMPTY_P(argv[argc-1])) {
-		int all_key = TRUE;
-		rb_hash_foreach(argv[argc-1], key_symbol_p, (VALUE)&all_key);
-		if (all_key) kwds = argv[--argc];
-	    }
+                int all_key = TRUE;
+                rb_hash_foreach(argv[argc-1], key_symbol_p, (VALUE)&all_key);
+                if (all_key) kwds = argv[--argc];
+            }
 
-	    while (argc--) {
-		VALUE arg = *argv++;
+            while (argc--) {
+                VALUE arg = *argv++;
 
-		rb_str_append(str, rb_inspect(arg));
-		rb_str_buf_cat2(str, ", ");
-	    }
-	    if (!NIL_P(kwds)) {
-		rb_hash_foreach(kwds, kwd_append, str);
-	    }
-	    rb_str_set_len(str, RSTRING_LEN(str)-2);
-	    rb_str_buf_cat2(str, ")");
-	}
+                rb_str_append(str, rb_inspect(arg));
+                rb_str_buf_cat2(str, ", ");
+            }
+            if (!NIL_P(kwds)) {
+                rb_hash_foreach(kwds, kwd_append, str);
+            }
+            rb_str_set_len(str, RSTRING_LEN(str)-2);
+            rb_str_buf_cat2(str, ")");
+        }
     }
 
     return str;
@@ -1209,31 +1264,31 @@ enumerator_size(VALUE obj)
     VALUE size;
 
     if (e->procs) {
-	struct generator *g = generator_ptr(e->obj);
-	VALUE receiver = rb_check_funcall(g->obj, id_size, 0, 0);
-	long i = 0;
-
-	for (i = 0; i < RARRAY_LEN(e->procs); i++) {
-	    VALUE proc = RARRAY_AREF(e->procs, i);
-	    struct proc_entry *entry = proc_entry_ptr(proc);
-	    lazyenum_size_func *size_fn = entry->fn->size;
-	    if (!size_fn) {
-		return Qnil;
-	    }
-	    receiver = (*size_fn)(proc, receiver);
-	}
-	return receiver;
+        struct generator *g = generator_ptr(e->obj);
+        VALUE receiver = rb_check_funcall(g->obj, id_size, 0, 0);
+        long i = 0;
+
+        for (i = 0; i < RARRAY_LEN(e->procs); i++) {
+            VALUE proc = RARRAY_AREF(e->procs, i);
+            struct proc_entry *entry = proc_entry_ptr(proc);
+            lazyenum_size_func *size_fn = entry->fn->size;
+            if (!size_fn) {
+                return Qnil;
+            }
+            receiver = (*size_fn)(proc, receiver);
+        }
+        return receiver;
     }
 
     if (e->size_fn) {
-	return (*e->size_fn)(e->obj, e->args, obj);
+        return (*e->size_fn)(e->obj, e->args, obj);
     }
     if (e->args) {
-	argc = (int)RARRAY_LEN(e->args);
-	argv = RARRAY_CONST_PTR(e->args);
+        argc = (int)RARRAY_LEN(e->args);
+        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;
 }
 
@@ -1265,9 +1320,9 @@ yielder_memsize(const void *p)
 static const rb_data_type_t yielder_data_type = {
     "yielder",
     {
-	yielder_mark,
-	yielder_free,
-	yielder_memsize,
+        yielder_mark,
+        yielder_free,
+        yielder_memsize,
         yielder_compact,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
@@ -1279,8 +1334,8 @@ yielder_ptr(VALUE obj)
     struct yielder *ptr;
 
     TypedData_Get_Struct(obj, struct yielder, &yielder_data_type, ptr);
-    if (!ptr || ptr->proc == Qundef) {
-	rb_raise(rb_eArgError, "uninitialized yielder");
+    if (!ptr || UNDEF_P(ptr->proc)) {
+        rb_raise(rb_eArgError, "uninitialized yielder");
     }
     return ptr;
 }
@@ -1306,7 +1361,7 @@ yielder_init(VALUE obj, VALUE proc)
     TypedData_Get_Struct(obj, struct yielder, &yielder_data_type, ptr);
 
     if (!ptr) {
-	rb_raise(rb_eArgError, "unallocated yielder");
+        rb_raise(rb_eArgError, "unallocated yielder");
     }
 
     ptr->proc = proc;
@@ -1405,9 +1460,9 @@ generator_memsize(const void *p)
 static const rb_data_type_t generator_data_type = {
     "generator",
     {
-	generator_mark,
-	generator_free,
-	generator_memsize,
+        generator_mark,
+        generator_free,
+        generator_memsize,
         generator_compact,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
@@ -1419,8 +1474,8 @@ generator_ptr(VALUE obj)
     struct generator *ptr;
 
     TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr);
-    if (!ptr || ptr->proc == Qundef) {
-	rb_raise(rb_eArgError, "uninitialized generator");
+    if (!ptr || UNDEF_P(ptr->proc)) {
+        rb_raise(rb_eArgError, "uninitialized generator");
     }
     return ptr;
 }
@@ -1447,7 +1502,7 @@ generator_init(VALUE obj, VALUE proc)
     TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr);
 
     if (!ptr) {
-	rb_raise(rb_eArgError, "unallocated generator");
+        rb_raise(rb_eArgError, "unallocated generator");
     }
 
     ptr->proc = proc;
@@ -1462,21 +1517,21 @@ generator_initialize(int argc, VALUE *argv, VALUE obj)
     VALUE proc;
 
     if (argc == 0) {
-	rb_need_block();
+        rb_need_block();
 
-	proc = rb_block_proc();
+        proc = rb_block_proc();
     }
     else {
-	rb_scan_args(argc, argv, "1", &proc);
+        rb_scan_args(argc, argv, "1", &proc);
 
-	if (!rb_obj_is_proc(proc))
-	    rb_raise(rb_eTypeError,
-		     "wrong argument type %"PRIsVALUE" (expected Proc)",
-		     rb_obj_class(proc));
+        if (!rb_obj_is_proc(proc))
+            rb_raise(rb_eTypeError,
+                     "wrong argument type %"PRIsVALUE" (expected Proc)",
+                     rb_obj_class(proc));
 
-	if (rb_block_given_p()) {
-	    rb_warn("given block not used");
-	}
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
     }
 
     return generator_init(obj, proc);
@@ -1495,7 +1550,7 @@ generator_init_copy(VALUE obj, VALUE orig)
     TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr1);
 
     if (!ptr1) {
-	rb_raise(rb_eArgError, "unallocated generator");
+        rb_raise(rb_eArgError, "unallocated generator");
     }
 
     ptr1->proc = ptr0->proc;
@@ -1512,7 +1567,7 @@ generator_each(int argc, VALUE *argv, VALUE obj)
 
     rb_ary_push(args, yielder_new());
     if (argc > 0) {
-	rb_ary_cat(args, argv, argc);
+        rb_ary_cat(args, argv, argc);
     }
 
     return rb_proc_call_kw(ptr->proc, args, RB_PASS_CALLED_KEYWORDS);
@@ -1523,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
@@ -1539,24 +1594,24 @@ lazy_init_iterator(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
     VALUE result;
     if (argc == 1) {
-	VALUE args[2];
-	args[0] = m;
-	args[1] = val;
-	result = rb_yield_values2(2, args);
+        VALUE args[2];
+        args[0] = m;
+        args[1] = val;
+        result = rb_yield_values2(2, args);
     }
     else {
-	VALUE args;
-	int len = rb_long2int((long)argc + 1);
-	VALUE *nargv = ALLOCV_N(VALUE, args, len);
-
-	nargv[0] = m;
-	if (argc > 0) {
-	    MEMCPY(nargv + 1, argv, VALUE, argc);
-	}
-	result = rb_yield_values2(len, nargv);
-	ALLOCV_END(args);
-    }
-    if (result == Qundef) rb_iter_break();
+        VALUE args;
+        int len = rb_long2int((long)argc + 1);
+        VALUE *nargv = ALLOCV_N(VALUE, args, len);
+
+        nargv[0] = m;
+        if (argc > 0) {
+            MEMCPY(nargv + 1, argv, VALUE, argc);
+        }
+        result = rb_yield_values2(len, nargv);
+        ALLOCV_END(args);
+    }
+    if (UNDEF_P(result)) rb_iter_break();
     return Qnil;
 }
 
@@ -1590,7 +1645,7 @@ lazy_init_yielder(RB_BLOCK_CALL_FUNC_ARGLIST(_, m))
     struct MEMO *result;
 
     result = MEMO_NEW(m, rb_enum_values_pack(argc, argv),
-		      argc > 1 ? LAZY_MEMO_PACKED : 0);
+                      argc > 1 ? LAZY_MEMO_PACKED : 0);
     return lazy_yielder_result(result, yielder, procs_array, memos, 0);
 }
 
@@ -1615,19 +1670,19 @@ lazy_yielder_result(struct MEMO *result, VALUE yielder, VALUE procs_array, VALUE
     int cont = 1;
 
     for (; i < RARRAY_LEN(procs_array); i++) {
-	VALUE proc = RARRAY_AREF(procs_array, i);
-	struct proc_entry *entry = proc_entry_ptr(proc);
-	if (!(*entry->fn->proc)(proc, result, memos, i)) {
-	    cont = 0;
-	    break;
-	}
+        VALUE proc = RARRAY_AREF(procs_array, i);
+        struct proc_entry *entry = proc_entry_ptr(proc);
+        if (!(*entry->fn->proc)(proc, result, memos, i)) {
+            cont = 0;
+            break;
+        }
     }
 
     if (cont) {
-	rb_funcall2(yielder, idLTLT, 1, &(result->memo_value));
+        rb_funcall2(yielder, idLTLT, 1, &(result->memo_value));
     }
     if (LAZY_MEMO_BREAK_P(result)) {
-	rb_iter_break();
+        rb_iter_break();
     }
     return result->memo_value;
 }
@@ -1639,7 +1694,7 @@ lazy_init_block(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 
     rb_ivar_set(val, id_memo, rb_ary_new2(RARRAY_LEN(procs)));
     rb_block_call(RARRAY_AREF(m, 0), id_each, 0, 0,
-		  lazy_init_yielder, rb_ary_new3(2, val, procs));
+                  lazy_init_yielder, rb_ary_new3(2, val, procs));
     return Qnil;
 }
 
@@ -1652,17 +1707,17 @@ lazy_generator_init(VALUE enumerator, VALUE procs)
     struct enumerator *e = enumerator_ptr(enumerator);
 
     if (RARRAY_LEN(procs) > 0) {
-	struct generator *old_gen_ptr = generator_ptr(e->obj);
-	obj = old_gen_ptr->obj;
+        struct generator *old_gen_ptr = generator_ptr(e->obj);
+        obj = old_gen_ptr->obj;
     }
     else {
-	obj = enumerator;
+        obj = enumerator;
     }
 
     generator = generator_allocate(rb_cGenerator);
 
     rb_block_call(generator, id_initialize, 0, 0,
-		  lazy_init_block, rb_ary_new3(2, obj, procs));
+                  lazy_init_block, rb_ary_new3(2, obj, procs));
 
     gen_ptr = generator_ptr(generator);
     gen_ptr->obj = obj;
@@ -1670,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
  *
@@ -1767,11 +1838,11 @@ lazy_initialize(int argc, VALUE *argv, VALUE self)
 
     rb_check_arity(argc, 1, 2);
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy new without a block");
+        rb_raise(rb_eArgError, "tried to call lazy new without a block");
     }
     obj = argv[0];
     if (argc > 1) {
-	size = argv[1];
+        size = argv[1];
     }
     generator = generator_allocate(rb_cGenerator);
     rb_block_call(generator, id_initialize, 0, 0, lazy_init_block_i, obj);
@@ -1790,7 +1861,8 @@ lazy_initialize(int argc, VALUE *argv, VALUE self)
  * Expands +lazy+ enumerator to an array.
  * See Enumerable#to_a.
  */
-static VALUE lazy_to_a(VALUE self)
+static VALUE
+lazy_to_a(VALUE self)
 {
 }
 #endif
@@ -1801,11 +1873,11 @@ lazy_set_args(VALUE lazy, VALUE args)
     ID id = rb_frame_this_func();
     rb_ivar_set(lazy, id_method, ID2SYM(id));
     if (NIL_P(args)) {
-	/* Qfalse indicates that the arguments are empty */
-	rb_ivar_set(lazy, id_arguments, Qfalse);
+        /* Qfalse indicates that the arguments are empty */
+        rb_ivar_set(lazy, id_arguments, Qfalse);
     }
     else {
-	rb_ivar_set(lazy, id_arguments, args);
+        rb_ivar_set(lazy, id_arguments, args);
     }
 }
 
@@ -1822,7 +1894,7 @@ lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
 
 static VALUE
 lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
-		const lazyenum_funcs *fn)
+                const lazyenum_funcs *fn)
 {
     struct enumerator *new_e;
     VALUE new_obj;
@@ -1831,9 +1903,9 @@ lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
     struct enumerator *e = enumerator_ptr(obj);
     struct proc_entry *entry;
     VALUE entry_obj = TypedData_Make_Struct(rb_cObject, struct proc_entry,
-					    &proc_entry_data_type, entry);
+                                            &proc_entry_data_type, entry);
     if (rb_block_given_p()) {
-	entry->proc = rb_block_proc();
+        entry->proc = rb_block_proc();
     }
     entry->fn = fn;
     entry->memo = args;
@@ -1850,11 +1922,11 @@ lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
     new_e->procs = new_procs;
 
     if (argc > 0) {
-	new_e->meth = rb_to_id(*argv++);
-	--argc;
+        new_e->meth = rb_to_id(*argv++);
+        --argc;
     }
     else {
-	new_e->meth = id_each;
+        new_e->meth = id_each;
     }
     new_e->args = rb_ary_new4(argc, argv);
     return new_obj;
@@ -1934,15 +2006,15 @@ lazy_to_enum(int argc, VALUE *argv, VALUE self)
     VALUE lazy, meth = sym_each, super_meth;
 
     if (argc > 0) {
-	--argc;
-	meth = *argv++;
+        --argc;
+        meth = *argv++;
     }
     if (RTEST((super_meth = rb_hash_aref(lazy_use_super_method, meth)))) {
         meth = super_meth;
     }
     lazy = lazy_to_enum_i(self, meth, argc, argv, 0, rb_keyword_given_p());
     if (rb_block_given_p()) {
-	enumerator_ptr(lazy)->size = rb_block_proc();
+        enumerator_ptr(lazy)->size = rb_block_proc();
     }
     return lazy;
 }
@@ -1981,9 +2053,9 @@ lazyenum_yield_values(VALUE proc_entry, struct MEMO *result)
     int argc = 1;
     const VALUE *argv = &result->memo_value;
     if (LAZY_MEMO_PACKED_P(result)) {
-	const VALUE args = *argv;
-	argc = RARRAY_LENINT(args);
-	argv = RARRAY_CONST_PTR(args);
+        const VALUE args = *argv;
+        argc = RARRAY_LENINT(args);
+        argv = RARRAY_CONST_PTR(args);
     }
     return rb_proc_call_with_block(entry->proc, argc, argv, Qnil);
 }
@@ -2024,7 +2096,7 @@ static VALUE
 lazy_map(VALUE obj)
 {
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy map without a block");
+        rb_raise(rb_eArgError, "tried to call lazy map without a block");
     }
 
     return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_map_funcs);
@@ -2109,7 +2181,7 @@ static VALUE
 lazy_flat_map(VALUE obj)
 {
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy flat_map without a block");
+        rb_raise(rb_eArgError, "tried to call lazy flat_map without a block");
     }
 
     return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_flat_map_funcs);
@@ -2139,7 +2211,7 @@ static VALUE
 lazy_select(VALUE obj)
 {
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy select without a block");
+        rb_raise(rb_eArgError, "tried to call lazy select without a block");
     }
 
     return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_select_funcs);
@@ -2202,7 +2274,7 @@ static VALUE
 lazy_reject(VALUE obj)
 {
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy reject without a block");
+        rb_raise(rb_eArgError, "tried to call lazy reject without a block");
     }
 
     return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_reject_funcs);
@@ -2251,7 +2323,7 @@ static VALUE
 lazy_grep(VALUE obj, VALUE pattern)
 {
     const lazyenum_funcs *const funcs = rb_block_given_p() ?
-	&lazy_grep_iter_funcs : &lazy_grep_funcs;
+        &lazy_grep_iter_funcs : &lazy_grep_funcs;
     return lazy_add_method(obj, 0, 0, pattern, rb_ary_new3(1, pattern), funcs);
 }
 
@@ -2325,7 +2397,7 @@ lazy_zip_arrays_func(VALUE proc_entry, struct MEMO *result, VALUE memos, long me
     ary = rb_ary_new2(RARRAY_LEN(arrays) + 1);
     rb_ary_push(ary, result->memo_value);
     for (i = 0; i < RARRAY_LEN(arrays); i++) {
-	rb_ary_push(ary, rb_ary_entry(RARRAY_AREF(arrays, i), count));
+        rb_ary_push(ary, rb_ary_entry(RARRAY_AREF(arrays, i), count));
     }
     LAZY_MEMO_SET_VALUE(result, ary);
     LAZY_MEMO_SET_PACKED(result);
@@ -2343,19 +2415,19 @@ lazy_zip_func(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_inde
     long i;
 
     if (NIL_P(arg)) {
-	arg = rb_ary_new2(RARRAY_LEN(zip_args));
-	for (i = 0; i < RARRAY_LEN(zip_args); i++) {
-	    rb_ary_push(arg, rb_funcall(RARRAY_AREF(zip_args, i), id_to_enum, 0));
-	}
-	rb_ary_store(memos, memo_index, arg);
+        arg = rb_ary_new2(RARRAY_LEN(zip_args));
+        for (i = 0; i < RARRAY_LEN(zip_args); i++) {
+            rb_ary_push(arg, rb_funcall(RARRAY_AREF(zip_args, i), id_to_enum, 0));
+        }
+        rb_ary_store(memos, memo_index, arg);
     }
 
     ary = rb_ary_new2(RARRAY_LEN(arg) + 1);
     rb_ary_push(ary, result->memo_value);
     for (i = 0; i < RARRAY_LEN(arg); i++) {
-	v = rb_rescue2(call_next, RARRAY_AREF(arg, i), next_stopped, 0,
-		       rb_eStopIteration, (VALUE)0);
-	rb_ary_push(ary, v);
+        v = rb_rescue2(call_next, RARRAY_AREF(arg, i), next_stopped, 0,
+                       rb_eStopIteration, (VALUE)0);
+        rb_ary_push(ary, v);
     }
     LAZY_MEMO_SET_VALUE(result, ary);
     LAZY_MEMO_SET_PACKED(result);
@@ -2383,24 +2455,24 @@ lazy_zip(int argc, VALUE *argv, VALUE obj)
     const lazyenum_funcs *funcs = &lazy_zip_funcs[1];
 
     if (rb_block_given_p()) {
-	return rb_call_super(argc, argv);
+        return rb_call_super(argc, argv);
     }
 
     ary = rb_ary_new2(argc);
     for (i = 0; i < argc; i++) {
-	v = rb_check_array_type(argv[i]);
-	if (NIL_P(v)) {
-	    for (; i < argc; i++) {
-		if (!rb_respond_to(argv[i], id_each)) {
-		    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
-			     rb_obj_class(argv[i]));
-		}
-	    }
-	    ary = rb_ary_new4(argc, argv);
-	    funcs = &lazy_zip_funcs[0];
-	    break;
-	}
-	rb_ary_push(ary, v);
+        v = rb_check_array_type(argv[i]);
+        if (NIL_P(v)) {
+            for (; i < argc; i++) {
+                if (!rb_respond_to(argv[i], id_each)) {
+                    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
+                             rb_obj_class(argv[i]));
+                }
+            }
+            ary = rb_ary_new4(argc, argv);
+            funcs = &lazy_zip_funcs[0];
+            break;
+        }
+        rb_ary_push(ary, v);
     }
 
     return lazy_add_method(obj, 0, 0, ary, ary, funcs);
@@ -2414,17 +2486,12 @@ lazy_take_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_ind
     VALUE memo = rb_ary_entry(memos, memo_index);
 
     if (NIL_P(memo)) {
-	memo = entry->memo;
+        memo = entry->memo;
     }
 
     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;
 }
 
@@ -2433,12 +2500,19 @@ lazy_take_size(VALUE entry, VALUE receiver)
 {
     long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(entry, id_arguments), 0));
     if (NIL_P(receiver) || (FIXNUM_P(receiver) && FIX2LONG(receiver) < len))
-	return receiver;
+        return 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,
 };
 
 /*
@@ -2452,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");
+        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 *
@@ -2473,8 +2541,8 @@ lazy_take_while_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long me
 {
     VALUE take = lazyenum_yield_values(proc_entry, result);
     if (!RTEST(take)) {
-	LAZY_MEMO_SET_BREAK(result);
-	return 0;
+        LAZY_MEMO_SET_BREAK(result);
+        return 0;
     }
     return result;
 }
@@ -2494,7 +2562,7 @@ static VALUE
 lazy_take_while(VALUE obj)
 {
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy take_while without a block");
+        rb_raise(rb_eArgError, "tried to call lazy take_while without a block");
     }
 
     return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_take_while_funcs);
@@ -2505,10 +2573,10 @@ lazy_drop_size(VALUE proc_entry, VALUE receiver)
 {
     long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(proc_entry, id_arguments), 0));
     if (NIL_P(receiver))
-	return receiver;
+        return receiver;
     if (FIXNUM_P(receiver)) {
-	len = FIX2LONG(receiver) - len;
-	return LONG2FIX(len < 0 ? 0 : len);
+        len = FIX2LONG(receiver) - len;
+        return LONG2FIX(len < 0 ? 0 : len);
     }
     return rb_funcall(receiver, '-', 1, LONG2NUM(len));
 }
@@ -2521,13 +2589,13 @@ lazy_drop_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_ind
     VALUE memo = rb_ary_entry(memos, memo_index);
 
     if (NIL_P(memo)) {
-	memo = entry->memo;
+        memo = entry->memo;
     }
     remain = NUM2LONG(memo);
     if (remain > 0) {
-	--remain;
-	rb_ary_store(memos, memo_index, LONG2NUM(remain));
-	return 0;
+        --remain;
+        rb_ary_store(memos, memo_index, LONG2NUM(remain));
+        return 0;
     }
 
     return result;
@@ -2553,7 +2621,7 @@ lazy_drop(VALUE obj, VALUE n)
     argv[1] = n;
 
     if (len < 0) {
-	rb_raise(rb_eArgError, "attempt to drop negative size");
+        rb_raise(rb_eArgError, "attempt to drop negative size");
     }
 
     return lazy_add_method(obj, 2, argv, n, rb_ary_new3(1, n), &lazy_drop_funcs);
@@ -2566,13 +2634,13 @@ lazy_drop_while_proc(VALUE proc_entry, struct MEMO* result, VALUE memos, long me
     VALUE memo = rb_ary_entry(memos, memo_index);
 
     if (NIL_P(memo)) {
-	memo = entry->memo;
+        memo = entry->memo;
     }
 
     if (!RTEST(memo)) {
-	VALUE drop = lazyenum_yield_values(proc_entry, result);
-	if (RTEST(drop)) return 0;
-	rb_ary_store(memos, memo_index, Qtrue);
+        VALUE drop = lazyenum_yield_values(proc_entry, result);
+        if (RTEST(drop)) return 0;
+        rb_ary_store(memos, memo_index, Qtrue);
     }
     return result;
 }
@@ -2592,7 +2660,7 @@ static VALUE
 lazy_drop_while(VALUE obj)
 {
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy drop_while without a block");
+        rb_raise(rb_eArgError, "tried to call lazy drop_while without a block");
     }
 
     return lazy_add_method(obj, 0, 0, Qfalse, Qnil, &lazy_drop_while_funcs);
@@ -2747,7 +2815,8 @@ lazy_with_index(int argc, VALUE *argv, VALUE obj)
  *
  *  Like Enumerable#chunk, but chains operation to be lazy-evaluated.
  */
-static VALUE lazy_chunk(VALUE self)
+static VALUE
+lazy_chunk(VALUE self)
 {
 }
 
@@ -2757,7 +2826,8 @@ static VALUE lazy_chunk(VALUE self)
  *
  *  Like Enumerable#chunk_while, but chains operation to be lazy-evaluated.
  */
-static VALUE lazy_chunk_while(VALUE self)
+static VALUE
+lazy_chunk_while(VALUE self)
 {
 }
 
@@ -2768,7 +2838,8 @@ static VALUE lazy_chunk_while(VALUE self)
  *
  *  Like Enumerable#slice_after, but chains operation to be lazy-evaluated.
  */
-static VALUE lazy_slice_after(VALUE self)
+static VALUE
+lazy_slice_after(VALUE self)
 {
 }
 
@@ -2779,7 +2850,8 @@ static VALUE lazy_slice_after(VALUE self)
  *
  *  Like Enumerable#slice_before, but chains operation to be lazy-evaluated.
  */
-static VALUE lazy_slice_before(VALUE self)
+static VALUE
+lazy_slice_before(VALUE self)
 {
 }
 
@@ -2789,7 +2861,8 @@ static VALUE lazy_slice_before(VALUE self)
  *
  *  Like Enumerable#slice_when, but chains operation to be lazy-evaluated.
  */
-static VALUE lazy_slice_when(VALUE self)
+static VALUE
+lazy_slice_when(VALUE self)
 {
 }
 # endif
@@ -2911,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;
@@ -2966,7 +3039,7 @@ producer_each_i(VALUE obj)
     init = ptr->init;
     proc = ptr->proc;
 
-    if (init == Qundef) {
+    if (UNDEF_P(init)) {
         curr = Qnil;
     }
     else {
@@ -3097,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;
@@ -3290,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));
     }
 
@@ -3348,6 +3421,356 @@ enumerator_plus(VALUE obj, VALUE eobj)
 }
 
 /*
+ * Document-class: Enumerator::Product
+ *
+ * Enumerator::Product generates a Cartesian product of any number of
+ * enumerable objects.  Iterating over the product of enumerable
+ * objects is roughly equivalent to nested each_entry loops where the
+ * loop for the rightmost object is put innermost.
+ *
+ *   innings = Enumerator::Product.new(1..9, ['top', 'bottom'])
+ *
+ *   innings.each do |i, h|
+ *     p [i, h]
+ *   end
+ *   # [1, "top"]
+ *   # [1, "bottom"]
+ *   # [2, "top"]
+ *   # [2, "bottom"]
+ *   # [3, "top"]
+ *   # [3, "bottom"]
+ *   # ...
+ *   # [9, "top"]
+ *   # [9, "bottom"]
+ *
+ * The method used against each enumerable object is `each_entry`
+ * instead of `each` so that the product of N enumerable objects
+ * 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.
+ *
+ * This type of objects can be created by Enumerator.product.
+ */
+
+static void
+enum_product_mark(void *p)
+{
+    struct enum_product *ptr = p;
+    rb_gc_mark_movable(ptr->enums);
+}
+
+static void
+enum_product_compact(void *p)
+{
+    struct enum_product *ptr = p;
+    ptr->enums = rb_gc_location(ptr->enums);
+}
+
+#define enum_product_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+enum_product_memsize(const void *p)
+{
+    return sizeof(struct enum_product);
+}
+
+static const rb_data_type_t enum_product_data_type = {
+    "product",
+    {
+        enum_product_mark,
+        enum_product_free,
+        enum_product_memsize,
+        enum_product_compact,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static struct enum_product *
+enum_product_ptr(VALUE obj)
+{
+    struct enum_product *ptr;
+
+    TypedData_Get_Struct(obj, struct enum_product, &enum_product_data_type, ptr);
+    if (!ptr || UNDEF_P(ptr->enums)) {
+        rb_raise(rb_eArgError, "uninitialized product");
+    }
+    return ptr;
+}
+
+/* :nodoc: */
+static VALUE
+enum_product_allocate(VALUE klass)
+{
+    struct enum_product *ptr;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct enum_product, &enum_product_data_type, ptr);
+    ptr->enums = Qundef;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *   Enumerator::Product.new(*enums) -> enum
+ *
+ * Generates a new enumerator object that generates a Cartesian
+ * product of given enumerable objects.
+ *
+ *   e = Enumerator::Product.new(1..3, [4, 5])
+ *   e.to_a #=> [[1, 4], [1, 5], [2, 4], [2, 5], [3, 4], [3, 5]]
+ *   e.size #=> 6
+ */
+static VALUE
+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);
+
+    if (!ptr) rb_raise(rb_eArgError, "unallocated product");
+
+    ptr->enums = rb_obj_freeze(enums);
+
+    return obj;
+}
+
+/* :nodoc: */
+static VALUE
+enum_product_init_copy(VALUE obj, VALUE orig)
+{
+    struct enum_product *ptr0, *ptr1;
+
+    if (!OBJ_INIT_COPY(obj, orig)) return obj;
+    ptr0 = enum_product_ptr(orig);
+
+    TypedData_Get_Struct(obj, struct enum_product, &enum_product_data_type, ptr1);
+
+    if (!ptr1) rb_raise(rb_eArgError, "unallocated product");
+
+    ptr1->enums = ptr0->enums;
+
+    return obj;
+}
+
+static VALUE
+enum_product_total_size(VALUE enums)
+{
+    VALUE total = INT2FIX(1);
+    long i;
+
+    for (i = 0; i < RARRAY_LEN(enums); i++) {
+        VALUE size = enum_size(RARRAY_AREF(enums, i));
+
+        if (NIL_P(size) || (RB_TYPE_P(size, T_FLOAT) && isinf(NUM2DBL(size)))) {
+            return size;
+        }
+        if (!RB_INTEGER_TYPE_P(size)) {
+            return Qnil;
+        }
+
+        total = rb_funcall(total, '*', 1, size);
+    }
+
+    return total;
+}
+
+/*
+ * call-seq:
+ *   obj.size -> int, Float::INFINITY or nil
+ *
+ * Returns the total size of the enumerator product calculated by
+ * multiplying the sizes of enumerables in the product.  If any of the
+ * enumerables reports its size as nil or Float::INFINITY, that value
+ * is returned as the size.
+ */
+static VALUE
+enum_product_size(VALUE obj)
+{
+    return enum_product_total_size(enum_product_ptr(obj)->enums);
+}
+
+static VALUE
+enum_product_enum_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return enum_product_size(obj);
+}
+
+struct product_state {
+    VALUE  obj;
+    VALUE  block;
+    int    argc;
+    VALUE *argv;
+    int    index;
+};
+
+static VALUE product_each(VALUE, struct product_state *);
+
+static VALUE
+product_each_i(RB_BLOCK_CALL_FUNC_ARGLIST(value, state))
+{
+    struct product_state *pstate = (struct product_state *)state;
+    pstate->argv[pstate->index++] = value;
+
+    VALUE val = product_each(pstate->obj, pstate);
+    pstate->index--;
+    return val;
+}
+
+static VALUE
+product_each(VALUE obj, struct product_state *pstate)
+{
+    struct enum_product *ptr = enum_product_ptr(obj);
+    VALUE enums = ptr->enums;
+
+    if (pstate->index < pstate->argc) {
+        VALUE eobj = RARRAY_AREF(enums, pstate->index);
+
+        rb_block_call(eobj, id_each_entry, 0, NULL, product_each_i, (VALUE)pstate);
+    }
+    else {
+        rb_funcall(pstate->block, id_call, 1, rb_ary_new_from_values(pstate->argc, pstate->argv));
+    }
+
+    return obj;
+}
+
+static VALUE
+enum_product_run(VALUE obj, VALUE block)
+{
+    struct enum_product *ptr = enum_product_ptr(obj);
+    int argc = RARRAY_LENINT(ptr->enums);
+    struct product_state state = {
+        .obj = obj,
+        .block = block,
+        .index = 0,
+        .argc = argc,
+        .argv = ALLOCA_N(VALUE, argc),
+    };
+
+    return product_each(obj, &state);
+}
+
+/*
+ * call-seq:
+ *   obj.each { |...| ... } -> obj
+ *   obj.each -> enumerator
+ *
+ * Iterates over the elements of the first enumerable by calling the
+ * "each_entry" method on it with the given arguments, then proceeds
+ * to the following enumerables in sequence until all of the
+ * enumerables are exhausted.
+ *
+ * If no block is given, returns an enumerator.  Otherwise, returns self.
+ */
+static VALUE
+enum_product_each(VALUE obj)
+{
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_product_enum_size);
+
+    return enum_product_run(obj, rb_block_proc());
+}
+
+/*
+ * call-seq:
+ *   obj.rewind -> obj
+ *
+ * Rewinds the product enumerator by calling the "rewind" method on
+ * each enumerable in reverse order.  Each call is performed only if
+ * the enumerable responds to the method.
+ */
+static VALUE
+enum_product_rewind(VALUE obj)
+{
+    struct enum_product *ptr = enum_product_ptr(obj);
+    VALUE enums = ptr->enums;
+    long i;
+
+    for (i = 0; i < RARRAY_LEN(enums); i++) {
+        rb_check_funcall(RARRAY_AREF(enums, i), id_rewind, 0, 0);
+    }
+
+    return obj;
+}
+
+static VALUE
+inspect_enum_product(VALUE obj, VALUE dummy, int recur)
+{
+    VALUE klass = rb_obj_class(obj);
+    struct enum_product *ptr;
+
+    TypedData_Get_Struct(obj, struct enum_product, &enum_product_data_type, ptr);
+
+    if (!ptr || UNDEF_P(ptr->enums)) {
+        return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(klass));
+    }
+
+    if (recur) {
+        return rb_sprintf("#<%"PRIsVALUE": ...>", rb_class_path(klass));
+    }
+
+    return rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE">", rb_class_path(klass), ptr->enums);
+}
+
+/*
+ * call-seq:
+ *   obj.inspect -> string
+ *
+ * Returns a printable version of the product enumerator.
+ */
+static VALUE
+enum_product_inspect(VALUE obj)
+{
+    return rb_exec_recursive(inspect_enum_product, obj, 0);
+}
+
+/*
+ * 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
+ * Enumerator::Product.new.
+ *
+ *   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(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE enums = Qnil, options = Qnil, block = Qnil;
+
+    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)));
+    }
+
+    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;
+}
+
+/*
  * Document-class: Enumerator::ArithmeticSequence
  *
  * Enumerator::ArithmeticSequence is a subclass of Enumerator,
@@ -3459,6 +3882,13 @@ rb_arithmetic_sequence_beg_len_step(VALUE obj, long *begp, long *lenp, long *ste
     *stepp = step;
 
     if (step < 0) {
+        if (aseq.exclude_end && !NIL_P(aseq.end)) {
+            /* Handle exclusion before range reversal */
+            aseq.end = LONG2NUM(NUM2LONG(aseq.end) + 1);
+
+            /* Don't exclude the previous beginning */
+            aseq.exclude_end = 0;
+        }
         VALUE tmp = aseq.begin;
         aseq.begin = aseq.end;
         aseq.end = tmp;
@@ -4214,6 +4644,22 @@ InitVM_Enumerator(void)
     rb_undef_method(rb_cEnumChain, "peek");
     rb_undef_method(rb_cEnumChain, "peek_values");
 
+    /* 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, -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);
+    rb_define_method(rb_cEnumProduct, "rewind", enum_product_rewind, 0);
+    rb_define_method(rb_cEnumProduct, "inspect", enum_product_inspect, 0);
+    rb_undef_method(rb_cEnumProduct, "feed");
+    rb_undef_method(rb_cEnumProduct, "next");
+    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, -1);
+
     /* ArithmeticSequence */
     rb_cArithSeq = rb_define_class_under(rb_cEnumerator, "ArithmeticSequence", rb_cEnumerator);
     rb_undef_alloc_func(rb_cArithSeq);
@@ -4249,6 +4695,7 @@ Init_Enumerator(void)
     id_method = rb_intern_const("method");
     id_force = rb_intern_const("force");
     id_to_enum = rb_intern_const("to_enum");
+    id_each_entry = rb_intern_const("each_entry");
     id_begin = rb_intern_const("begin");
     id_end = rb_intern_const("end");
     id_step = rb_intern_const("step");
diff --git a/error.c b/error.c
index 4c501f1446..726f57a4c0 100644
--- a/error.c
+++ b/error.c
@@ -34,6 +34,7 @@
 #include "internal/io.h"
 #include "internal/load.h"
 #include "internal/object.h"
+#include "internal/string.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
 #include "internal/variable.h"
@@ -82,7 +83,7 @@ static struct {
     st_table *id2enum, *enum2id;
 } warning_categories;
 
-extern const char ruby_description[];
+extern const char *rb_dynamic_description;
 
 static const char *
 rb_strerrno(int err)
@@ -99,54 +100,48 @@ static int
 err_position_0(char *buf, long len, const char *file, int line)
 {
     if (!file) {
-	return 0;
+        return 0;
     }
     else if (line == 0) {
-	return snprintf(buf, len, "%s: ", file);
+        return snprintf(buf, len, "%s: ", file);
     }
     else {
-	return snprintf(buf, len, "%s:%d: ", file, line);
+        return snprintf(buf, len, "%s:%d: ", file, line);
     }
 }
 
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 5, 0)
 static VALUE
 err_vcatf(VALUE str, const char *pre, const char *file, int line,
-	  const char *fmt, va_list args)
+          const char *fmt, va_list args)
 {
     if (file) {
-	rb_str_cat2(str, file);
-	if (line) rb_str_catf(str, ":%d", line);
-	rb_str_cat2(str, ": ");
+        rb_str_cat2(str, file);
+        if (line) rb_str_catf(str, ":%d", line);
+        rb_str_cat2(str, ": ");
     }
     if (pre) rb_str_cat2(str, pre);
     rb_str_vcatf(str, fmt, args);
     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)
+                       rb_encoding *enc, const char *fmt, va_list args)
 {
     const char *fn = NIL_P(file) ? NULL : RSTRING_PTR(file);
     if (!exc) {
-	VALUE mesg = rb_enc_str_new(0, 0, enc);
-	err_vcatf(mesg, NULL, fn, line, fmt, args);
-	rb_str_cat2(mesg, "\n");
-	rb_write_error_str(mesg);
+        VALUE mesg = rb_enc_str_new(0, 0, enc);
+        err_vcatf(mesg, NULL, fn, line, fmt, args);
+        rb_str_cat2(mesg, "\n");
+        rb_write_error_str(mesg);
     }
     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");
-	}
-	err_vcatf(mesg, NULL, fn, line, fmt, args);
+        VALUE mesg;
+        exc = syntax_error_with_path(exc, file, &mesg, enc);
+        err_vcatf(mesg, NULL, fn, line, fmt, args);
     }
 
     return exc;
@@ -357,47 +352,42 @@ warn_vsprintf(rb_encoding *enc, const char *file, int line, const char *fmt, va_
     return rb_str_cat2(str, "\n");
 }
 
+#define with_warn_vsprintf(file, line, fmt) \
+    VALUE str; \
+    va_list args; \
+    va_start(args, fmt); \
+    str = warn_vsprintf(NULL, file, line, fmt, args); \
+    va_end(args);
+
 void
 rb_compile_warn(const char *file, int line, const char *fmt, ...)
 {
-    VALUE str;
-    va_list args;
-
-    if (NIL_P(ruby_verbose)) return;
-
-    va_start(args, fmt);
-    str = warn_vsprintf(NULL, file, line, fmt, args);
-    va_end(args);
-    rb_write_warning_str(str);
+    if (!NIL_P(ruby_verbose)) {
+        with_warn_vsprintf(file, line, fmt) {
+            rb_write_warning_str(str);
+        }
+    }
 }
 
 /* rb_compile_warning() reports only in verbose mode */
 void
 rb_compile_warning(const char *file, int line, const char *fmt, ...)
 {
-    VALUE str;
-    va_list args;
-
-    if (!RTEST(ruby_verbose)) return;
-
-    va_start(args, fmt);
-    str = warn_vsprintf(NULL, file, line, fmt, args);
-    va_end(args);
-    rb_write_warning_str(str);
+    if (RTEST(ruby_verbose)) {
+        with_warn_vsprintf(file, line, fmt) {
+            rb_write_warning_str(str);
+        }
+    }
 }
 
 void
 rb_category_compile_warn(rb_warning_category_t category, const char *file, int line, const char *fmt, ...)
 {
-    VALUE str;
-    va_list args;
-
-    if (NIL_P(ruby_verbose)) return;
-
-    va_start(args, fmt);
-    str = warn_vsprintf(NULL, file, line, fmt, args);
-    va_end(args);
-    rb_warn_category(str, rb_warning_category_to_name(category));
+    if (!NIL_P(ruby_verbose)) {
+        with_warn_vsprintf(file, line, fmt) {
+            rb_warn_category(str, rb_warning_category_to_name(category));
+        }
+    }
 }
 
 RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 0)
@@ -410,8 +400,10 @@ warning_string(rb_encoding *enc, const char *fmt, va_list args)
 }
 
 #define with_warning_string(mesg, enc, fmt) \
+    with_warning_string_from(mesg, enc, fmt, fmt)
+#define with_warning_string_from(mesg, enc, fmt, last_arg) \
     VALUE mesg; \
-    va_list args; va_start(args, fmt); \
+    va_list args; va_start(args, last_arg); \
     mesg = warning_string(enc, fmt, args); \
     va_end(args);
 
@@ -419,16 +411,16 @@ void
 rb_warn(const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-	with_warning_string(mesg, 0, fmt) {
-	    rb_write_warning_str(mesg);
-	}
+        with_warning_string(mesg, 0, fmt) {
+            rb_write_warning_str(mesg);
+        }
     }
 }
 
 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));
         }
@@ -439,9 +431,9 @@ void
 rb_enc_warn(rb_encoding *enc, const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-	with_warning_string(mesg, enc, fmt) {
-	    rb_write_warning_str(mesg);
-	}
+        with_warning_string(mesg, enc, fmt) {
+            rb_write_warning_str(mesg);
+        }
     }
 }
 
@@ -450,9 +442,9 @@ void
 rb_warning(const char *fmt, ...)
 {
     if (RTEST(ruby_verbose)) {
-	with_warning_string(mesg, 0, fmt) {
-	    rb_write_warning_str(mesg);
-	}
+        with_warning_string(mesg, 0, fmt) {
+            rb_write_warning_str(mesg);
+        }
     }
 }
 
@@ -460,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));
         }
@@ -480,9 +472,9 @@ void
 rb_enc_warning(rb_encoding *enc, const char *fmt, ...)
 {
     if (RTEST(ruby_verbose)) {
-	with_warning_string(mesg, enc, fmt) {
-	    rb_write_warning_str(mesg);
-	}
+        with_warning_string(mesg, enc, fmt) {
+            rb_write_warning_str(mesg);
+        }
     }
 }
 #endif
@@ -513,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
@@ -526,19 +515,16 @@ 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
 end_with_asciichar(VALUE str, int c)
 {
     return RB_TYPE_P(str, T_STRING) &&
-	rb_str_end_with_asciichar(str, c);
+        rb_str_end_with_asciichar(str, c);
 }
 
 /* :nodoc: */
@@ -546,7 +532,7 @@ static VALUE
 warning_write(int argc, VALUE *argv, VALUE buf)
 {
     while (argc-- > 0) {
-	rb_str_append(buf, *argv++);
+        rb_str_append(buf, *argv++);
     }
     return buf;
 }
@@ -571,38 +557,38 @@ rb_warn_m(rb_execution_context_t *ec, VALUE exc, VALUE msgs, VALUE uplevel, VALU
             if (!NIL_P(location)) {
                 location = rb_ary_entry(location, 0);
             }
-	}
-	if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) {
-	    VALUE path;
-	    if (NIL_P(uplevel)) {
-		str = rb_str_tmp_new(0);
-	    }
-	    else if (NIL_P(location) ||
-		     NIL_P(path = rb_funcall(location, rb_intern("path"), 0))) {
-		str = rb_str_new_cstr("warning: ");
-	    }
-	    else {
-		str = rb_sprintf("%s:%ld: warning: ",
-		    rb_string_value_ptr(&path),
-		    NUM2LONG(rb_funcall(location, rb_intern("lineno"), 0)));
-	    }
-	    RBASIC_SET_CLASS(str, rb_cWarningBuffer);
-	    rb_io_puts(argc, argv, str);
-	    RBASIC_SET_CLASS(str, rb_cString);
-	}
+        }
+        if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) {
+            VALUE path;
+            if (NIL_P(uplevel)) {
+                str = rb_str_tmp_new(0);
+            }
+            else if (NIL_P(location) ||
+                     NIL_P(path = rb_funcall(location, rb_intern("path"), 0))) {
+                str = rb_str_new_cstr("warning: ");
+            }
+            else {
+                str = rb_sprintf("%s:%ld: warning: ",
+                    rb_string_value_ptr(&path),
+                    NUM2LONG(rb_funcall(location, rb_intern("lineno"), 0)));
+            }
+            RBASIC_SET_CLASS(str, rb_cWarningBuffer);
+            rb_io_puts(argc, argv, str);
+            RBASIC_SET_CLASS(str, rb_cString);
+        }
 
         if (!NIL_P(category)) {
             category = rb_to_symbol_type(category);
             rb_warning_category_from_name(category);
         }
 
-	if (exc == rb_mWarning) {
-	    rb_must_asciicompat(str);
-	    rb_write_error_str(str);
-	}
-	else {
+        if (exc == rb_mWarning) {
+            rb_must_asciicompat(str);
+            rb_write_error_str(str);
+        }
+        else {
             rb_warn_category(str, category);
-	}
+        }
     }
     return Qnil;
 }
@@ -621,7 +607,7 @@ rb_bug_reporter_add(void (*func)(FILE *, void *), void *data)
 {
     struct bug_reporters *reporter;
     if (bug_reporters_size >= MAX_BUG_REPORTERS) {
-	return 0; /* failed to register */
+        return 0; /* failed to register */
     }
     reporter = &bug_reporters[bug_reporters_size++];
     reporter->func = func;
@@ -640,7 +626,7 @@ bug_report_file(const char *file, int line)
     int len = err_position_0(buf, sizeof(buf), file, line);
 
     if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len ||
-	(ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) {
+        (ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) {
         return out;
     }
 
@@ -657,40 +643,45 @@ bug_important_message(FILE *out, const char *const msg, size_t len)
 
     if (!len) return;
     if (isatty(fileno(out))) {
-	static const char red[] = "\033[;31;1;7m";
-	static const char green[] = "\033[;32;7m";
-	static const char reset[] = "\033[m";
-	const char *e = strchr(p, '\n');
-	const int w = (int)(e - p);
-	do {
-	    int i = (int)(e - p);
-	    fputs(*p == ' ' ? green : red, out);
-	    fwrite(p, 1, e - p, out);
-	    for (; i < w; ++i) fputc(' ', out);
-	    fputs(reset, out);
-	    fputc('\n', out);
-	} while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1);
+        static const char red[] = "\033[;31;1;7m";
+        static const char green[] = "\033[;32;7m";
+        static const char reset[] = "\033[m";
+        const char *e = strchr(p, '\n');
+        const int w = (int)(e - p);
+        do {
+            int i = (int)(e - p);
+            fputs(*p == ' ' ? green : red, out);
+            fwrite(p, 1, e - p, out);
+            for (; i < w; ++i) fputc(' ', out);
+            fputs(reset, out);
+            fputc('\n', out);
+        } while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1);
     }
     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)
 {
 #if defined __APPLE__
     static const char msg[] = ""
-	"-- 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
-	"     * ~/Library/Logs/CrashReporter\n"
-	"     * /Library/Logs/CrashReporter\n"
+        "-- Crash Report log information "
+        "--------------------------------------------\n"
+        "   See Crash Report log file in one of the following locations:\n"
+# ifdef CRASH_REPORTER_MAY_BE_CREATED
+        "     * ~/Library/Logs/CrashReporter\n"
+        "     * /Library/Logs/CrashReporter\n"
 # endif
-	"     * ~/Library/Logs/DiagnosticReports\n"
-	"     * /Library/Logs/DiagnosticReports\n"
-	"   for more details.\n"
-	"Don't forget to include the above Crash Report log file in bug reports.\n"
-	"\n";
+        "     * ~/Library/Logs/DiagnosticReports\n"
+        "     * /Library/Logs/DiagnosticReports\n"
+        "   for more details.\n"
+        "Don't forget to include the above Crash Report log file in bug reports.\n"
+        "\n";
     const size_t msglen = sizeof(msg) - 1;
 #else
     const char *msg = NULL;
@@ -704,15 +695,15 @@ postscript_dump(FILE *out)
 {
 #if defined __APPLE__
     static const char msg[] = ""
-	"[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
-	"CrashReporter or "
+        "[IMPORTANT]"
+        /*" ------------------------------------------------"*/
+        "\n""Don't forget to include the Crash Report log file under\n"
+# ifdef CRASH_REPORTER_MAY_BE_CREATED
+        "CrashReporter or "
 # endif
-	"DiagnosticReports directory in bug reports.\n"
-	/*"------------------------------------------------------------\n"*/
-	"\n";
+        "DiagnosticReports directory in bug reports.\n"
+        /*"------------------------------------------------------------\n"*/
+        "\n";
     const size_t msglen = sizeof(msg) - 1;
 #else
     const char *msg = NULL;
@@ -730,7 +721,7 @@ bug_report_begin_valist(FILE *out, const char *fmt, va_list args)
     fputs("[BUG] ", out);
     vsnprintf(buf, sizeof(buf), fmt, args);
     fputs(buf, out);
-    snprintf(buf, sizeof(buf), "\n%s\n\n", ruby_description);
+    snprintf(buf, sizeof(buf), "\n%s\n\n", rb_dynamic_description);
     fputs(buf, out);
     preface_dump(out);
 }
@@ -747,11 +738,11 @@ bug_report_end(FILE *out)
 {
     /* call additional bug reporters */
     {
-	int i;
-	for (i=0; i<bug_reporters_size; i++) {
-	    struct bug_reporters *reporter = &bug_reporters[i];
-	    (*reporter->func)(out, reporter->data);
-	}
+        int i;
+        for (i=0; i<bug_reporters_size; i++) {
+            struct bug_reporters *reporter = &bug_reporters[i];
+            (*reporter->func)(out, reporter->data);
+        }
     }
     postscript_dump(out);
 }
@@ -759,18 +750,18 @@ bug_report_end(FILE *out)
 #define report_bug(file, line, fmt, ctx) do { \
     FILE *out = bug_report_file(file, line); \
     if (out) { \
-	bug_report_begin(out, fmt); \
-	rb_vm_bugreport(ctx); \
-	bug_report_end(out); \
+        bug_report_begin(out, fmt); \
+        rb_vm_bugreport(ctx); \
+        bug_report_end(out); \
     } \
 } while (0) \
 
 #define report_bug_valist(file, line, fmt, ctx, args) do { \
     FILE *out = bug_report_file(file, line); \
     if (out) { \
-	bug_report_begin_valist(out, fmt, args); \
-	rb_vm_bugreport(ctx); \
-	bug_report_end(out); \
+        bug_report_begin_valist(out, fmt, args); \
+        rb_vm_bugreport(ctx); \
+        bug_report_end(out); \
     } \
 } while (0) \
 
@@ -816,7 +807,7 @@ rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const voi
     int line = 0;
 
     if (GET_EC()) {
-	file = rb_source_location_cstr(&line);
+        file = rb_source_location_cstr(&line);
     }
 
     report_bug(file, line, fmt, ctx);
@@ -856,17 +847,17 @@ rb_async_bug_errno(const char *mesg, int errno_arg)
     WRITE_CONST(2, "\n");
 
     if (errno_arg == 0) {
-	WRITE_CONST(2, "errno == 0 (NOERROR)\n");
+        WRITE_CONST(2, "errno == 0 (NOERROR)\n");
     }
     else {
-	const char *errno_str = rb_strerrno(errno_arg);
+        const char *errno_str = rb_strerrno(errno_arg);
 
-	if (!errno_str)
-	    errno_str = "undefined errno";
-	write_or_abort(2, errno_str, strlen(errno_str));
+        if (!errno_str)
+            errno_str = "undefined errno";
+        write_or_abort(2, errno_str, strlen(errno_str));
     }
     WRITE_CONST(2, "\n\n");
-    write_or_abort(2, ruby_description, strlen(ruby_description));
+    write_or_abort(2, rb_dynamic_description, strlen(rb_dynamic_description));
     abort();
 }
 
@@ -882,7 +873,7 @@ rb_assert_failure(const char *file, int line, const char *name, const char *expr
     FILE *out = stderr;
     fprintf(out, "Assertion Failed: %s:%d:", file, line);
     if (name) fprintf(out, "%s:", name);
-    fprintf(out, "%s\n%s\n\n", expr, ruby_description);
+    fprintf(out, "%s\n%s\n\n", expr, rb_dynamic_description);
     preface_dump(out);
     rb_vm_bugreport(NULL);
     bug_report_end(out);
@@ -948,22 +939,22 @@ builtin_class_name(VALUE x)
     const char *etype;
 
     if (NIL_P(x)) {
-	etype = "nil";
+        etype = "nil";
     }
     else if (FIXNUM_P(x)) {
-	etype = "Integer";
+        etype = "Integer";
     }
     else if (SYMBOL_P(x)) {
-	etype = "Symbol";
+        etype = "Symbol";
     }
     else if (RB_TYPE_P(x, T_TRUE)) {
-	etype = "true";
+        etype = "true";
     }
     else if (RB_TYPE_P(x, T_FALSE)) {
-	etype = "false";
+        etype = "false";
     }
     else {
-	etype = NULL;
+        etype = NULL;
     }
     return etype;
 }
@@ -974,7 +965,7 @@ rb_builtin_class_name(VALUE x)
     const char *etype = builtin_class_name(x);
 
     if (!etype) {
-	etype = rb_obj_classname(x);
+        etype = rb_obj_classname(x);
     }
     return etype;
 }
@@ -991,14 +982,14 @@ unexpected_type(VALUE x, int xt, int t)
     if (tname) {
         mesg = rb_sprintf("wrong argument type %"PRIsVALUE" (expected %s)",
                           displaying_class_of(x), tname);
-	exc = rb_eTypeError;
+        exc = rb_eTypeError;
     }
     else if (xt > T_MASK && xt <= 0x3f) {
-	mesg = rb_sprintf("unknown type 0x%x (0x%x given, probably comes"
-			  " from extension library for ruby 1.8)", t, xt);
+        mesg = rb_sprintf("unknown type 0x%x (0x%x given, probably comes"
+                          " from extension library for ruby 1.8)", t, xt);
     }
     else {
-	mesg = rb_sprintf("unknown type 0x%x (0x%x given)", t, xt);
+        mesg = rb_sprintf("unknown type 0x%x (0x%x given)", t, xt);
     }
     rb_exc_raise(rb_exc_new_str(exc, mesg));
 }
@@ -1008,8 +999,8 @@ rb_check_type(VALUE x, int t)
 {
     int xt;
 
-    if (RB_UNLIKELY(x == Qundef)) {
-	rb_bug(UNDEF_LEAKED);
+    if (RB_UNLIKELY(UNDEF_P(x))) {
+        rb_bug(UNDEF_LEAKED);
     }
 
     xt = TYPE(x);
@@ -1022,15 +1013,15 @@ rb_check_type(VALUE x, int t)
          * So it is not enough to just check `T_DATA`, it must be
          * identified by its `type` using `Check_TypedStruct` instead.
          */
-	unexpected_type(x, xt, t);
+        unexpected_type(x, xt, t);
     }
 }
 
 void
 rb_unexpected_type(VALUE x, int t)
 {
-    if (RB_UNLIKELY(x == Qundef)) {
-	rb_bug(UNDEF_LEAKED);
+    if (RB_UNLIKELY(UNDEF_P(x))) {
+        rb_bug(UNDEF_LEAKED);
     }
 
     unexpected_type(x, TYPE(x), t);
@@ -1040,8 +1031,8 @@ int
 rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent)
 {
     while (child) {
-	if (child == parent) return 1;
-	child = child->parent;
+        if (child == parent) return 1;
+        child = child->parent;
     }
     return 0;
 }
@@ -1050,8 +1041,8 @@ int
 rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type)
 {
     if (!RB_TYPE_P(obj, T_DATA) ||
-	!RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
-	return 0;
+        !RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
+        return 0;
     }
     return 1;
 }
@@ -1231,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;
 }
@@ -1246,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;
 }
@@ -1273,19 +1264,14 @@ check_highlight_keyword(VALUE opt, int auto_tty_detect)
 
         switch (highlight) {
           default:
-            rb_bool_expected(highlight, "highlight");
+            rb_bool_expected(highlight, "highlight", TRUE);
             UNREACHABLE;
           case Qtrue: case Qfalse: case Qnil: break;
         }
     }
 
     if (NIL_P(highlight)) {
-        if (auto_tty_detect) {
-            highlight = rb_stderr_tty_p() ? Qtrue : Qfalse;
-        }
-        else {
-            highlight = Qfalse;
-        }
+        highlight = RBOOL(auto_tty_detect && rb_stderr_tty_p());
     }
 
     return highlight;
@@ -1390,6 +1376,28 @@ exc_message(VALUE exc)
  *
  * This method is overridden by did_you_mean and error_highlight to add
  * their information.
+ *
+ * A user-defined exception class can also define their own
+ * +detailed_message+ method to add supplemental information.
+ * When +highlight+ is true, it can return a string containing escape
+ * sequences, but use widely-supported ones. It is recommended to limit
+ * the following codes:
+ *
+ * - Reset (+\e[0m+)
+ * - Bold (+\e[1m+)
+ * - Underline (+\e[4m+)
+ * - Foreground color except white and black
+ *   - Red (+\e[31m+)
+ *   - Green (+\e[32m+)
+ *   - Yellow (+\e[33m+)
+ *   - Blue (+\e[34m+)
+ *   - Magenta (+\e[35m+)
+ *   - Cyan (+\e[36m+)
+ *
+ * Use escape sequences carefully even if +highlight+ is true.
+ * Do not use escape sequences to express essential information;
+ * the message should be readable even if all escape sequences are
+ * ignored.
  */
 
 static VALUE
@@ -1427,8 +1435,15 @@ exc_inspect(VALUE exc)
     str = rb_str_buf_new2("#<");
     klass = rb_class_name(klass);
     rb_str_buf_append(str, klass);
-    rb_str_buf_cat(str, ": ", 2);
-    rb_str_buf_append(str, exc);
+
+    if (RTEST(rb_str_include(exc, rb_str_new2("\n")))) {
+        rb_str_catf(str, ":%+"PRIsVALUE, exc);
+    }
+    else {
+        rb_str_buf_cat(str, ": ", 2);
+        rb_str_buf_append(str, exc);
+    }
+
     rb_str_buf_cat(str, ">", 1);
 
     return str;
@@ -1477,8 +1492,8 @@ exc_backtrace(VALUE exc)
     obj = rb_attr_get(exc, id_bt);
 
     if (rb_backtrace_p(obj)) {
-	obj = rb_backtrace_to_str_ary(obj);
-	/* rb_ivar_set(exc, id_bt, obj); */
+        obj = rb_backtrace_to_str_ary(obj);
+        /* rb_ivar_set(exc, id_bt, obj); */
     }
 
     return obj;
@@ -1492,16 +1507,16 @@ rb_get_backtrace(VALUE exc)
     ID mid = id_backtrace;
     VALUE info;
     if (rb_method_basic_definition_p(CLASS_OF(exc), id_backtrace)) {
-	VALUE klass = rb_eException;
-	rb_execution_context_t *ec = GET_EC();
-	if (NIL_P(exc))
-	    return Qnil;
-	EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef);
-	info = exc_backtrace(exc);
-	EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info);
+        VALUE klass = rb_eException;
+        rb_execution_context_t *ec = GET_EC();
+        if (NIL_P(exc))
+            return Qnil;
+        EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef);
+        info = exc_backtrace(exc);
+        EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info);
     }
     else {
-	info = rb_funcallv(exc, mid, 0, 0);
+        info = rb_funcallv(exc, mid, 0, 0);
     }
     if (NIL_P(info)) return Qnil;
     return rb_check_backtrace(info);
@@ -1524,7 +1539,7 @@ exc_backtrace_locations(VALUE exc)
 
     obj = rb_attr_get(exc, id_bt_locations);
     if (!NIL_P(obj)) {
-	obj = rb_backtrace_to_location_ary(obj);
+        obj = rb_backtrace_to_location_ary(obj);
     }
     return obj;
 }
@@ -1536,17 +1551,17 @@ rb_check_backtrace(VALUE bt)
     static const char err[] = "backtrace must be Array of String";
 
     if (!NIL_P(bt)) {
-	if (RB_TYPE_P(bt, T_STRING)) return rb_ary_new3(1, bt);
-	if (rb_backtrace_p(bt)) return bt;
-	if (!RB_TYPE_P(bt, T_ARRAY)) {
-	    rb_raise(rb_eTypeError, err);
-	}
-	for (i=0;i<RARRAY_LEN(bt);i++) {
-	    VALUE e = RARRAY_AREF(bt, i);
-	    if (!RB_TYPE_P(e, T_STRING)) {
-		rb_raise(rb_eTypeError, err);
-	    }
-	}
+        if (RB_TYPE_P(bt, T_STRING)) return rb_ary_new3(1, bt);
+        if (rb_backtrace_p(bt)) return bt;
+        if (!RB_TYPE_P(bt, T_ARRAY)) {
+            rb_raise(rb_eTypeError, err);
+        }
+        for (i=0;i<RARRAY_LEN(bt);i++) {
+            VALUE e = RARRAY_AREF(bt, i);
+            if (!RB_TYPE_P(e, T_STRING)) {
+                rb_raise(rb_eTypeError, err);
+            }
+        }
     }
     return bt;
 }
@@ -1611,26 +1626,26 @@ exc_equal(VALUE exc, VALUE obj)
     if (exc == obj) return Qtrue;
 
     if (rb_obj_class(exc) != rb_obj_class(obj)) {
-	int state;
-
-	obj = rb_protect(try_convert_to_exception, obj, &state);
-	if (state || obj == Qundef) {
-	    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;
-	backtrace = rb_check_funcall(obj, id_backtrace, 0, 0);
-	if (backtrace == Qundef) return Qfalse;
+        int state;
+
+        obj = rb_protect(try_convert_to_exception, obj, &state);
+        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 (UNDEF_P(mesg)) return Qfalse;
+        backtrace = rb_check_funcall(obj, id_backtrace, 0, 0);
+        if (UNDEF_P(backtrace)) return Qfalse;
     }
     else {
-	mesg = rb_attr_get(obj, id_mesg);
-	backtrace = exc_backtrace(obj);
+        mesg = rb_attr_get(obj, id_mesg);
+        backtrace = exc_backtrace(obj);
     }
 
     if (!rb_equal(rb_attr_get(exc, id_mesg), mesg))
-	return Qfalse;
+        return Qfalse;
     return rb_equal(exc_backtrace(exc), backtrace);
 }
 
@@ -1651,37 +1666,37 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
 {
     VALUE status;
     if (argc > 0) {
-	status = *argv;
-
-	switch (status) {
-	  case Qtrue:
-	    status = INT2FIX(EXIT_SUCCESS);
-	    ++argv;
-	    --argc;
-	    break;
-	  case Qfalse:
-	    status = INT2FIX(EXIT_FAILURE);
-	    ++argv;
-	    --argc;
-	    break;
-	  default:
-	    status = rb_check_to_int(status);
-	    if (NIL_P(status)) {
-		status = INT2FIX(EXIT_SUCCESS);
-	    }
-	    else {
+        status = *argv;
+
+        switch (status) {
+          case Qtrue:
+            status = INT2FIX(EXIT_SUCCESS);
+            ++argv;
+            --argc;
+            break;
+          case Qfalse:
+            status = INT2FIX(EXIT_FAILURE);
+            ++argv;
+            --argc;
+            break;
+          default:
+            status = rb_check_to_int(status);
+            if (NIL_P(status)) {
+                status = INT2FIX(EXIT_SUCCESS);
+            }
+            else {
 #if EXIT_SUCCESS != 0
-		if (status == INT2FIX(0))
-		    status = INT2FIX(EXIT_SUCCESS);
+                if (status == INT2FIX(0))
+                    status = INT2FIX(EXIT_SUCCESS);
 #endif
-		++argv;
-		--argc;
-	    }
-	    break;
-	}
+                ++argv;
+                --argc;
+            }
+            break;
+        }
     }
     else {
-	status = INT2FIX(EXIT_SUCCESS);
+        status = INT2FIX(EXIT_SUCCESS);
     }
     rb_call_super(argc, argv);
     rb_ivar_set(exc, id_status, status);
@@ -1717,7 +1732,7 @@ exit_success_p(VALUE exc)
     int status;
 
     if (NIL_P(status_val))
-	return Qtrue;
+        return Qtrue;
     status = NUM2INT(status_val);
     return RBOOL(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
 }
@@ -1725,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;
 }
 
@@ -1803,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;
 }
 
@@ -1880,10 +1897,10 @@ name_err_local_variables(VALUE self)
     VALUE vars = rb_attr_get(self, id_local_variables);
 
     if (NIL_P(vars)) {
-	VALUE iseqw = rb_attr_get(self, id_iseq);
-	if (!NIL_P(iseqw)) vars = rb_iseqw_local_variables(iseqw);
-	if (NIL_P(vars)) vars = rb_ary_new();
-	rb_ivar_set(self, id_local_variables, vars);
+        VALUE iseqw = rb_attr_get(self, id_iseq);
+        if (!NIL_P(iseqw)) vars = rb_iseqw_local_variables(iseqw);
+        if (NIL_P(vars)) vars = rb_ary_new();
+        rb_ivar_set(self, id_local_variables, vars);
     }
     return vars;
 }
@@ -1959,9 +1976,9 @@ name_err_mesg_memsize(const void *p)
 static const rb_data_type_t name_err_mesg_data_type = {
     "name_err_mesg",
     {
-	name_err_mesg_mark,
-	name_err_mesg_free,
-	name_err_mesg_memsize,
+        name_err_mesg_mark,
+        name_err_mesg_free,
+        name_err_mesg_memsize,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
@@ -2018,13 +2035,13 @@ name_err_mesg_equal(VALUE obj1, VALUE obj2)
 
     if (obj1 == obj2) return Qtrue;
     if (rb_obj_class(obj2) != rb_cNameErrorMesg)
-	return Qfalse;
+        return Qfalse;
 
     TypedData_Get_Struct(obj1, VALUE, &name_err_mesg_data_type, ptr1);
     TypedData_Get_Struct(obj2, VALUE, &name_err_mesg_data_type, ptr2);
     for (i=0; i<NAME_ERR_MESG_COUNT; i++) {
-	if (!rb_equal(ptr1[i], ptr2[i]))
-	    return Qfalse;
+        if (!rb_equal(ptr1[i], ptr2[i]))
+            return Qfalse;
     }
     return Qtrue;
 }
@@ -2050,49 +2067,49 @@ name_err_mesg_to_str(VALUE obj)
     mesg = ptr[NAME_ERR_MESG__MESG];
     if (NIL_P(mesg)) return Qnil;
     else {
-	struct RString s_str, d_str;
-	VALUE c, s, d = 0, args[4];
-	int state = 0, singleton = 0;
-	rb_encoding *usascii = rb_usascii_encoding();
+        struct RString s_str, d_str;
+        VALUE c, s, d = 0, args[4];
+        int state = 0, singleton = 0;
+        rb_encoding *usascii = rb_usascii_encoding();
 
 #define FAKE_CSTR(v, str) rb_setup_fake_str((v), (str), rb_strlen_lit(str), usascii)
-	obj = ptr[NAME_ERR_MESG__RECV];
-	switch (obj) {
-	  case Qnil:
-	    d = FAKE_CSTR(&d_str, "nil");
-	    break;
-	  case Qtrue:
-	    d = FAKE_CSTR(&d_str, "true");
-	    break;
-	  case Qfalse:
-	    d = FAKE_CSTR(&d_str, "false");
-	    break;
-	  default:
-	    d = rb_protect(name_err_mesg_receiver_name, obj, &state);
-	    if (state || d == Qundef || NIL_P(d))
-		d = rb_protect(rb_inspect, obj, &state);
-	    if (state) {
-		rb_set_errinfo(Qnil);
-	    }
-	    d = rb_check_string_type(d);
-	    if (NIL_P(d)) {
-		d = rb_any_to_s(obj);
-	    }
-	    singleton = (RSTRING_LEN(d) > 0 && RSTRING_PTR(d)[0] == '#');
-	    break;
-	}
-	if (!singleton) {
-	    s = FAKE_CSTR(&s_str, ":");
-	    c = rb_class_name(CLASS_OF(obj));
-	}
-	else {
-	    c = s = FAKE_CSTR(&s_str, "");
-	}
+        obj = ptr[NAME_ERR_MESG__RECV];
+        switch (obj) {
+          case Qnil:
+            d = FAKE_CSTR(&d_str, "nil");
+            break;
+          case Qtrue:
+            d = FAKE_CSTR(&d_str, "true");
+            break;
+          case Qfalse:
+            d = FAKE_CSTR(&d_str, "false");
+            break;
+          default:
+            d = rb_protect(name_err_mesg_receiver_name, obj, &state);
+            if (state || NIL_OR_UNDEF_P(d))
+                d = rb_protect(rb_inspect, obj, &state);
+            if (state) {
+                rb_set_errinfo(Qnil);
+            }
+            d = rb_check_string_type(d);
+            if (NIL_P(d)) {
+                d = rb_any_to_s(obj);
+            }
+            singleton = (RSTRING_LEN(d) > 0 && RSTRING_PTR(d)[0] == '#');
+            break;
+        }
+        if (!singleton) {
+            s = FAKE_CSTR(&s_str, ":");
+            c = rb_class_name(CLASS_OF(obj));
+        }
+        else {
+            c = s = FAKE_CSTR(&s_str, "");
+        }
         args[0] = rb_obj_as_string(ptr[NAME_ERR_MESG__NAME]);
-	args[1] = d;
-	args[2] = s;
-	args[3] = c;
-	mesg = rb_str_format(4, args, mesg);
+        args[1] = d;
+        args[2] = s;
+        args[3] = c;
+        mesg = rb_str_format(4, args, mesg);
     }
     return mesg;
 }
@@ -2124,11 +2141,11 @@ 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)) {
-	rb_raise(rb_eArgError, "no receiver is available");
+        rb_raise(rb_eArgError, "no receiver is available");
     }
     ptr = DATA_PTR(mesg);
     return ptr[NAME_ERR_MESG__RECV];
@@ -2182,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");
 }
 
@@ -2199,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");
 }
 
@@ -2230,17 +2247,17 @@ key_err_initialize(int argc, VALUE *argv, VALUE self)
     rb_call_super(rb_scan_args(argc, argv, "01:", NULL, &options), argv);
 
     if (!NIL_P(options)) {
-	ID keywords[2];
-	VALUE values[numberof(keywords)];
-	int i;
-	keywords[0] = id_receiver;
-	keywords[1] = id_key;
-	rb_get_kwargs(options, keywords, 0, numberof(values), values);
-	for (i = 0; i < numberof(values); ++i) {
-	    if (values[i] != Qundef) {
-		rb_ivar_set(self, keywords[i], values[i]);
-	    }
-	}
+        ID keywords[2];
+        VALUE values[numberof(keywords)];
+        int i;
+        keywords[0] = id_receiver;
+        keywords[1] = id_key;
+        rb_get_kwargs(options, keywords, 0, numberof(values), values);
+        for (i = 0; i < numberof(values); ++i) {
+            if (!UNDEF_P(values[i])) {
+                rb_ivar_set(self, keywords[i], values[i]);
+            }
+        }
     }
 
     return self;
@@ -2259,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");
 }
 
@@ -2276,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");
 }
 
@@ -2303,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]);
             }
         }
@@ -2325,13 +2342,32 @@ syntax_error_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE mesg;
     if (argc == 0) {
-	mesg = rb_fstring_lit("compile error");
-	argc = 1;
-	argv = &mesg;
+        mesg = rb_fstring_lit("compile error");
+        argc = 1;
+        argv = &mesg;
     }
     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
  *
@@ -2370,30 +2406,30 @@ set_syserr(int n, const char *name)
     st_data_t error;
 
     if (!st_lookup(syserr_tbl, n, &error)) {
-	error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
+        error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
 
-	/* capture nonblock errnos for WaitReadable/WaitWritable subclasses */
-	switch (n) {
-	  case EAGAIN:
-	    rb_eEAGAIN = error;
+        /* capture nonblock errnos for WaitReadable/WaitWritable subclasses */
+        switch (n) {
+          case EAGAIN:
+            rb_eEAGAIN = error;
 
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	    break;
-	  case EWOULDBLOCK:
+            break;
+          case EWOULDBLOCK:
 #endif
 
-	    rb_eEWOULDBLOCK = error;
-	    break;
-	  case EINPROGRESS:
-	    rb_eEINPROGRESS = error;
-	    break;
-	}
+            rb_eEWOULDBLOCK = error;
+            break;
+          case EINPROGRESS:
+            rb_eEINPROGRESS = error;
+            break;
+        }
 
-	rb_define_const(error, "Errno", INT2NUM(n));
-	st_add_direct(syserr_tbl, n, error);
+        rb_define_const(error, "Errno", INT2NUM(n));
+        st_add_direct(syserr_tbl, n, error);
     }
     else {
-	rb_define_const(rb_mErrno, name, error);
+        rb_define_const(rb_mErrno, name, error);
     }
     return error;
 }
@@ -2404,10 +2440,10 @@ get_syserr(int n)
     st_data_t error;
 
     if (!st_lookup(syserr_tbl, n, &error)) {
-	char name[8];	/* some Windows' errno have 5 digits. */
+        char name[8];	/* some Windows' errno have 5 digits. */
 
-	snprintf(name, sizeof(name), "E%03d", n);
-	error = set_syserr(n, name);
+        snprintf(name, sizeof(name), "E%03d", n);
+        error = set_syserr(n, name);
     }
     return error;
 }
@@ -2425,41 +2461,38 @@ get_syserr(int n)
 static VALUE
 syserr_initialize(int argc, VALUE *argv, VALUE self)
 {
-#if !defined(_WIN32)
-    char *strerror();
-#endif
     const char *err;
     VALUE mesg, error, func, errmsg;
     VALUE klass = rb_obj_class(self);
 
     if (klass == rb_eSystemCallError) {
-	st_data_t data = (st_data_t)klass;
-	rb_scan_args(argc, argv, "12", &mesg, &error, &func);
-	if (argc == 1 && FIXNUM_P(mesg)) {
-	    error = mesg; mesg = Qnil;
-	}
-	if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &data)) {
-	    klass = (VALUE)data;
-	    /* change class */
-	    if (!RB_TYPE_P(self, T_OBJECT)) { /* insurance to avoid type crash */
-		rb_raise(rb_eTypeError, "invalid instance type");
-	    }
-	    RBASIC_SET_CLASS(self, klass);
-	}
+        st_data_t data = (st_data_t)klass;
+        rb_scan_args(argc, argv, "12", &mesg, &error, &func);
+        if (argc == 1 && FIXNUM_P(mesg)) {
+            error = mesg; mesg = Qnil;
+        }
+        if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &data)) {
+            klass = (VALUE)data;
+            /* change class */
+            if (!RB_TYPE_P(self, T_OBJECT)) { /* insurance to avoid type crash */
+                rb_raise(rb_eTypeError, "invalid instance type");
+            }
+            RBASIC_SET_CLASS(self, klass);
+        }
     }
     else {
-	rb_scan_args(argc, argv, "02", &mesg, &func);
-	error = rb_const_get(klass, id_Errno);
+        rb_scan_args(argc, argv, "02", &mesg, &func);
+        error = rb_const_get(klass, id_Errno);
     }
     if (!NIL_P(error)) err = strerror(NUM2INT(error));
     else err = "unknown error";
 
     errmsg = rb_enc_str_new_cstr(err, rb_locale_encoding());
     if (!NIL_P(mesg)) {
-	VALUE str = StringValue(mesg);
+        VALUE str = StringValue(mesg);
 
-	if (!NIL_P(func)) rb_str_catf(errmsg, " @ %"PRIsVALUE, func);
-	rb_str_catf(errmsg, " - %"PRIsVALUE, str);
+        if (!NIL_P(func)) rb_str_catf(errmsg, " @ %"PRIsVALUE, func);
+        rb_str_catf(errmsg, " - %"PRIsVALUE, str);
     }
     mesg = errmsg;
 
@@ -2495,13 +2528,13 @@ syserr_eqq(VALUE self, VALUE exc)
     VALUE num, e;
 
     if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) {
-	if (!rb_respond_to(exc, id_errno)) return Qfalse;
+        if (!rb_respond_to(exc, id_errno)) return Qfalse;
     }
     else if (self == rb_eSystemCallError) return Qtrue;
 
     num = rb_attr_get(exc, id_errno);
     if (NIL_P(num)) {
-	num = rb_funcallv(exc, id_errno, 0, 0);
+        num = rb_funcallv(exc, id_errno, 0, 0);
     }
     e = rb_const_get(self, id_Errno);
     return RBOOL(FIXNUM_P(num) ? num == e : rb_equal(num, e));
@@ -2928,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)
 {
@@ -2942,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);
     }
@@ -2993,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"), 1, 0, Qfalse);
+    rb_attr(rb_eLoadError, path, TRUE, FALSE, FALSE);
 
     rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
 
@@ -3149,8 +3193,8 @@ void
 rb_notimplement(void)
 {
     rb_raise(rb_eNotImpError,
-	     "%"PRIsVALUE"() function is unimplemented on this machine",
-	     rb_id2str(rb_frame_this_func()));
+             "%"PRIsVALUE"() function is unimplemented on this machine",
+             rb_id2str(rb_frame_this_func()));
 }
 
 void
@@ -3181,7 +3225,7 @@ make_errno_exc(const char *mesg)
 
     errno = 0;
     if (n == 0) {
-	rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : "");
+        rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : "");
     }
     return rb_syserr_new(n, mesg);
 }
@@ -3194,8 +3238,8 @@ make_errno_exc_str(VALUE mesg)
     errno = 0;
     if (!mesg) mesg = Qnil;
     if (n == 0) {
-	const char *s = !NIL_P(mesg) ? RSTRING_PTR(mesg) : "";
-	rb_bug("rb_sys_fail_str(%s) - errno == 0", s);
+        const char *s = !NIL_P(mesg) ? RSTRING_PTR(mesg) : "";
+        rb_bug("rb_sys_fail_str(%s) - errno == 0", s);
     }
     return rb_syserr_new_str(n, mesg);
 }
@@ -3261,10 +3305,10 @@ rb_syserr_new_path_in(const char *func_name, int n, VALUE path)
 
     if (!path) path = Qnil;
     if (n == 0) {
-	const char *s = !NIL_P(path) ? RSTRING_PTR(path) : "";
-	if (!func_name) func_name = "(null)";
-	rb_bug("rb_sys_fail_path_in(%s, %s) - errno == 0",
-	       func_name, s);
+        const char *s = !NIL_P(path) ? RSTRING_PTR(path) : "";
+        if (!func_name) func_name = "(null)";
+        rb_bug("rb_sys_fail_path_in(%s, %s) - errno == 0",
+               func_name, s);
     }
     args[0] = path;
     args[1] = rb_str_new_cstr(func_name);
@@ -3322,11 +3366,11 @@ void
 rb_sys_warn(const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-	int errno_save = errno;
-	with_warning_string(mesg, 0, fmt) {
-	    syserr_warning(mesg, errno_save);
-	}
-	errno = errno_save;
+        int errno_save = errno;
+        with_warning_string(mesg, 0, fmt) {
+            syserr_warning(mesg, errno_save);
+        }
+        errno = errno_save;
     }
 }
 
@@ -3334,9 +3378,9 @@ void
 rb_syserr_warn(int err, const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-	with_warning_string(mesg, 0, fmt) {
-	    syserr_warning(mesg, err);
-	}
+        with_warning_string(mesg, 0, fmt) {
+            syserr_warning(mesg, err);
+        }
     }
 }
 
@@ -3344,11 +3388,11 @@ void
 rb_sys_enc_warn(rb_encoding *enc, const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-	int errno_save = errno;
-	with_warning_string(mesg, enc, fmt) {
-	    syserr_warning(mesg, errno_save);
-	}
-	errno = errno_save;
+        int errno_save = errno;
+        with_warning_string(mesg, enc, fmt) {
+            syserr_warning(mesg, errno_save);
+        }
+        errno = errno_save;
     }
 }
 
@@ -3356,9 +3400,9 @@ void
 rb_syserr_enc_warn(int err, rb_encoding *enc, const char *fmt, ...)
 {
     if (!NIL_P(ruby_verbose)) {
-	with_warning_string(mesg, enc, fmt) {
-	    syserr_warning(mesg, err);
-	}
+        with_warning_string(mesg, enc, fmt) {
+            syserr_warning(mesg, err);
+        }
     }
 }
 #endif
@@ -3367,11 +3411,11 @@ void
 rb_sys_warning(const char *fmt, ...)
 {
     if (RTEST(ruby_verbose)) {
-	int errno_save = errno;
-	with_warning_string(mesg, 0, fmt) {
-	    syserr_warning(mesg, errno_save);
-	}
-	errno = errno_save;
+        int errno_save = errno;
+        with_warning_string(mesg, 0, fmt) {
+            syserr_warning(mesg, errno_save);
+        }
+        errno = errno_save;
     }
 }
 
@@ -3380,9 +3424,9 @@ void
 rb_syserr_warning(int err, const char *fmt, ...)
 {
     if (RTEST(ruby_verbose)) {
-	with_warning_string(mesg, 0, fmt) {
-	    syserr_warning(mesg, err);
-	}
+        with_warning_string(mesg, 0, fmt) {
+            syserr_warning(mesg, err);
+        }
     }
 }
 #endif
@@ -3391,11 +3435,11 @@ void
 rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...)
 {
     if (RTEST(ruby_verbose)) {
-	int errno_save = errno;
-	with_warning_string(mesg, enc, fmt) {
-	    syserr_warning(mesg, errno_save);
-	}
-	errno = errno_save;
+        int errno_save = errno;
+        with_warning_string(mesg, enc, fmt) {
+            syserr_warning(mesg, errno_save);
+        }
+        errno = errno_save;
     }
 }
 
@@ -3403,9 +3447,9 @@ void
 rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...)
 {
     if (RTEST(ruby_verbose)) {
-	with_warning_string(mesg, enc, fmt) {
-	    syserr_warning(mesg, err);
-	}
+        with_warning_string(mesg, enc, fmt) {
+            syserr_warning(mesg, err);
+        }
     }
 }
 
@@ -3463,8 +3507,8 @@ rb_error_frozen_object(VALUE frozen_obj)
     rb_exec_recursive(inspect_frozen_obj, frozen_obj, mesg);
 
     if (!NIL_P(debug_info = rb_attr_get(frozen_obj, created_info))) {
-	VALUE path = rb_ary_entry(debug_info, 0);
-	VALUE line = rb_ary_entry(debug_info, 1);
+        VALUE path = rb_ary_entry(debug_info, 0);
+        VALUE line = rb_ary_entry(debug_info, 1);
 
         rb_str_catf(mesg, ", created at %"PRIsVALUE":%"PRIsVALUE, path, line);
     }
diff --git a/eval.c b/eval.c
index a059987824..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;
@@ -67,7 +68,7 @@ ruby_setup(void)
     enum ruby_tag_type state;
 
     if (GET_VM())
-	return 0;
+        return 0;
 
     ruby_init_stack((void *)&state);
 
@@ -85,9 +86,9 @@ ruby_setup(void)
 
     EC_PUSH_TAG(GET_EC());
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-	rb_call_inits();
-	ruby_prog_init();
-	GET_VM()->running = 1;
+        rb_call_inits();
+        ruby_prog_init();
+        GET_VM()->running = 1;
     }
     EC_POP_TAG();
 
@@ -99,9 +100,11 @@ ruby_init(void)
 {
     int state = ruby_setup();
     if (state) {
-        if (RTEST(ruby_debug))
-            error_print(GET_EC());
-	exit(EXIT_FAILURE);
+        if (RTEST(ruby_debug)) {
+            rb_execution_context_t *ec = GET_EC();
+            rb_ec_error_print(ec, ec->errinfo);
+        }
+        exit(EXIT_FAILURE);
     }
 }
 
@@ -115,12 +118,13 @@ ruby_options(int argc, char **argv)
     ruby_init_stack((void *)&iseq);
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-	SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
+        SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, 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++;
-	/* protect from Thread#raise */
-	th->status = THREAD_KILLED;
+        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());
+        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;
+        switch (step) {
+          case 0: goto step_0;
+          case 1: goto step_1;
+          case 2: goto step_2;
+          case 3: goto step_3;
         }
-	else if (sysex == EXIT_SUCCESS) {
-	    sysex = EXIT_FAILURE;
-	}
     }
 
-    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;
 }
@@ -277,9 +286,9 @@ rb_ec_exec_node(rb_execution_context_t *ec, void *n)
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
         rb_thread_t *const th = rb_ec_thread_ptr(ec);
-	SAVE_ROOT_JMPBUF(th, {
-	    rb_iseq_eval_main(iseq);
-	});
+        SAVE_ROOT_JMPBUF(th, {
+            rb_iseq_eval_main(iseq);
+        });
     }
     EC_POP_TAG();
     return state;
@@ -301,8 +310,8 @@ ruby_executable_node(void *n, int *status)
       case Qtrue:  s = EXIT_SUCCESS; break;
       case Qfalse: s = EXIT_FAILURE; break;
       default:
-	if (!FIXNUM_P(v)) return TRUE;
-	s = FIX2INT(v);
+        if (!FIXNUM_P(v)) return TRUE;
+        s = FIX2INT(v);
     }
     if (status) *status = s;
     return FALSE;
@@ -314,8 +323,8 @@ 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);
-	return status;
+        rb_ec_cleanup(ec, (NIL_P(ec->errinfo) ? TAG_NONE : TAG_RAISE));
+        return status;
     }
     ruby_init_stack((void *)&status);
     return rb_ec_cleanup(ec, rb_ec_exec_node(ec, n));
@@ -350,12 +359,12 @@ rb_mod_nesting(VALUE _)
     const rb_cref_t *cref = rb_vm_cref();
 
     while (cref && CREF_NEXT(cref)) {
-	VALUE klass = CREF_CLASS(cref);
-	if (!CREF_PUSHED_BY_EVAL(cref) &&
-	    !NIL_P(klass)) {
-	    rb_ary_push(ary, klass);
-	}
-	cref = CREF_NEXT(cref);
+        VALUE klass = CREF_CLASS(cref);
+        if (!CREF_PUSHED_BY_EVAL(cref) &&
+            !NIL_P(klass)) {
+            rb_ary_push(ary, klass);
+        }
+        cref = CREF_NEXT(cref);
     }
     return ary;
 }
@@ -391,23 +400,23 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
     void *data = 0;
 
     if (argc > 0 || mod != rb_cModule) {
-	return rb_mod_constants(argc, argv, mod);
+        return rb_mod_constants(argc, argv, mod);
     }
 
     while (cref) {
-	klass = CREF_CLASS(cref);
-	if (!CREF_PUSHED_BY_EVAL(cref) &&
-	    !NIL_P(klass)) {
-	    data = rb_mod_const_at(CREF_CLASS(cref), data);
-	    if (!cbase) {
-		cbase = klass;
-	    }
-	}
-	cref = CREF_NEXT(cref);
+        klass = CREF_CLASS(cref);
+        if (!CREF_PUSHED_BY_EVAL(cref) &&
+            !NIL_P(klass)) {
+            data = rb_mod_const_at(CREF_CLASS(cref), data);
+            if (!cbase) {
+                cbase = klass;
+            }
+        }
+        cref = CREF_NEXT(cref);
     }
 
     if (cbase) {
-	data = rb_mod_const_of(cbase, data);
+        data = rb_mod_const_of(cbase, data);
     }
     return rb_const_list(data);
 }
@@ -422,45 +431,45 @@ void
 rb_class_modify_check(VALUE klass)
 {
     if (SPECIAL_CONST_P(klass)) {
-	Check_Type(klass, T_CLASS);
+        Check_Type(klass, T_CLASS);
     }
     if (RB_TYPE_P(klass, T_MODULE)) {
         rb_module_set_initialized(klass);
     }
     if (OBJ_FROZEN(klass)) {
-	const char *desc;
-
-	if (FL_TEST(klass, FL_SINGLETON)) {
-	    desc = "object";
-	    klass = rb_ivar_get(klass, id__attached__);
-	    if (!SPECIAL_CONST_P(klass)) {
-		switch (BUILTIN_TYPE(klass)) {
-		  case T_MODULE:
-		  case T_ICLASS:
-		    desc = "Module";
-		    break;
-		  case T_CLASS:
-		    desc = "Class";
-		    break;
+        const char *desc;
+
+        if (FL_TEST(klass, FL_SINGLETON)) {
+            desc = "object";
+            klass = rb_ivar_get(klass, id__attached__);
+            if (!SPECIAL_CONST_P(klass)) {
+                switch (BUILTIN_TYPE(klass)) {
+                  case T_MODULE:
+                  case T_ICLASS:
+                    desc = "Module";
+                    break;
+                  case T_CLASS:
+                    desc = "Class";
+                    break;
                   default:
                     break;
-		}
-	    }
-	}
-	else {
-	    switch (BUILTIN_TYPE(klass)) {
-	      case T_MODULE:
-	      case T_ICLASS:
-		desc = "module";
-		break;
-	      case T_CLASS:
-		desc = "class";
-		break;
-	      default:
+                }
+            }
+        }
+        else {
+            switch (BUILTIN_TYPE(klass)) {
+              case T_MODULE:
+              case T_ICLASS:
+                desc = "module";
+                break;
+              case T_CLASS:
+                desc = "class";
+                break;
+              default:
                 Check_Type(klass, T_CLASS);
                 UNREACHABLE;
-	    }
-	}
+            }
+        }
         rb_frozen_error_raise(klass, "can't modify frozen %s: %"PRIsVALUE, desc, klass);
     }
 }
@@ -474,23 +483,23 @@ exc_setup_cause(VALUE exc, VALUE cause)
 {
 #if OPT_SUPPORT_JOKE
     if (NIL_P(cause)) {
-	ID id_true_cause;
-	CONST_ID(id_true_cause, "true_cause");
-
-	cause = rb_attr_get(rb_eFatal, id_true_cause);
-	if (NIL_P(cause)) {
-	    cause = rb_exc_new_cstr(rb_eFatal, "because using such Ruby");
-	    rb_ivar_set(cause, id_cause, INT2FIX(42)); /* the answer */
-	    OBJ_FREEZE(cause);
-	    rb_ivar_set(rb_eFatal, id_true_cause, cause);
-	}
+        ID id_true_cause;
+        CONST_ID(id_true_cause, "true_cause");
+
+        cause = rb_attr_get(rb_eFatal, id_true_cause);
+        if (NIL_P(cause)) {
+            cause = rb_exc_new_cstr(rb_eFatal, "because using such Ruby");
+            rb_ivar_set(cause, id_cause, INT2FIX(42)); /* the answer */
+            OBJ_FREEZE(cause);
+            rb_ivar_set(rb_eFatal, id_true_cause, cause);
+        }
     }
 #endif
     if (!NIL_P(cause) && cause != exc) {
-	rb_ivar_set(exc, id_cause, cause);
-	if (!rb_ivar_defined(cause, id_cause)) {
-	    rb_ivar_set(cause, id_cause, Qnil);
-	}
+        rb_ivar_set(exc, id_cause, cause);
+        if (!rb_ivar_defined(cause, id_cause)) {
+            rb_ivar_set(cause, id_cause, Qnil);
+        }
     }
     return exc;
 }
@@ -502,23 +511,23 @@ exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
     int nocircular = 0;
 
     if (NIL_P(mesg)) {
-	mesg = ec->errinfo;
-	if (INTERNAL_EXCEPTION_P(mesg)) EC_JUMP_TAG(ec, TAG_FATAL);
-	nocause = 1;
+        mesg = ec->errinfo;
+        if (INTERNAL_EXCEPTION_P(mesg)) EC_JUMP_TAG(ec, TAG_FATAL);
+        nocause = 1;
     }
     if (NIL_P(mesg)) {
-	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
-	nocause = 0;
+        mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
+        nocause = 0;
         nocircular = 1;
     }
-    if (*cause == Qundef) {
-	if (nocause) {
-	    *cause = Qnil;
+    if (UNDEF_P(*cause)) {
+        if (nocause) {
+            *cause = Qnil;
             nocircular = 1;
-	}
-	else if (!rb_ivar_defined(mesg, id_cause)) {
-	    *cause = get_ec_errinfo(ec);
-	}
+        }
+        else if (!rb_ivar_defined(mesg, id_cause)) {
+            *cause = get_ec_errinfo(ec);
+        }
         else {
             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,68 +559,68 @@ 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))  {
-	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 (OBJ_FROZEN(mesg)) {
-		    mesg = rb_obj_dup(mesg);
-		}
-	    }
-            if (cause != Qundef && !THROW_DATA_P(cause)) {
-		exc_setup_cause(mesg, cause);
-	    }
-	    if (NIL_P(bt)) {
-		VALUE at = rb_ec_backtrace_object(ec);
-		rb_ivar_set(mesg, idBt_locations, at);
-		set_backtrace(mesg, at);
-	    }
-	    rb_ec_reset_raised(ec);
-	}
-	EC_POP_TAG();
+    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) || UNDEF_P(cause)) {
+                if (OBJ_FROZEN(mesg)) {
+                    mesg = rb_obj_dup(mesg);
+                }
+            }
+            if (!UNDEF_P(cause) && !THROW_DATA_P(cause)) {
+                exc_setup_cause(mesg, cause);
+            }
+            if (NIL_P(bt)) {
+                VALUE at = rb_ec_backtrace_object(ec);
+                rb_ivar_set(mesg, idBt_locations, at);
+                set_backtrace(mesg, at);
+            }
+            rb_ec_reset_raised(ec);
+        }
+        EC_POP_TAG();
         file = file0;
-	if (state) goto fatal;
+        if (state) goto fatal;
     }
 
     if (!NIL_P(mesg)) {
-	ec->errinfo = mesg;
+        ec->errinfo = mesg;
     }
 
     if (RTEST(ruby_debug) && !NIL_P(e = ec->errinfo) &&
-	!rb_obj_is_kind_of(e, rb_eSystemExit)) {
-	enum ruby_tag_type state;
-
-	mesg = e;
-	EC_PUSH_TAG(ec);
-	if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-	    ec->errinfo = Qnil;
-	    e = rb_obj_as_string(mesg);
-	    ec->errinfo = mesg;
-	    if (file && line) {
-		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
-			       rb_obj_class(mesg), file, line, e);
-	    }
-	    else if (file) {
-		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
-			       rb_obj_class(mesg), file, e);
-	    }
-	    else {
-		e = rb_sprintf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
-			       rb_obj_class(mesg), e);
-	    }
-	    warn_print_str(e);
-	}
-	EC_POP_TAG();
-	if (state == TAG_FATAL && ec->errinfo == exception_error) {
-	    ec->errinfo = mesg;
-	}
-	else if (state) {
-	    rb_ec_reset_raised(ec);
-	    EC_JUMP_TAG(ec, state);
-	}
+        !rb_obj_is_kind_of(e, rb_eSystemExit)) {
+        enum ruby_tag_type state;
+
+        mesg = e;
+        EC_PUSH_TAG(ec);
+        if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+            ec->errinfo = Qnil;
+            e = rb_obj_as_string(mesg);
+            ec->errinfo = mesg;
+            if (file && line) {
+                e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
+                               rb_obj_class(mesg), file, line, e);
+            }
+            else if (file) {
+                e = rb_sprintf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
+                               rb_obj_class(mesg), file, e);
+            }
+            else {
+                e = rb_sprintf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
+                               rb_obj_class(mesg), e);
+            }
+            warn_print_str(e);
+        }
+        EC_POP_TAG();
+        if (state == TAG_FATAL && ec->errinfo == exception_error) {
+            ec->errinfo = mesg;
+        }
+        else if (state) {
+            rb_ec_reset_raised(ec);
+            EC_JUMP_TAG(ec, state);
+        }
     }
 
     if (rb_ec_set_raised(ec)) {
@@ -615,8 +628,8 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE
     }
 
     if (tag != TAG_FATAL) {
-	RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(ec->errinfo));
-	EXEC_EVENT_HOOK(ec, RUBY_EVENT_RAISE, ec->cfp->self, 0, 0, 0, mesg);
+        RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(ec->errinfo));
+        EXEC_EVENT_HOOK(ec, RUBY_EVENT_RAISE, ec->cfp->self, 0, 0, 0, mesg);
     }
     return;
 
@@ -630,11 +643,15 @@ 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) {
-	cause = get_ec_errinfo(ec);
+    if (UNDEF_P(cause)) {
+        cause = get_ec_errinfo(ec);
     }
     if (cause != mesg) {
-	rb_ivar_set(mesg, id_cause, cause);
+        if (THROW_DATA_P(cause)) {
+            cause = Qnil;
+        }
+
+        rb_ivar_set(mesg, id_cause, cause);
     }
 }
 
@@ -655,7 +672,7 @@ static void
 rb_exc_exception(VALUE mesg, int tag, VALUE cause)
 {
     if (!NIL_P(mesg)) {
-	mesg = make_exception(1, &mesg, FALSE);
+        mesg = make_exception(1, &mesg, FALSE);
     }
     rb_longjmp(GET_EC(), tag, mesg, cause);
 }
@@ -699,20 +716,20 @@ extract_raise_opts(int argc, VALUE *argv, VALUE *opts)
 {
     int i;
     if (argc > 0) {
-	VALUE opt;
-	argc = rb_scan_args(argc, argv, "*:", NULL, &opt);
-	if (!NIL_P(opt)) {
-	    if (!RHASH_EMPTY_P(opt)) {
-		ID keywords[1];
-		CONST_ID(keywords[0], "cause");
-		rb_get_kwargs(opt, keywords, 0, -1-raise_max_opt, opts);
-		if (!RHASH_EMPTY_P(opt)) argv[argc++] = opt;
-		return argc;
-	    }
-	}
+        VALUE opt;
+        argc = rb_scan_args(argc, argv, "*:", NULL, &opt);
+        if (!NIL_P(opt)) {
+            if (!RHASH_EMPTY_P(opt)) {
+                ID keywords[1];
+                CONST_ID(keywords[0], "cause");
+                rb_get_kwargs(opt, keywords, 0, -1-raise_max_opt, opts);
+                if (!RHASH_EMPTY_P(opt)) argv[argc++] = opt;
+                return argc;
+            }
+        }
     }
     for (i = 0; i < raise_max_opt; ++i) {
-	opts[i] = Qundef;
+        opts[i] = Qundef;
     }
     return argc;
 }
@@ -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();
@@ -784,24 +801,24 @@ make_exception(int argc, const VALUE *argv, int isstr)
       case 0:
         return Qnil;
       case 1:
-	exc = argv[0];
+        exc = argv[0];
         if (isstr &&! NIL_P(exc)) {
-	    mesg = rb_check_string_type(exc);
-	    if (!NIL_P(mesg)) {
+            mesg = rb_check_string_type(exc);
+            if (!NIL_P(mesg)) {
                 return rb_exc_new3(rb_eRuntimeError, mesg);
-	    }
-	}
+            }
+        }
 
       case 2:
       case 3:
-	break;
+        break;
       default:
         rb_error_arity(argc, 0, 3);
     }
     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)) {
@@ -842,7 +859,7 @@ void
 rb_jump_tag(int tag)
 {
     if (UNLIKELY(tag < TAG_RETURN || tag > TAG_FATAL)) {
-	unknown_longjmp_status(tag);
+        unknown_longjmp_status(tag);
     }
     EC_JUMP_TAG(GET_EC(), tag);
 }
@@ -851,10 +868,10 @@ int
 rb_block_given_p(void)
 {
     if (rb_vm_frame_block_handler(GET_EC()->cfp) == VM_BLOCK_HANDLER_NONE) {
-	return FALSE;
+        return FALSE;
     }
     else {
-	return TRUE;
+        return TRUE;
     }
 }
 
@@ -872,7 +889,7 @@ void
 rb_need_block(void)
 {
     if (!rb_block_given_p()) {
-	rb_vm_localjump_error("no block given", Qnil, 0);
+        rb_vm_localjump_error("no block given", Qnil, 0);
     }
 }
 
@@ -901,48 +918,48 @@ rb_vrescue2(VALUE (* b_proc) (VALUE), VALUE data1,
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
       retry_entry:
-	result = (*b_proc) (data1);
+        result = (*b_proc) (data1);
     }
     else if (result) {
-	/* escape from r_proc */
-	if (state == TAG_RETRY) {
-	    state = TAG_NONE;
-	    ec->errinfo = Qnil;
-	    result = Qfalse;
-	    goto retry_entry;
-	}
+        /* escape from r_proc */
+        if (state == TAG_RETRY) {
+            state = TAG_NONE;
+            ec->errinfo = Qnil;
+            result = Qfalse;
+            goto retry_entry;
+        }
     }
     else {
-	rb_vm_rewind_cfp(ec, cfp);
-
-	if (state == TAG_RAISE) {
-	    int handle = FALSE;
-	    VALUE eclass;
-	    va_list ap;
-
-	    result = Qnil;
-	    /* reuses args when raised again after retrying in r_proc */
-	    va_copy(ap, args);
-	    while ((eclass = va_arg(ap, VALUE)) != 0) {
-		if (rb_obj_is_kind_of(ec->errinfo, eclass)) {
-		    handle = TRUE;
-		    break;
-		}
-	    }
-	    va_end(ap);
-
-	    if (handle) {
-		state = TAG_NONE;
-		if (r_proc) {
-		    result = (*r_proc) (data2, ec->errinfo);
-		}
-		ec->errinfo = e_info;
-	    }
-	}
+        rb_vm_rewind_cfp(ec, cfp);
+
+        if (state == TAG_RAISE) {
+            int handle = FALSE;
+            VALUE eclass;
+            va_list ap;
+
+            result = Qnil;
+            /* reuses args when raised again after retrying in r_proc */
+            va_copy(ap, args);
+            while ((eclass = va_arg(ap, VALUE)) != 0) {
+                if (rb_obj_is_kind_of(ec->errinfo, eclass)) {
+                    handle = TRUE;
+                    break;
+                }
+            }
+            va_end(ap);
+
+            if (handle) {
+                state = TAG_NONE;
+                if (r_proc) {
+                    result = (*r_proc) (data2, ec->errinfo);
+                }
+                ec->errinfo = e_info;
+            }
+        }
     }
     EC_POP_TAG();
     if (state)
-	EC_JUMP_TAG(ec, state);
+        EC_JUMP_TAG(ec, state);
 
     return result;
 }
@@ -952,7 +969,7 @@ rb_rescue(VALUE (* b_proc)(VALUE), VALUE data1,
           VALUE (* r_proc)(VALUE, VALUE), VALUE data2)
 {
     return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError,
-		      (VALUE)0);
+                      (VALUE)0);
 }
 
 VALUE
@@ -965,10 +982,10 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int *pstate)
 
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-	SAVE_ROOT_JMPBUF(rb_ec_thread_ptr(ec), result = (*proc) (data));
+        SAVE_ROOT_JMPBUF(rb_ec_thread_ptr(ec), result = (*proc) (data));
     }
     else {
-	rb_vm_rewind_cfp(ec, cfp);
+        rb_vm_rewind_cfp(ec, cfp);
     }
     EC_POP_TAG();
 
@@ -991,18 +1008,18 @@ rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE dat
     ec->ensure_list = &ensure_list;
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
-	result = (*b_proc) (data1);
+        result = (*b_proc) (data1);
     }
     EC_POP_TAG();
     errinfo = ec->errinfo;
     if (!NIL_P(errinfo) && !RB_TYPE_P(errinfo, T_OBJECT)) {
-	ec->errinfo = Qnil;
+        ec->errinfo = Qnil;
     }
     ec->ensure_list=ensure_list.next;
     (*ensure_list.entry.e_proc)(ensure_list.entry.data2);
     ec->errinfo = errinfo;
     if (state)
-	EC_JUMP_TAG(ec, state);
+        EC_JUMP_TAG(ec, state);
     return result;
 }
 
@@ -1012,10 +1029,10 @@ frame_func_id(const rb_control_frame_t *cfp)
     const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
 
     if (me) {
-	return me->def->original_id;
+        return me->def->original_id;
     }
     else {
-	return 0;
+        return 0;
     }
 }
 
@@ -1025,10 +1042,10 @@ frame_called_id(rb_control_frame_t *cfp)
     const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
 
     if (me) {
-	return me->called_id;
+        return me->called_id;
     }
     else {
-	return 0;
+        return 0;
     }
 }
 
@@ -1085,8 +1102,8 @@ rb_frame_last_func(void)
     ID mid;
 
     while (!(mid = frame_func_id(cfp)) &&
-	   (cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp),
-	    !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(ec, cfp)));
+           (cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp),
+            !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(ec, cfp)));
     return mid;
 }
 
@@ -1106,7 +1123,7 @@ static VALUE
 rb_mod_append_features(VALUE module, VALUE include)
 {
     if (!CLASS_OR_MODULE_P(include)) {
-	Check_Type(include, T_CLASS);
+        Check_Type(include, T_CLASS);
     }
     rb_include_module(include, module);
 
@@ -1135,14 +1152,14 @@ rb_mod_include(int argc, VALUE *argv, VALUE module)
 
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++) {
-	Check_Type(argv[i], T_MODULE);
+        Check_Type(argv[i], T_MODULE);
         if (FL_TEST(argv[i], RMODULE_IS_REFINEMENT)) {
             rb_raise(rb_eTypeError, "Cannot include refinement");
         }
     }
     while (argc--) {
-	rb_funcall(argv[argc], id_append_features, 1, module);
-	rb_funcall(argv[argc], id_included, 1, module);
+        rb_funcall(argv[argc], id_append_features, 1, module);
+        rb_funcall(argv[argc], id_included, 1, module);
     }
     return module;
 }
@@ -1163,7 +1180,7 @@ static VALUE
 rb_mod_prepend_features(VALUE module, VALUE prepend)
 {
     if (!CLASS_OR_MODULE_P(prepend)) {
-	Check_Type(prepend, T_CLASS);
+        Check_Type(prepend, T_CLASS);
     }
     rb_prepend_module(prepend, module);
 
@@ -1192,14 +1209,14 @@ rb_mod_prepend(int argc, VALUE *argv, VALUE module)
 
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++) {
-	Check_Type(argv[i], T_MODULE);
+        Check_Type(argv[i], T_MODULE);
         if (FL_TEST(argv[i], RMODULE_IS_REFINEMENT)) {
             rb_raise(rb_eTypeError, "Cannot prepend refinement");
         }
     }
     while (argc--) {
-	rb_funcall(argv[argc], id_prepend_features, 1, module);
-	rb_funcall(argv[argc], id_prepended, 1, module);
+        rb_funcall(argv[argc], id_prepend_features, 1, module);
+        rb_funcall(argv[argc], id_prepended, 1, module);
     }
     return module;
 }
@@ -1208,9 +1225,9 @@ static void
 ensure_class_or_module(VALUE obj)
 {
     if (!RB_TYPE_P(obj, T_CLASS) && !RB_TYPE_P(obj, T_MODULE)) {
-	rb_raise(rb_eTypeError,
-		 "wrong argument type %"PRIsVALUE" (expected Class or Module)",
-		 rb_obj_class(obj));
+        rb_raise(rb_eTypeError,
+                 "wrong argument type %"PRIsVALUE" (expected Class or Module)",
+                 rb_obj_class(obj));
     }
 }
 
@@ -1227,11 +1244,11 @@ static VALUE
 refinement_superclass(VALUE superclass)
 {
     if (RB_TYPE_P(superclass, T_MODULE)) {
-	/* FIXME: Should ancestors of superclass be used here? */
+        /* FIXME: Should ancestors of superclass be used here? */
         return rb_include_class_new(RCLASS_ORIGIN(superclass), rb_cBasicObject);
     }
     else {
-	return superclass;
+        return superclass;
     }
 }
 
@@ -1246,23 +1263,23 @@ rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
     ensure_class_or_module(klass);
     Check_Type(module, T_MODULE);
     if (NIL_P(CREF_REFINEMENTS(cref))) {
-	CREF_REFINEMENTS_SET(cref, hidden_identity_hash_new());
+        CREF_REFINEMENTS_SET(cref, hidden_identity_hash_new());
     }
     else {
-	if (CREF_OMOD_SHARED(cref)) {
-	    CREF_REFINEMENTS_SET(cref, rb_hash_dup(CREF_REFINEMENTS(cref)));
-	    CREF_OMOD_SHARED_UNSET(cref);
-	}
-	if (!NIL_P(c = rb_hash_lookup(CREF_REFINEMENTS(cref), klass))) {
-	    superclass = c;
-	    while (c && RB_TYPE_P(c, T_ICLASS)) {
-		if (RBASIC(c)->klass == module) {
-		    /* already used refinement */
-		    return;
-		}
-		c = RCLASS_SUPER(c);
-	    }
-	}
+        if (CREF_OMOD_SHARED(cref)) {
+            CREF_REFINEMENTS_SET(cref, rb_hash_dup(CREF_REFINEMENTS(cref)));
+            CREF_OMOD_SHARED_UNSET(cref);
+        }
+        if (!NIL_P(c = rb_hash_lookup(CREF_REFINEMENTS(cref), klass))) {
+            superclass = c;
+            while (c && RB_TYPE_P(c, T_ICLASS)) {
+                if (RBASIC(c)->klass == module) {
+                    /* already used refinement */
+                    return;
+                }
+                c = RCLASS_SUPER(c);
+            }
+        }
     }
     superclass = refinement_superclass(superclass);
     c = iclass = rb_include_class_new(module, superclass);
@@ -1272,7 +1289,7 @@ rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
 
     module = RCLASS_SUPER(module);
     while (module && module != klass) {
-	c = RCLASS_SET_SUPER(c, rb_include_class_new(module, RCLASS_SUPER(c)));
+        c = RCLASS_SET_SUPER(c, rb_include_class_new(module, RCLASS_SUPER(c)));
         RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
         module = RCLASS_SUPER(module);
     }
@@ -1296,21 +1313,21 @@ using_module_recursive(const rb_cref_t *cref, VALUE klass)
 
     super = RCLASS_SUPER(klass);
     if (super) {
-	using_module_recursive(cref, super);
+        using_module_recursive(cref, super);
     }
     switch (BUILTIN_TYPE(klass)) {
       case T_MODULE:
-	module = klass;
-	break;
+        module = klass;
+        break;
 
       case T_ICLASS:
-	module = RBASIC(klass)->klass;
-	break;
+        module = RBASIC(klass)->klass;
+        break;
 
       default:
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Module)",
-		 rb_obj_classname(klass));
-	break;
+        rb_raise(rb_eTypeError, "wrong argument type %s (expected Module)",
+                 rb_obj_classname(klass));
+        break;
     }
     CONST_ID(id_refinements, "__refinements__");
     refinements = rb_attr_get(module, id_refinements);
@@ -1346,28 +1363,28 @@ rb_refinement_module_get_refined_class(VALUE module)
 
 static void
 add_activated_refinement(VALUE activated_refinements,
-			 VALUE klass, VALUE refinement)
+                         VALUE klass, VALUE refinement)
 {
     VALUE iclass, c, superclass = klass;
 
     if (!NIL_P(c = rb_hash_lookup(activated_refinements, klass))) {
-	superclass = c;
-	while (c && RB_TYPE_P(c, T_ICLASS)) {
-	    if (RBASIC(c)->klass == refinement) {
-		/* already used refinement */
-		return;
-	    }
-	    c = RCLASS_SUPER(c);
-	}
+        superclass = c;
+        while (c && RB_TYPE_P(c, T_ICLASS)) {
+            if (RBASIC(c)->klass == refinement) {
+                /* already used refinement */
+                return;
+            }
+            c = RCLASS_SUPER(c);
+        }
     }
     superclass = refinement_superclass(superclass);
     c = iclass = rb_include_class_new(refinement, superclass);
     RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
     refinement = RCLASS_SUPER(refinement);
     while (refinement && refinement != klass) {
-	c = RCLASS_SET_SUPER(c, rb_include_class_new(refinement, RCLASS_SUPER(c)));
+        c = RCLASS_SET_SUPER(c, rb_include_class_new(refinement, RCLASS_SUPER(c)));
         RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
-	refinement = RCLASS_SUPER(refinement);
+        refinement = RCLASS_SUPER(refinement);
     }
     rb_hash_aset(activated_refinements, klass, iclass);
 }
@@ -1392,39 +1409,39 @@ rb_mod_refine(VALUE module, VALUE klass)
     VALUE block_handler = rb_vm_frame_block_handler(th->ec->cfp);
 
     if (block_handler == VM_BLOCK_HANDLER_NONE) {
-	rb_raise(rb_eArgError, "no block given");
+        rb_raise(rb_eArgError, "no block given");
     }
     if (vm_block_handler_type(block_handler) != block_handler_type_iseq) {
-	rb_raise(rb_eArgError, "can't pass a Proc as a block to Module#refine");
+        rb_raise(rb_eArgError, "can't pass a Proc as a block to Module#refine");
     }
 
     ensure_class_or_module(klass);
     CONST_ID(id_refinements, "__refinements__");
     refinements = rb_attr_get(module, id_refinements);
     if (NIL_P(refinements)) {
-	refinements = hidden_identity_hash_new();
-	rb_ivar_set(module, id_refinements, refinements);
+        refinements = hidden_identity_hash_new();
+        rb_ivar_set(module, id_refinements, refinements);
     }
     CONST_ID(id_activated_refinements, "__activated_refinements__");
     activated_refinements = rb_attr_get(module, id_activated_refinements);
     if (NIL_P(activated_refinements)) {
-	activated_refinements = hidden_identity_hash_new();
-	rb_ivar_set(module, id_activated_refinements,
-		    activated_refinements);
+        activated_refinements = hidden_identity_hash_new();
+        rb_ivar_set(module, id_activated_refinements,
+                    activated_refinements);
     }
     refinement = rb_hash_lookup(refinements, klass);
     if (NIL_P(refinement)) {
-	VALUE superclass = refinement_superclass(klass);
-	refinement = rb_refinement_new();
-	RCLASS_SET_SUPER(refinement, superclass);
+        VALUE superclass = refinement_superclass(klass);
+        refinement = rb_refinement_new();
+        RCLASS_SET_SUPER(refinement, superclass);
         RUBY_ASSERT(BUILTIN_TYPE(refinement) == T_MODULE);
-	FL_SET(refinement, RMODULE_IS_REFINEMENT);
-	CONST_ID(id_refined_class, "__refined_class__");
-	rb_ivar_set(refinement, id_refined_class, klass);
-	CONST_ID(id_defined_at, "__defined_at__");
-	rb_ivar_set(refinement, id_defined_at, module);
-	rb_hash_aset(refinements, klass, refinement);
-	add_activated_refinement(activated_refinements, klass, refinement);
+        FL_SET(refinement, RMODULE_IS_REFINEMENT);
+        CONST_ID(id_refined_class, "__refined_class__");
+        rb_ivar_set(refinement, id_refined_class, klass);
+        CONST_ID(id_defined_at, "__defined_at__");
+        rb_ivar_set(refinement, id_defined_at, module);
+        rb_hash_aset(refinements, klass, refinement);
+        add_activated_refinement(activated_refinements, klass, refinement);
     }
     rb_yield_refine_block(refinement, activated_refinements);
     return refinement;
@@ -1436,7 +1453,7 @@ ignored_block(VALUE module, const char *klass)
     const char *anon = "";
     Check_Type(module, T_MODULE);
     if (!RTEST(rb_search_class_path(module))) {
-	anon = ", maybe for Module.new";
+        anon = ", maybe for Module.new";
     }
     rb_warn("%s""using doesn't call the given block""%s.", klass, anon);
 }
@@ -1455,14 +1472,14 @@ mod_using(VALUE self, VALUE module)
     rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
 
     if (prev_frame_func()) {
-	rb_raise(rb_eRuntimeError,
-		 "Module#using is not permitted in methods");
+        rb_raise(rb_eRuntimeError,
+                 "Module#using is not permitted in methods");
     }
     if (prev_cfp && prev_cfp->self != self) {
-	rb_raise(rb_eRuntimeError, "Module#using is not called on self");
+        rb_raise(rb_eRuntimeError, "Module#using is not called on self");
     }
     if (rb_block_given_p()) {
-	ignored_block(module, "Module#");
+        ignored_block(module, "Module#");
     }
     rb_using_module(rb_vm_cref_replace_with_duplicated_cref(), module);
     return self;
@@ -1509,8 +1526,8 @@ used_modules_i(VALUE _, VALUE mod, VALUE ary)
     ID id_defined_at;
     CONST_ID(id_defined_at, "__defined_at__");
     while (BUILTIN_TYPE(rb_class_of(mod)) == T_MODULE && FL_TEST(rb_class_of(mod), RMODULE_IS_REFINEMENT)) {
-	rb_ary_push(ary, rb_attr_get(rb_class_of(mod), id_defined_at));
-	mod = RCLASS_SUPER(mod);
+        rb_ary_push(ary, rb_attr_get(rb_class_of(mod), id_defined_at));
+        mod = RCLASS_SUPER(mod);
     }
     return ST_CONTINUE;
 }
@@ -1547,10 +1564,10 @@ rb_mod_s_used_modules(VALUE _)
     VALUE ary = rb_ary_new();
 
     while (cref) {
-	if (!NIL_P(CREF_REFINEMENTS(cref))) {
-	    rb_hash_foreach(CREF_REFINEMENTS(cref), used_modules_i, ary);
-	}
-	cref = CREF_NEXT(cref);
+        if (!NIL_P(CREF_REFINEMENTS(cref))) {
+            rb_hash_foreach(CREF_REFINEMENTS(cref), used_modules_i, ary);
+        }
+        cref = CREF_NEXT(cref);
     }
 
     return rb_funcall(ary, rb_intern("uniq"), 0);
@@ -1561,7 +1578,7 @@ used_refinements_i(VALUE _, VALUE mod, VALUE ary)
 {
     while (BUILTIN_TYPE(rb_class_of(mod)) == T_MODULE && FL_TEST(rb_class_of(mod), RMODULE_IS_REFINEMENT)) {
         rb_ary_push(ary, rb_class_of(mod));
-	mod = RCLASS_SUPER(mod);
+        mod = RCLASS_SUPER(mod);
     }
     return ST_CONTINUE;
 }
@@ -1598,10 +1615,10 @@ rb_mod_s_used_refinements(VALUE _)
     VALUE ary = rb_ary_new();
 
     while (cref) {
-	if (!NIL_P(CREF_REFINEMENTS(cref))) {
-	    rb_hash_foreach(CREF_REFINEMENTS(cref), used_refinements_i, ary);
-	}
-	cref = CREF_NEXT(cref);
+        if (!NIL_P(CREF_REFINEMENTS(cref))) {
+            rb_hash_foreach(CREF_REFINEMENTS(cref), used_refinements_i, ary);
+        }
+        cref = CREF_NEXT(cref);
     }
 
     return ary;
@@ -1748,18 +1765,28 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
 
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++) {
-	Check_Type(argv[i], T_MODULE);
+        Check_Type(argv[i], T_MODULE);
         if (FL_TEST(argv[i], RMODULE_IS_REFINEMENT)) {
             rb_raise(rb_eTypeError, "Cannot extend object with refinement");
         }
     }
     while (argc--) {
-	rb_funcall(argv[argc], id_extend_object, 1, obj);
-	rb_funcall(argv[argc], id_extended, 1, obj);
+        rb_funcall(argv[argc], id_extend_object, 1, obj);
+        rb_funcall(argv[argc], id_extended, 1, 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"));
 }
 
 /*
@@ -1792,14 +1813,16 @@ top_include(int argc, VALUE *argv, VALUE self)
 static VALUE
 top_using(VALUE self, VALUE module)
 {
-    const rb_cref_t *cref = rb_vm_cref();
+    const rb_cref_t *cref = CREF_NEXT(rb_vm_cref());;
     rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
+    rb_thread_t *th = GET_THREAD();
 
-    if (CREF_NEXT(cref) || (prev_cfp && rb_vm_frame_method_entry(prev_cfp))) {
-	rb_raise(rb_eRuntimeError, "main.using is permitted only at toplevel");
+    if ((th->top_wrapper ? CREF_NEXT(cref) : cref) ||
+        (prev_cfp && rb_vm_frame_method_entry(prev_cfp))) {
+        rb_raise(rb_eRuntimeError, "main.using is permitted only at toplevel");
     }
     if (rb_block_given_p()) {
-	ignored_block(module, "main.");
+        ignored_block(module, "main.");
     }
     rb_using_module(rb_vm_cref_replace_with_duplicated_cref(), module);
     return self;
@@ -1812,17 +1835,17 @@ errinfo_place(const rb_execution_context_t *ec)
     const rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(ec);
 
     while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
-	if (VM_FRAME_RUBYFRAME_P(cfp)) {
+        if (VM_FRAME_RUBYFRAME_P(cfp)) {
             if (ISEQ_BODY(cfp->iseq)->type == ISEQ_TYPE_RESCUE) {
-		return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
-	    }
+                return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
+            }
             else if (ISEQ_BODY(cfp->iseq)->type == ISEQ_TYPE_ENSURE &&
-		     !THROW_DATA_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR]) &&
-		     !FIXNUM_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR])) {
-		return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
-	    }
-	}
-	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+                     !THROW_DATA_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR]) &&
+                     !FIXNUM_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR])) {
+                return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
+            }
+        }
+        cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
     return 0;
 }
@@ -1832,10 +1855,10 @@ rb_ec_get_errinfo(const rb_execution_context_t *ec)
 {
     const VALUE *ptr = errinfo_place(ec);
     if (ptr) {
-	return *ptr;
+        return *ptr;
     }
     else {
-	return ec->errinfo;
+        return ec->errinfo;
     }
 }
 
@@ -1861,7 +1884,7 @@ void
 rb_set_errinfo(VALUE err)
 {
     if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) {
-	rb_raise(rb_eTypeError, "assigning non-exception to $!");
+        rb_raise(rb_eTypeError, "assigning non-exception to $!");
     }
     GET_EC()->errinfo = err;
 }
@@ -1871,10 +1894,10 @@ errat_getter(ID id, VALUE *_)
 {
     VALUE err = get_errinfo();
     if (!NIL_P(err)) {
-	return rb_get_backtrace(err);
+        return rb_get_backtrace(err);
     }
     else {
-	return Qnil;
+        return Qnil;
     }
 }
 
@@ -1883,7 +1906,7 @@ errat_setter(VALUE val, ID id, VALUE *var)
 {
     VALUE err = get_errinfo();
     if (NIL_P(err)) {
-	rb_raise(rb_eArgError, "$! not set");
+        rb_raise(rb_eArgError, "$! not set");
     }
     set_backtrace(err, val);
 }
@@ -1904,10 +1927,10 @@ rb_f_method_name(VALUE _)
     ID fname = prev_frame_func(); /* need *method* ID */
 
     if (fname) {
-	return ID2SYM(fname);
+        return ID2SYM(fname);
     }
     else {
-	return Qnil;
+        return Qnil;
     }
 }
 
@@ -1926,10 +1949,10 @@ rb_f_callee_name(VALUE _)
     ID fname = prev_frame_callee(); /* need *callee* ID */
 
     if (fname) {
-	return ID2SYM(fname);
+        return ID2SYM(fname);
     }
     else {
-	return Qnil;
+        return Qnil;
     }
 }
 
@@ -1948,7 +1971,7 @@ f_current_dirname(VALUE _)
 {
     VALUE base = rb_current_realfilepath();
     if (NIL_P(base)) {
-	return Qnil;
+        return Qnil;
     }
     base = rb_file_dirname(base);
     return base;
@@ -2045,7 +2068,7 @@ Init_eval(void)
     rb_define_private_method(rb_cModule, "using", mod_using, 1);
     rb_define_method(rb_cModule, "refinements", mod_refinements, 0);
     rb_define_singleton_method(rb_cModule, "used_modules",
-			       rb_mod_s_used_modules, 0);
+                               rb_mod_s_used_modules, 0);
     rb_define_singleton_method(rb_cModule, "used_refinements",
                                rb_mod_s_used_refinements, 0);
     rb_undef_method(rb_cClass, "refine");
@@ -2064,9 +2087,9 @@ Init_eval(void)
     rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1);
 
     rb_define_private_method(rb_singleton_class(rb_vm_top_self()),
-			     "include", top_include, -1);
+                             "include", top_include, -1);
     rb_define_private_method(rb_singleton_class(rb_vm_top_self()),
-			     "using", top_using, 1);
+                             "using", top_using, 1);
 
     rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
 
diff --git a/eval_error.c b/eval_error.c
index abbb708bd5..9806683000 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -10,8 +10,8 @@
 #ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P
 #define warn_print(x) RB_GNUC_EXTENSION_BLOCK(	\
     (__builtin_constant_p(x)) ? 		\
-	rb_write_error2((x), (long)strlen(x)) : \
-	rb_write_error(x)			\
+        rb_write_error2((x), (long)strlen(x)) : \
+        rb_write_error(x)			\
 )
 #else
 #define warn_print(x) rb_write_error(x)
@@ -29,7 +29,7 @@ error_pos(const VALUE str)
 {
     VALUE pos = error_pos_str();
     if (!NIL_P(pos)) {
-	write_warn_str(str, pos);
+        write_warn_str(str, pos);
     }
 }
 
@@ -40,18 +40,18 @@ error_pos_str(void)
     VALUE sourcefile = rb_source_location(&sourceline);
 
     if (!NIL_P(sourcefile)) {
-	ID caller_name;
-	if (sourceline == 0) {
-	    return rb_sprintf("%"PRIsVALUE": ", sourcefile);
-	}
-	else if ((caller_name = rb_frame_callee()) != 0) {
-	    return rb_sprintf("%"PRIsVALUE":%d:in `%"PRIsVALUE"': ",
-			      sourcefile, sourceline,
-			      rb_id2str(caller_name));
-	}
-	else {
-	    return rb_sprintf("%"PRIsVALUE":%d: ", sourcefile, sourceline);
-	}
+        ID caller_name;
+        if (sourceline == 0) {
+            return rb_sprintf("%"PRIsVALUE": ", sourcefile);
+        }
+        else if ((caller_name = rb_frame_callee()) != 0) {
+            return rb_sprintf("%"PRIsVALUE":%d:in `%"PRIsVALUE"': ",
+                              sourcefile, sourceline,
+                              rb_id2str(caller_name));
+        }
+        else {
+            return rb_sprintf("%"PRIsVALUE":%d: ", sourcefile, sourceline);
+        }
     }
     return Qnil;
 }
@@ -62,23 +62,17 @@ set_backtrace(VALUE info, VALUE bt)
     ID set_backtrace = rb_intern("set_backtrace");
 
     if (rb_backtrace_p(bt)) {
-	if (rb_method_basic_definition_p(CLASS_OF(info), set_backtrace)) {
-	    rb_exc_set_backtrace(info, bt);
-	    return;
-	}
-	else {
-	    bt = rb_backtrace_to_str_ary(bt);
-	}
+        if (rb_method_basic_definition_p(CLASS_OF(info), set_backtrace)) {
+            rb_exc_set_backtrace(info, bt);
+            return;
+        }
+        else {
+            bt = rb_backtrace_to_str_ary(bt);
+        }
     }
     rb_check_funcall(info, set_backtrace, 1, &bt);
 }
 
-static void
-error_print(rb_execution_context_t *ec)
-{
-    rb_ec_error_print(ec, ec->errinfo);
-}
-
 #define CSI_BEGIN "\033["
 #define CSI_SGR "m"
 
@@ -106,24 +100,24 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VA
     }
 
     if (eclass == rb_eRuntimeError && elen == 0) {
-	if (highlight) write_warn(str, underline);
-	write_warn(str, "unhandled exception");
-	if (highlight) write_warn(str, reset);
-	write_warn2(str, "\n", 1);
+        if (highlight) write_warn(str, underline);
+        write_warn(str, "unhandled exception");
+        if (highlight) write_warn(str, reset);
+        write_warn2(str, "\n", 1);
     }
     else {
-	VALUE epath;
-
-	epath = rb_class_name(eclass);
-	if (elen == 0) {
-	    if (highlight) write_warn(str, underline);
-	    write_warn_str(str, epath);
-	    if (highlight) write_warn(str, reset);
-	    write_warn(str, "\n");
-	}
-	else {
-	    write_warn_str(str, emesg);
-	    write_warn(str, "\n");
+        VALUE epath;
+
+        epath = rb_class_name(eclass);
+        if (elen == 0) {
+            if (highlight) write_warn(str, underline);
+            write_warn_str(str, epath);
+            if (highlight) write_warn(str, reset);
+            write_warn(str, "\n");
+        }
+        else {
+            write_warn_str(str, emesg);
+            write_warn(str, "\n");
         }
     }
 }
@@ -141,73 +135,73 @@ rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight)
         elen = RSTRING_LEN(emesg);
     }
     if (eclass == rb_eRuntimeError && elen == 0) {
-	if (highlight) write_warn(str, underline);
-	write_warn(str, "unhandled exception");
-	if (highlight) write_warn(str, reset);
+        if (highlight) write_warn(str, underline);
+        write_warn(str, "unhandled exception");
+        if (highlight) write_warn(str, reset);
     }
     else {
-	VALUE epath;
-
-	epath = rb_class_name(eclass);
-	if (elen == 0) {
-	    if (highlight) write_warn(str, underline);
-	    write_warn_str(str, epath);
-	    if (highlight) write_warn(str, reset);
-	}
-	else {
+        VALUE epath;
+
+        epath = rb_class_name(eclass);
+        if (elen == 0) {
+            if (highlight) write_warn(str, underline);
+            write_warn_str(str, epath);
+            if (highlight) write_warn(str, reset);
+        }
+        else {
             /* emesg is a String instance */
-	    const char *tail = 0;
+            const char *tail = 0;
 
             if (highlight) write_warn(str, bold);
-	    if (RSTRING_PTR(epath)[0] == '#')
-		epath = 0;
-	    if ((tail = memchr(einfo, '\n', elen)) != 0) {
+            if (RSTRING_PTR(epath)[0] == '#')
+                epath = 0;
+            if ((tail = memchr(einfo, '\n', elen)) != 0) {
                 write_warn2(str, einfo, tail - einfo);
-		tail++;		/* skip newline */
-	    }
-	    else {
+                tail++;		/* skip newline */
+            }
+            else {
                 write_warn_str(str, emesg);
-	    }
-	    if (epath) {
-		write_warn(str, " (");
-		if (highlight) write_warn(str, underline);
+            }
+            if (epath) {
+                write_warn(str, " (");
+                if (highlight) write_warn(str, underline);
                 write_warn_str(str, epath);
-		if (highlight) {
-		    write_warn(str, reset);
-		    write_warn(str, bold);
-		}
-		write_warn2(str, ")", 1);
-		if (highlight) write_warn(str, reset);
-	    }
-	    if (tail && einfo+elen > tail) {
-		if (!highlight) {
+                if (highlight) {
+                    write_warn(str, reset);
+                    write_warn(str, bold);
+                }
+                write_warn2(str, ")", 1);
+                if (highlight) write_warn(str, reset);
+            }
+            if (tail && einfo+elen > tail) {
+                if (!highlight) {
                     write_warn2(str, "\n", 1);
                     write_warn2(str, tail, einfo+elen-tail);
-		}
-		else {
-		    elen -= tail - einfo;
-		    einfo = tail;
+                }
+                else {
+                    elen -= tail - einfo;
+                    einfo = tail;
                     write_warn2(str, "\n", 1);
-		    while (elen > 0) {
-			tail = memchr(einfo, '\n', elen);
-			if (!tail || tail > einfo) {
-			    write_warn(str, bold);
+                    while (elen > 0) {
+                        tail = memchr(einfo, '\n', elen);
+                        if (!tail || tail > einfo) {
+                            write_warn(str, bold);
                             write_warn2(str, einfo, tail ? tail-einfo : elen);
-			    write_warn(str, reset);
-			    if (!tail) {
-				break;
-			    }
-			}
-			elen -= tail - einfo;
-			einfo = tail;
-			do ++tail; while (tail < einfo+elen && *tail == '\n');
+                            write_warn(str, reset);
+                            if (!tail) {
+                                break;
+                            }
+                        }
+                        elen -= tail - einfo;
+                        einfo = tail;
+                        do ++tail; while (tail < einfo+elen && *tail == '\n');
                         write_warn2(str, einfo, tail-einfo);
-			elen -= tail - einfo;
-			einfo = tail;
-		    }
-		}
-	    }
-	}
+                        elen -= tail - einfo;
+                        einfo = tail;
+                    }
+                }
+            }
+        }
     }
 
     return str;
@@ -217,13 +211,13 @@ static void
 print_backtrace(const VALUE eclass, const VALUE errat, const VALUE str, int reverse, long backtrace_limit)
 {
     if (!NIL_P(errat)) {
-	long i;
-	long len = RARRAY_LEN(errat);
-	const int threshold = 1000000000;
+        long i;
+        long len = RARRAY_LEN(errat);
+        const int threshold = 1000000000;
         int width = (len <= 1) ? INT_MIN : ((int)log10((double)(len > threshold ?
-					 ((len - 1) / threshold) :
-					 len - 1)) +
-		     (len < threshold ? 0 : 9) + 1);
+                                         ((len - 1) / threshold) :
+                                         len - 1)) +
+                     (len < threshold ? 0 : 9) + 1);
 
         long skip_start = -1, skip_len = 0;
 
@@ -244,19 +238,19 @@ print_backtrace(const VALUE eclass, const VALUE errat, const VALUE str, int reve
             skip_len = len - skip_start;
         }
 
-	for (i = 1; i < len; i++) {
-	    if (i == skip_start) {
-		write_warn_str(str, rb_sprintf("\t ... %ld levels...\n", skip_len));
-		i += skip_len;
+        for (i = 1; i < len; i++) {
+            if (i == skip_start) {
+                write_warn_str(str, rb_sprintf("\t ... %ld levels...\n", skip_len));
+                i += skip_len;
                 if (i >= len) break;
-	    }
-	    VALUE line = RARRAY_AREF(errat, reverse ? len - i : i);
-	    if (RB_TYPE_P(line, T_STRING)) {
-		VALUE bt = rb_str_new_cstr("\t");
-		if (reverse) rb_str_catf(bt, "%*ld: ", width, len - i);
-		write_warn_str(str, rb_str_catf(bt, "from %"PRIsVALUE"\n", line));
-	    }
-	}
+            }
+            VALUE line = RARRAY_AREF(errat, reverse ? len - i : i);
+            if (RB_TYPE_P(line, T_STRING)) {
+                VALUE bt = rb_str_new_cstr("\t");
+                if (reverse) rb_str_catf(bt, "%*ld: ", width, len - i);
+                write_warn_str(str, rb_str_catf(bt, "from %"PRIsVALUE"\n", line));
+            }
+        }
     }
 }
 
@@ -297,6 +291,17 @@ show_cause(VALUE errinfo, VALUE str, VALUE opt, VALUE highlight, VALUE reverse,
 }
 
 void
+rb_exc_check_circular_cause(VALUE exc)
+{
+    VALUE cause = exc, shown_causes = 0;
+    do {
+        if (shown_cause_p(cause, &shown_causes)) {
+            rb_raise(rb_eArgError, "circular causes");
+        }
+    } while (!NIL_P(cause = rb_attr_get(cause, id_cause)));
+}
+
+void
 rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE opt, VALUE highlight, VALUE reverse)
 {
     volatile VALUE eclass;
@@ -304,68 +309,68 @@ rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE opt, VA
     long backtrace_limit = rb_backtrace_length_limit;
 
     if (NIL_P(errinfo))
-	return;
+        return;
 
-    if (errat == Qundef) {
-	errat = Qnil;
+    if (UNDEF_P(errat)) {
+        errat = Qnil;
     }
     eclass = CLASS_OF(errinfo);
     if (reverse) {
-	static const char traceback[] = "Traceback "
-	    "(most recent call last):\n";
-	const int bold_part = rb_strlen_lit("Traceback");
-	char buff[sizeof(traceback)+sizeof(bold)+sizeof(reset)-2], *p = buff;
-	const char *msg = traceback;
-	long len = sizeof(traceback) - 1;
-	if (RTEST(highlight)) {
+        static const char traceback[] = "Traceback "
+            "(most recent call last):\n";
+        const int bold_part = rb_strlen_lit("Traceback");
+        char buff[sizeof(traceback)+sizeof(bold)+sizeof(reset)-2], *p = buff;
+        const char *msg = traceback;
+        long len = sizeof(traceback) - 1;
+        if (RTEST(highlight)) {
 #define APPEND(s, l) (memcpy(p, s, l), p += (l))
-	    APPEND(bold, sizeof(bold)-1);
-	    APPEND(traceback, bold_part);
-	    APPEND(reset, sizeof(reset)-1);
-	    APPEND(traceback + bold_part, sizeof(traceback)-bold_part-1);
+            APPEND(bold, sizeof(bold)-1);
+            APPEND(traceback, bold_part);
+            APPEND(reset, sizeof(reset)-1);
+            APPEND(traceback + bold_part, sizeof(traceback)-bold_part-1);
 #undef APPEND
-	    len = p - (msg = buff);
-	}
-	write_warn2(str, msg, len);
+            len = p - (msg = buff);
+        }
+        write_warn2(str, msg, len);
         show_cause(errinfo, str, opt, highlight, reverse, backtrace_limit, &shown_causes);
-	print_backtrace(eclass, errat, str, TRUE, backtrace_limit);
-	print_errinfo(eclass, errat, emesg, str, RTEST(highlight));
+        print_backtrace(eclass, errat, str, TRUE, backtrace_limit);
+        print_errinfo(eclass, errat, emesg, str, RTEST(highlight));
     }
     else {
-	print_errinfo(eclass, errat, emesg, str, RTEST(highlight));
-	print_backtrace(eclass, errat, str, FALSE, backtrace_limit);
+        print_errinfo(eclass, errat, emesg, str, RTEST(highlight));
+        print_backtrace(eclass, errat, str, FALSE, backtrace_limit);
         show_cause(errinfo, str, opt, highlight, reverse, backtrace_limit, &shown_causes);
     }
 }
 
-void
-rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
+static void
+rb_ec_error_print_detailed(rb_execution_context_t *const ec, const VALUE errinfo, const VALUE str, VALUE emesg0)
 {
     volatile uint8_t raised_flag = ec->raised_flag;
     volatile VALUE errat = Qundef;
-    volatile VALUE emesg = Qundef;
     volatile bool written = false;
+    volatile VALUE emesg = emesg0;
 
     VALUE opt = rb_hash_new();
     VALUE highlight = rb_stderr_tty_p() ? Qtrue : Qfalse;
     rb_hash_aset(opt, ID2SYM(rb_intern_const("highlight")), highlight);
 
     if (NIL_P(errinfo))
-	return;
+        return;
     rb_ec_raised_clear(ec);
 
     EC_PUSH_TAG(ec);
     if (EC_EXEC_TAG() == TAG_NONE) {
-	errat = rb_get_backtrace(errinfo);
+        errat = rb_get_backtrace(errinfo);
     }
-    if (emesg == Qundef) {
-	emesg = Qnil;
-	emesg = rb_get_detailed_message(errinfo, opt);
+    if (UNDEF_P(emesg)) {
+        emesg = Qnil;
+        emesg = rb_get_detailed_message(errinfo, opt);
     }
 
     if (!written) {
         written = true;
-        rb_error_write(errinfo, emesg, errat, Qnil, opt, highlight, Qfalse);
+        rb_error_write(errinfo, emesg, errat, str, opt, highlight, Qfalse);
     }
 
     EC_POP_TAG();
@@ -373,11 +378,17 @@ rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
     rb_ec_raised_set(ec, raised_flag);
 }
 
+void
+rb_ec_error_print(rb_execution_context_t *volatile ec, volatile VALUE errinfo)
+{
+    rb_ec_error_print_detailed(ec, errinfo, Qnil, Qundef);
+}
+
 #define undef_mesg_for(v, k) rb_fstring_lit("undefined"v" method `%1$s' for "k" `%2$s'")
 #define undef_mesg(v) ( \
-	is_mod ? \
-	undef_mesg_for(v, "module") : \
-	undef_mesg_for(v, "class"))
+        is_mod ? \
+        undef_mesg_for(v, "module") : \
+        undef_mesg_for(v, "class"))
 
 void
 rb_print_undef(VALUE klass, ID id, rb_method_visibility_t visi)
@@ -403,9 +414,9 @@ rb_print_undef_str(VALUE klass, VALUE name)
 
 #define inaccessible_mesg_for(v, k) rb_fstring_lit("method `%1$s' for "k" `%2$s' is "v)
 #define inaccessible_mesg(v) ( \
-	is_mod ? \
-	inaccessible_mesg_for(v, "module") : \
-	inaccessible_mesg_for(v, "class"))
+        is_mod ? \
+        inaccessible_mesg_for(v, "module") : \
+        inaccessible_mesg_for(v, "class"))
 
 void
 rb_print_inaccessible(VALUE klass, ID id, rb_method_visibility_t visi)
@@ -429,70 +440,109 @@ sysexit_status(VALUE err)
     return NUM2INT(st);
 }
 
+enum {
+    EXITING_WITH_MESSAGE = 1,
+    EXITING_WITH_STATUS = 2,
+    EXITING_WITH_SIGNAL = 4
+};
+static int
+exiting_split(VALUE errinfo, volatile int *exitcode, volatile int *sigstatus)
+{
+    int ex = EXIT_SUCCESS;
+    VALUE signo;
+    int sig = 0;
+    int result = 0;
+
+    if (NIL_P(errinfo)) return 0;
+
+    if (THROW_DATA_P(errinfo)) {
+        int throw_state = ((const struct vm_throw_data *)errinfo)->throw_state;
+        ex = throw_state & VM_THROW_STATE_MASK;
+        result |= EXITING_WITH_STATUS;
+    }
+    else if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
+        ex = sysexit_status(errinfo);
+        result |= EXITING_WITH_STATUS;
+    }
+    else if (rb_obj_is_kind_of(errinfo, rb_eSignal)) {
+        signo = rb_ivar_get(errinfo, id_signo);
+        sig = FIX2INT(signo);
+        result |= EXITING_WITH_SIGNAL;
+        /* no message when exiting by signal */
+        if (signo == INT2FIX(SIGSEGV) || !rb_obj_is_instance_of(errinfo, rb_eSignal))
+            /* except for SEGV and subclasses */
+            result |= EXITING_WITH_MESSAGE;
+    }
+    else if (rb_obj_is_kind_of(errinfo, rb_eSystemCallError) &&
+        FIXNUM_P(signo = rb_attr_get(errinfo, id_signo))) {
+        sig = FIX2INT(signo);
+        result |= EXITING_WITH_SIGNAL;
+        /* no message when exiting by error to be mapped to signal */
+    }
+    else {
+        ex = EXIT_FAILURE;
+        result |= EXITING_WITH_STATUS | EXITING_WITH_MESSAGE;
+    }
+
+    if (exitcode && (result & EXITING_WITH_STATUS))
+        *exitcode = ex;
+    if (sigstatus && (result & EXITING_WITH_SIGNAL))
+        *sigstatus = sig;
+
+    return result;
+}
+
 #define unknown_longjmp_status(status) \
     rb_bug("Unknown longjmp status %d", status)
 
 static int
-error_handle(rb_execution_context_t *ec, int ex)
+error_handle(rb_execution_context_t *ec, VALUE errinfo, enum ruby_tag_type ex)
 {
     int status = EXIT_FAILURE;
 
     if (rb_ec_set_raised(ec))
-	return EXIT_FAILURE;
+        return EXIT_FAILURE;
     switch (ex & TAG_MASK) {
       case 0:
-	status = EXIT_SUCCESS;
-	break;
+        status = EXIT_SUCCESS;
+        break;
 
       case TAG_RETURN:
-	error_pos(Qnil);
-	warn_print("unexpected return\n");
-	break;
+        error_pos(Qnil);
+        warn_print("unexpected return\n");
+        break;
       case TAG_NEXT:
-	error_pos(Qnil);
-	warn_print("unexpected next\n");
-	break;
+        error_pos(Qnil);
+        warn_print("unexpected next\n");
+        break;
       case TAG_BREAK:
-	error_pos(Qnil);
-	warn_print("unexpected break\n");
-	break;
+        error_pos(Qnil);
+        warn_print("unexpected break\n");
+        break;
       case TAG_REDO:
-	error_pos(Qnil);
-	warn_print("unexpected redo\n");
-	break;
+        error_pos(Qnil);
+        warn_print("unexpected redo\n");
+        break;
       case TAG_RETRY:
-	error_pos(Qnil);
-	warn_print("retry outside of rescue clause\n");
-	break;
+        error_pos(Qnil);
+        warn_print("retry outside of rescue clause\n");
+        break;
       case TAG_THROW:
-	/* TODO: fix me */
-	error_pos(Qnil);
-	warn_print("unexpected throw\n");
-	break;
-      case TAG_RAISE: {
-	VALUE errinfo = ec->errinfo;
-	if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
-	    status = sysexit_status(errinfo);
-	}
-	else if (rb_obj_is_instance_of(errinfo, rb_eSignal) &&
-		 rb_ivar_get(errinfo, id_signo) != INT2FIX(SIGSEGV)) {
-	    /* no message when exiting by signal */
-	}
-        else if (rb_obj_is_kind_of(errinfo, rb_eSystemCallError) &&
-                 FIXNUM_P(rb_attr_get(errinfo, id_signo))) {
-	    /* no message when exiting by error to be mapped to signal */
+        /* TODO: fix me */
+        error_pos(Qnil);
+        warn_print("unexpected throw\n");
+        break;
+      case TAG_RAISE:
+        if (!(exiting_split(errinfo, &status, NULL) & EXITING_WITH_MESSAGE)) {
+            break;
         }
-	else {
-	    rb_ec_error_print(ec, errinfo);
-	}
-	break;
-      }
+        /* fallthrough */
       case TAG_FATAL:
-	error_print(ec);
-	break;
+        rb_ec_error_print(ec, errinfo);
+        break;
       default:
-	unknown_longjmp_status(ex);
-	break;
+        unknown_longjmp_status(ex);
+        break;
     }
     rb_ec_reset_raised(ec);
     return status;
diff --git a/eval_intern.h b/eval_intern.h
index 0efbcb0441..6cbaa51361 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -329,9 +329,9 @@ static inline void
 translit_char(char *p, int from, int to)
 {
     while (*p) {
-	if ((unsigned char)*p == from)
-	    *p = to;
-	p = CharNext(p);
+        if ((unsigned char)*p == from)
+            *p = to;
+        p = CharNext(p);
     }
 }
 #endif
diff --git a/eval_jump.c b/eval_jump.c
index 2ea73b0da3..e8e74f4e70 100644
--- a/eval_jump.c
+++ b/eval_jump.c
@@ -40,7 +40,7 @@ rb_f_at_exit(VALUE _)
     VALUE proc;
 
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "called without a block");
+        rb_raise(rb_eArgError, "called without a block");
     }
     proc = rb_block_proc();
     rb_set_end_proc(rb_call_end_proc, proc);
@@ -63,10 +63,10 @@ rb_set_end_proc(void (*func)(VALUE), VALUE data)
     rb_thread_t *th = GET_THREAD();
 
     if (th->top_wrapper) {
-	list = &ephemeral_end_procs;
+        list = &ephemeral_end_procs;
     }
     else {
-	list = &end_procs;
+        list = &end_procs;
     }
     link->next = *list;
     link->func = func;
@@ -81,13 +81,13 @@ rb_mark_end_proc(void)
 
     link = end_procs;
     while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
+        rb_gc_mark(link->data);
+        link = link->next;
     }
     link = ephemeral_end_procs;
     while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
+        rb_gc_mark(link->data);
+        link = link->next;
     }
 }
 
@@ -99,11 +99,11 @@ exec_end_procs_chain(struct end_proc_data *volatile *procs, VALUE *errp)
     VALUE errinfo = *errp;
 
     while ((link = *procs) != 0) {
-	*procs = link->next;
-	endproc = *link;
-	xfree(link);
-	(*endproc.func) (endproc.data);
-	*errp = errinfo;
+        *procs = link->next;
+        endproc = *link;
+        xfree(link);
+        (*endproc.func) (endproc.data);
+        *errp = errinfo;
     }
 }
 
@@ -116,15 +116,15 @@ rb_ec_exec_end_proc(rb_execution_context_t * ec)
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
       again:
-	exec_end_procs_chain(&ephemeral_end_procs, &ec->errinfo);
-	exec_end_procs_chain(&end_procs, &ec->errinfo);
+        exec_end_procs_chain(&ephemeral_end_procs, &ec->errinfo);
+        exec_end_procs_chain(&end_procs, &ec->errinfo);
     }
     else {
-	EC_TMPPOP_TAG();
-        error_handle(ec, state);
-	if (!NIL_P(ec->errinfo)) errinfo = ec->errinfo;
-	EC_REPUSH_TAG();
-	goto again;
+        EC_TMPPOP_TAG();
+        error_handle(ec, ec->errinfo, state);
+        if (!NIL_P(ec->errinfo)) errinfo = ec->errinfo;
+        EC_REPUSH_TAG();
+        goto again;
     }
     EC_POP_TAG();
 
diff --git a/ext/-test-/abi/extconf.rb b/ext/-test-/abi/extconf.rb
index d786b15db9..3b090b7553 100644
--- a/ext/-test-/abi/extconf.rb
+++ b/ext/-test-/abi/extconf.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: false
+return unless RUBY_PATCHLEVEL < 0
 require_relative "../auto_ext.rb"
 auto_ext(inc: true)
diff --git a/ext/-test-/arith_seq/beg_len_step/beg_len_step.c b/ext/-test-/arith_seq/beg_len_step/beg_len_step.c
new file mode 100644
index 0000000000..40c8cbee82
--- /dev/null
+++ b/ext/-test-/arith_seq/beg_len_step/beg_len_step.c
@@ -0,0 +1,19 @@
+#include "ruby/ruby.h"
+
+static VALUE
+arith_seq_s_beg_len_step(VALUE mod, VALUE obj, VALUE len, VALUE err)
+{
+  VALUE r;
+  long beg, len2, step;
+
+  r = rb_arithmetic_sequence_beg_len_step(obj, &beg, &len2, &step, NUM2LONG(len), NUM2INT(err));
+
+  return rb_ary_new_from_args(4, r, LONG2NUM(beg), LONG2NUM(len2), LONG2NUM(step));
+}
+
+void
+Init_beg_len_step(void)
+{
+    VALUE cArithSeq = rb_path2class("Enumerator::ArithmeticSequence");
+    rb_define_singleton_method(cArithSeq, "__beg_len_step__", arith_seq_s_beg_len_step, 3);
+}
diff --git a/ext/-test-/arith_seq/beg_len_step/depend b/ext/-test-/arith_seq/beg_len_step/depend
new file mode 100644
index 0000000000..36a2c4c71b
--- /dev/null
+++ b/ext/-test-/arith_seq/beg_len_step/depend
@@ -0,0 +1,161 @@
+# AUTOGENERATED DEPENDENCIES START
+beg_len_step.o: $(RUBY_EXTCONF_H)
+beg_len_step.o: $(arch_hdrdir)/ruby/config.h
+beg_len_step.o: $(hdrdir)/ruby/assert.h
+beg_len_step.o: $(hdrdir)/ruby/backward.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/assume.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/attributes.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/bool.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/inttypes.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/limits.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/long_long.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/stdalign.h
+beg_len_step.o: $(hdrdir)/ruby/backward/2/stdarg.h
+beg_len_step.o: $(hdrdir)/ruby/defines.h
+beg_len_step.o: $(hdrdir)/ruby/intern.h
+beg_len_step.o: $(hdrdir)/ruby/internal/abi.h
+beg_len_step.o: $(hdrdir)/ruby/internal/anyargs.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+beg_len_step.o: $(hdrdir)/ruby/internal/assume.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/artificial.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/cold.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/const.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/error.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/format.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/noalias.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/noinline.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/pure.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/restrict.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/warning.h
+beg_len_step.o: $(hdrdir)/ruby/internal/attr/weakref.h
+beg_len_step.o: $(hdrdir)/ruby/internal/cast.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_is.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+beg_len_step.o: $(hdrdir)/ruby/internal/compiler_since.h
+beg_len_step.o: $(hdrdir)/ruby/internal/config.h
+beg_len_step.o: $(hdrdir)/ruby/internal/constant_p.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rarray.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rbasic.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rbignum.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rclass.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rdata.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rfile.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rhash.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/robject.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rregexp.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rstring.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rstruct.h
+beg_len_step.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+beg_len_step.o: $(hdrdir)/ruby/internal/ctype.h
+beg_len_step.o: $(hdrdir)/ruby/internal/dllexport.h
+beg_len_step.o: $(hdrdir)/ruby/internal/dosish.h
+beg_len_step.o: $(hdrdir)/ruby/internal/error.h
+beg_len_step.o: $(hdrdir)/ruby/internal/eval.h
+beg_len_step.o: $(hdrdir)/ruby/internal/event.h
+beg_len_step.o: $(hdrdir)/ruby/internal/fl_type.h
+beg_len_step.o: $(hdrdir)/ruby/internal/gc.h
+beg_len_step.o: $(hdrdir)/ruby/internal/glob.h
+beg_len_step.o: $(hdrdir)/ruby/internal/globals.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/attribute.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/builtin.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/extension.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/feature.h
+beg_len_step.o: $(hdrdir)/ruby/internal/has/warning.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/array.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/bignum.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/class.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/compar.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/complex.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/cont.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/dir.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/enum.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/error.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/eval.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/file.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/gc.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/hash.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/io.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/load.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/marshal.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/numeric.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/object.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/parse.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/proc.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/process.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/random.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/range.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/rational.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/re.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/ruby.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/select.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/signal.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/string.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/struct.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/thread.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/time.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/variable.h
+beg_len_step.o: $(hdrdir)/ruby/internal/intern/vm.h
+beg_len_step.o: $(hdrdir)/ruby/internal/interpreter.h
+beg_len_step.o: $(hdrdir)/ruby/internal/iterator.h
+beg_len_step.o: $(hdrdir)/ruby/internal/memory.h
+beg_len_step.o: $(hdrdir)/ruby/internal/method.h
+beg_len_step.o: $(hdrdir)/ruby/internal/module.h
+beg_len_step.o: $(hdrdir)/ruby/internal/newobj.h
+beg_len_step.o: $(hdrdir)/ruby/internal/rgengc.h
+beg_len_step.o: $(hdrdir)/ruby/internal/scan_args.h
+beg_len_step.o: $(hdrdir)/ruby/internal/special_consts.h
+beg_len_step.o: $(hdrdir)/ruby/internal/static_assert.h
+beg_len_step.o: $(hdrdir)/ruby/internal/stdalign.h
+beg_len_step.o: $(hdrdir)/ruby/internal/stdbool.h
+beg_len_step.o: $(hdrdir)/ruby/internal/symbol.h
+beg_len_step.o: $(hdrdir)/ruby/internal/value.h
+beg_len_step.o: $(hdrdir)/ruby/internal/value_type.h
+beg_len_step.o: $(hdrdir)/ruby/internal/variable.h
+beg_len_step.o: $(hdrdir)/ruby/internal/warning_push.h
+beg_len_step.o: $(hdrdir)/ruby/internal/xmalloc.h
+beg_len_step.o: $(hdrdir)/ruby/missing.h
+beg_len_step.o: $(hdrdir)/ruby/ruby.h
+beg_len_step.o: $(hdrdir)/ruby/st.h
+beg_len_step.o: $(hdrdir)/ruby/subst.h
+beg_len_step.o: beg_len_step.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/arith_seq/beg_len_step/extconf.rb b/ext/-test-/arith_seq/beg_len_step/extconf.rb
new file mode 100644
index 0000000000..e72b3ad01f
--- /dev/null
+++ b/ext/-test-/arith_seq/beg_len_step/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/arith_seq/beg_len_step")
diff --git a/ext/-test-/debug/inspector.c b/ext/-test-/debug/inspector.c
index f0c58e59f9..25f9d894d3 100644
--- a/ext/-test-/debug/inspector.c
+++ b/ext/-test-/debug/inspector.c
@@ -8,13 +8,13 @@ callback(const rb_debug_inspector_t *dbg_context, void *data)
     long i, len = RARRAY_LEN(locs);
     VALUE binds = rb_ary_new();
     for (i = 0; i < len; ++i) {
-	VALUE entry = rb_ary_new();
-	rb_ary_push(binds, entry);
-	rb_ary_push(entry, rb_debug_inspector_frame_self_get(dbg_context, i));
-	rb_ary_push(entry, rb_debug_inspector_frame_binding_get(dbg_context, i));
-	rb_ary_push(entry, rb_debug_inspector_frame_class_get(dbg_context, i));
-	rb_ary_push(entry, rb_debug_inspector_frame_iseq_get(dbg_context, i));
-	rb_ary_push(entry, rb_ary_entry(locs, i));
+        VALUE entry = rb_ary_new();
+        rb_ary_push(binds, entry);
+        rb_ary_push(entry, rb_debug_inspector_frame_self_get(dbg_context, i));
+        rb_ary_push(entry, rb_debug_inspector_frame_binding_get(dbg_context, i));
+        rb_ary_push(entry, rb_debug_inspector_frame_class_get(dbg_context, i));
+        rb_ary_push(entry, rb_debug_inspector_frame_iseq_get(dbg_context, i));
+        rb_ary_push(entry, rb_ary_entry(locs, i));
     }
     return binds;
 }
diff --git a/ext/-test-/debug/profile_frames.c b/ext/-test-/debug/profile_frames.c
index 1656ff7d4b..d2bba7d183 100644
--- a/ext/-test-/debug/profile_frames.c
+++ b/ext/-test-/debug/profile_frames.c
@@ -18,19 +18,20 @@ profile_frames(VALUE self, VALUE start_v, VALUE num_v)
     collected_size = rb_profile_frames(start, buff_size, buff, lines);
 
     for (i=0; i<collected_size; i++) {
-	VALUE ary = rb_ary_new();
-	rb_ary_push(ary, rb_profile_frame_path(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_absolute_path(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_label(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_base_label(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_full_label(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_first_lineno(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_classpath(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_singleton_method_p(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_method_name(buff[i]));
-	rb_ary_push(ary, rb_profile_frame_qualified_method_name(buff[i]));
-
-	rb_ary_push(result, ary);
+        VALUE ary = rb_ary_new();
+        rb_ary_push(ary, rb_profile_frame_path(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_absolute_path(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_label(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_base_label(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_full_label(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_first_lineno(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_classpath(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_singleton_method_p(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_method_name(buff[i]));
+        rb_ary_push(ary, rb_profile_frame_qualified_method_name(buff[i]));
+        rb_ary_push(ary, INT2NUM(lines[i]));
+
+        rb_ary_push(result, ary);
     }
 
     return result;
diff --git a/ext/-test-/econv/append.c b/ext/-test-/econv/append.c
new file mode 100644
index 0000000000..724cd136c0
--- /dev/null
+++ b/ext/-test-/econv/append.c
@@ -0,0 +1,15 @@
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+
+static VALUE
+econv_append(VALUE self, VALUE src, VALUE dst)
+{
+    rb_econv_t *ec = DATA_PTR(self);
+    return rb_econv_str_append(ec, src, dst, 0);
+}
+
+void
+Init_econv_append(VALUE klass)
+{
+    rb_define_method(klass, "append", econv_append, 2);
+}
diff --git a/ext/-test-/econv/extconf.rb b/ext/-test-/econv/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/econv/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/econv/init.c b/ext/-test-/econv/init.c
new file mode 100644
index 0000000000..9772ebe71c
--- /dev/null
+++ b/ext/-test-/econv/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_econv_##n(VALUE klass); Init_econv_##n(klass);}
+
+void
+Init_econv(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "EConv", rb_path2class("Encoding::Converter"));
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/enumerator_kw/enumerator_kw.c b/ext/-test-/enumerator_kw/enumerator_kw.c
index 947d2b37e6..9104c51869 100644
--- a/ext/-test-/enumerator_kw/enumerator_kw.c
+++ b/ext/-test-/enumerator_kw/enumerator_kw.c
@@ -14,7 +14,8 @@ enumerator_kw(int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_enumerator_kw(void) {
+Init_enumerator_kw(void)
+{
     VALUE module = rb_define_module("Bug");
     module = rb_define_module_under(module, "EnumeratorKw");
     rb_define_method(module, "m", enumerator_kw, -1);
diff --git a/ext/-test-/eval/eval.c b/ext/-test-/eval/eval.c
new file mode 100644
index 0000000000..983468fc34
--- /dev/null
+++ b/ext/-test-/eval/eval.c
@@ -0,0 +1,13 @@
+#include "ruby/ruby.h"
+
+static VALUE
+eval_string(VALUE self, VALUE str)
+{
+    return rb_eval_string(StringValueCStr(str));
+}
+
+void
+Init_eval(void)
+{
+    rb_define_global_function("rb_eval_string", eval_string, 1);
+}
diff --git a/ext/-test-/eval/extconf.rb b/ext/-test-/eval/extconf.rb
new file mode 100644
index 0000000000..cdbf6a8597
--- /dev/null
+++ b/ext/-test-/eval/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('-test-/eval')
diff --git a/ext/-test-/file/fs.c b/ext/-test-/file/fs.c
index 1a6c3d06dc..eb17e9768e 100644
--- a/ext/-test-/file/fs.c
+++ b/ext/-test-/file/fs.c
@@ -54,24 +54,24 @@ get_fsname(VALUE self, VALUE str)
     FilePathValue(str);
     str = rb_str_encode_ospath(str);
     if (STATFS(StringValueCStr(str), &st) == -1) {
-	rb_sys_fail_str(str);
+        rb_sys_fail_str(str);
     }
 # ifdef HAVE_STRUCT_STATFS_T_F_FSTYPENAME
     if (st.f_fstypename[0])
-	return CSTR(st.f_fstypename);
+        return CSTR(st.f_fstypename);
 # endif
 # ifdef HAVE_STRUCT_STATFS_T_F_TYPE
     switch (st.f_type) {
       case 0x9123683E: /* BTRFS_SUPER_MAGIC */
-	return CSTR("btrfs");
+        return CSTR("btrfs");
       case 0x7461636f: /* OCFS2_SUPER_MAGIC */
-	return CSTR("ocfs");
+        return CSTR("ocfs");
       case 0xEF53: /* EXT2_SUPER_MAGIC EXT3_SUPER_MAGIC EXT4_SUPER_MAGIC */
-	return CSTR("ext4");
+        return CSTR("ext4");
       case 0x58465342: /* XFS_SUPER_MAGIC */
-	return CSTR("xfs");
+        return CSTR("xfs");
       case 0x01021994: /* TMPFS_MAGIC */
-	return CSTR("tmpfs");
+        return CSTR("tmpfs");
     }
 # endif
 #endif
diff --git a/ext/-test-/funcall/funcall.c b/ext/-test-/funcall/funcall.c
index 43521bf2e9..a68d6de255 100644
--- a/ext/-test-/funcall/funcall.c
+++ b/ext/-test-/funcall/funcall.c
@@ -47,17 +47,17 @@ Init_funcall(void)
     VALUE cRelay = rb_define_module_under(cTestFuncall, "Relay");
 
     rb_define_singleton_method(cRelay,
-			       "with_funcall2",
-			       with_funcall2,
-			       -1);
+                               "with_funcall2",
+                               with_funcall2,
+                               -1);
     rb_define_singleton_method(cRelay,
                                "with_funcall_passing_block_kw",
                                with_funcall_passing_block_kw,
                                -1);
     rb_define_singleton_method(cRelay,
-			       "with_funcall_passing_block",
-			       with_funcall_passing_block,
-			       -1);
+                               "with_funcall_passing_block",
+                               with_funcall_passing_block,
+                               -1);
     rb_define_singleton_method(cRelay,
                                "with_funcallv_public_kw",
                                with_funcallv_public_kw,
diff --git a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
index 233635421b..97946e925d 100644
--- a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
+++ b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
@@ -17,7 +17,7 @@ thread_runnable_sleep(VALUE thread, VALUE timeout)
     struct timeval timeval;
 
     if (NIL_P(timeout)) {
-	rb_raise(rb_eArgError, "timeout must be non nil");
+        rb_raise(rb_eArgError, "timeout must be non nil");
     }
 
     timeval = rb_time_interval(timeout);
diff --git a/ext/-test-/marshal/internal_ivar/internal_ivar.c b/ext/-test-/marshal/internal_ivar/internal_ivar.c
index de0cf711aa..b2188f737a 100644
--- a/ext/-test-/marshal/internal_ivar/internal_ivar.c
+++ b/ext/-test-/marshal/internal_ivar/internal_ivar.c
@@ -36,10 +36,7 @@ Init_internal_ivar(void)
     VALUE newclass = rb_define_class_under(mMarshal, "InternalIVar", rb_cObject);
 
     id_normal_ivar = rb_intern_const("normal");
-#if 0
-    /* leave id_internal_ivar being 0 */
-    id_internal_ivar = rb_make_internal_id();
-#endif
+    id_internal_ivar = rb_intern_const("K");
     id_encoding_short = rb_intern_const("E");
     rb_define_method(newclass, "initialize", init, 3);
     rb_define_method(newclass, "normal", get_normal, 0);
diff --git a/ext/-test-/memory_status/memory_status.c b/ext/-test-/memory_status/memory_status.c
index afacbee785..f124c97ca1 100644
--- a/ext/-test-/memory_status/memory_status.c
+++ b/ext/-test-/memory_status/memory_status.c
@@ -34,7 +34,7 @@ read_status(VALUE self)
     taskinfo.virtual_size = 0;
     taskinfo.resident_size = 0;
     error = task_info(mach_task_self(), flavor,
-		      (task_info_t)&taskinfo, &out_count);
+                      (task_info_t)&taskinfo, &out_count);
     if (error != KERN_SUCCESS) return Qnil;
 #ifndef ULL2NUM
 /* "long long" does not exist here, use size_t instead.  */
@@ -50,7 +50,7 @@ read_status(VALUE self)
     PROCESS_MEMORY_COUNTERS c;
     c.cb = sizeof(c);
     if (!GetProcessMemoryInfo(GetCurrentProcess(), &c, c.cb))
-	return Qnil;
+        return Qnil;
     size = SIZET2NUM(c.PagefileUsage);
     rss = SIZET2NUM(c.WorkingSetSize);
     peak = SIZET2NUM(c.PeakWorkingSetSize);
@@ -68,13 +68,13 @@ Init_memory_status(void)
 {
     VALUE mMemory = rb_define_module("Memory");
     cMemoryStatus =
-	rb_struct_define_under(mMemory, "Status", "size",
+        rb_struct_define_under(mMemory, "Status", "size",
 #ifdef HAVE_RSS
-			       "rss",
+                               "rss",
 #endif
 #ifdef HAVE_PEAK
-			       "peak",
+                               "peak",
 #endif
-			       (char *)NULL);
+                               (char *)NULL);
     rb_define_method(cMemoryStatus, "_update", read_status, 0);
 }
diff --git a/ext/-test-/num2int/num2int.c b/ext/-test-/num2int/num2int.c
index 3aec3ccf3b..63a441fda6 100644
--- a/ext/-test-/num2int/num2int.c
+++ b/ext/-test-/num2int/num2int.c
@@ -4,7 +4,7 @@ static VALUE
 test_num2short(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%d", NUM2SHORT(num));
+    snprintf(buf, sizeof(buf), "%d", NUM2SHORT(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -12,7 +12,7 @@ static VALUE
 test_num2ushort(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%u", NUM2USHORT(num));
+    snprintf(buf, sizeof(buf), "%u", NUM2USHORT(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -20,7 +20,7 @@ static VALUE
 test_num2int(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%d", NUM2INT(num));
+    snprintf(buf, sizeof(buf), "%d", NUM2INT(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -28,7 +28,7 @@ static VALUE
 test_num2uint(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%u", NUM2UINT(num));
+    snprintf(buf, sizeof(buf), "%u", NUM2UINT(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -36,7 +36,7 @@ static VALUE
 test_num2long(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%ld", NUM2LONG(num));
+    snprintf(buf, sizeof(buf), "%ld", NUM2LONG(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -44,7 +44,7 @@ static VALUE
 test_num2ulong(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%lu", NUM2ULONG(num));
+    snprintf(buf, sizeof(buf), "%lu", NUM2ULONG(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -53,7 +53,7 @@ static VALUE
 test_num2ll(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%"PRI_LL_PREFIX"d", NUM2LL(num));
+    snprintf(buf, sizeof(buf), "%"PRI_LL_PREFIX"d", NUM2LL(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -61,7 +61,7 @@ static VALUE
 test_num2ull(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%"PRI_LL_PREFIX"u", NUM2ULL(num));
+    snprintf(buf, sizeof(buf), "%"PRI_LL_PREFIX"u", NUM2ULL(num));
     return rb_str_new_cstr(buf);
 }
 #endif
@@ -70,7 +70,7 @@ static VALUE
 test_fix2short(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%d", FIX2SHORT(num));
+    snprintf(buf, sizeof(buf), "%d", FIX2SHORT(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -78,7 +78,7 @@ static VALUE
 test_fix2int(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%d", FIX2INT(num));
+    snprintf(buf, sizeof(buf), "%d", FIX2INT(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -86,7 +86,7 @@ static VALUE
 test_fix2uint(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%u", FIX2UINT(num));
+    snprintf(buf, sizeof(buf), "%u", FIX2UINT(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -94,7 +94,7 @@ static VALUE
 test_fix2long(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%ld", FIX2LONG(num));
+    snprintf(buf, sizeof(buf), "%ld", FIX2LONG(num));
     return rb_str_new_cstr(buf);
 }
 
@@ -102,7 +102,7 @@ static VALUE
 test_fix2ulong(VALUE obj, VALUE num)
 {
     char buf[128];
-    sprintf(buf, "%lu", FIX2ULONG(num));
+    snprintf(buf, sizeof(buf), "%lu", FIX2ULONG(num));
     return rb_str_new_cstr(buf);
 }
 
diff --git a/ext/-test-/printf/printf.c b/ext/-test-/printf/printf.c
index e793bb7a48..889c0d9f0d 100644
--- a/ext/-test-/printf/printf.c
+++ b/ext/-test-/printf/printf.c
@@ -25,7 +25,7 @@ uint_to_str(char *p, char *e, unsigned int x)
     char *e0 = e;
     if (e <= p) return p;
     do {
-	*--e = x % 10 + '0';
+        *--e = x % 10 + '0';
     } while ((x /= 10) != 0 && e > p);
     memmove(p, e, e0 - e);
     return p + (e0 - e);
@@ -44,48 +44,48 @@ printf_test_call(int argc, VALUE *argv, VALUE self)
     if (RSTRING_LEN(type) != 1) rb_raise(rb_eArgError, "wrong length(%ld)", RSTRING_LEN(type));
     switch (cnv = RSTRING_PTR(type)[0]) {
       case 'd': case 'x': case 'o': case 'X':
-	n = NUM2INT(num);
-	break;
+        n = NUM2INT(num);
+        break;
       case 's':
-	s = StringValueCStr(num);
-	break;
+        s = StringValueCStr(num);
+        break;
       default: rb_raise(rb_eArgError, "wrong conversion(%c)", cnv);
     }
     *p++ = '%';
     if (!NIL_P(opt)) {
-	VALUE v;
-	Check_Type(opt, T_HASH);
-	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("space"))))) {
-	    *p++ = ' ';
-	}
-	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("hash"))))) {
-	    *p++ = '#';
-	}
-	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("plus"))))) {
-	    *p++ = '+';
-	}
-	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("minus"))))) {
-	    *p++ = '-';
-	}
-	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("zero"))))) {
-	    *p++ = '0';
-	}
-	if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) {
-	    p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
-	}
-	if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) {
-	    *p++ = '.';
-	    if (FIXNUM_P(v))
-		p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
-	}
+        VALUE v;
+        Check_Type(opt, T_HASH);
+        if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("space"))))) {
+            *p++ = ' ';
+        }
+        if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("hash"))))) {
+            *p++ = '#';
+        }
+        if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("plus"))))) {
+            *p++ = '+';
+        }
+        if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("minus"))))) {
+            *p++ = '-';
+        }
+        if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("zero"))))) {
+            *p++ = '0';
+        }
+        if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) {
+            p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
+        }
+        if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) {
+            *p++ = '.';
+            if (FIXNUM_P(v))
+                p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
+        }
     }
     *p++ = cnv;
     *p++ = '\0';
     if (cnv == 's') {
-	result = rb_enc_sprintf(rb_usascii_encoding(), format, s);
+        result = rb_enc_sprintf(rb_usascii_encoding(), format, s);
     }
     else {
-	result = rb_enc_sprintf(rb_usascii_encoding(), format, n);
+        result = rb_enc_sprintf(rb_usascii_encoding(), format, n);
     }
     return rb_assoc_new(result, rb_usascii_str_new_cstr(format));
 }
diff --git a/ext/-test-/proc/super.c b/ext/-test-/proc/super.c
index dbe8af08f1..816520e1df 100644
--- a/ext/-test-/proc/super.c
+++ b/ext/-test-/proc/super.c
@@ -9,7 +9,7 @@ bug_proc_call_super(RB_BLOCK_CALL_FUNC_ARGLIST(yieldarg, procarg))
     args[1] = procarg;
     ret = rb_call_super(2, args);
     if (!NIL_P(blockarg)) {
-	ret = rb_proc_call(blockarg, ret);
+        ret = rb_proc_call(blockarg, ret);
     }
     return ret;
 }
diff --git a/ext/-test-/random/bad_version.c b/ext/-test-/random/bad_version.c
new file mode 100644
index 0000000000..dae63a6d19
--- /dev/null
+++ b/ext/-test-/random/bad_version.c
@@ -0,0 +1,135 @@
+#include "ruby/random.h"
+
+#if RUBY_RANDOM_INTERFACE_VERSION_MAJOR < RUBY_RANDOM_INTERFACE_VERSION_MAJOR_MAX
+# define DEFINE_VERSION_MAX 1
+#else
+# define DEFINE_VERSION_MAX 0
+#endif
+
+NORETURN(static void must_not_reach(void));
+static void
+must_not_reach(void)
+{
+    rb_raise(rb_eTypeError, "must not reach");
+}
+
+NORETURN(static void bad_version_init(rb_random_t *, const uint32_t *, size_t));
+static void
+bad_version_init(rb_random_t *rnd, const uint32_t *buf, size_t len)
+{
+    must_not_reach();
+}
+
+NORETURN(static void bad_version_init_int32(rb_random_t *, uint32_t));
+RB_RANDOM_DEFINE_INIT_INT32_FUNC(bad_version)
+
+NORETURN(static void bad_version_get_bytes(rb_random_t *, void *, size_t));
+static void
+bad_version_get_bytes(rb_random_t *rnd, void *p, size_t n)
+{
+    must_not_reach();
+}
+
+NORETURN(static uint32_t bad_version_get_int32(rb_random_t *));
+static uint32_t
+bad_version_get_int32(rb_random_t *rnd)
+{
+    must_not_reach();
+    UNREACHABLE_RETURN(0);
+}
+
+static VALUE
+bad_version_alloc(VALUE klass, const rb_data_type_t *type)
+{
+    rb_random_t *rnd;
+    VALUE obj = TypedData_Make_Struct(klass, rb_random_t, type, rnd);
+    rb_random_base_init(rnd);
+    return obj;
+}
+
+/* version 0 */
+static const rb_random_interface_t random_version_zero_if;
+
+static rb_random_data_type_t version_zero_type = {
+    "random/version_zero",
+    {
+        rb_random_mark,
+        RUBY_TYPED_DEFAULT_FREE,
+    },
+    RB_RANDOM_PARENT,
+    (void *)&random_version_zero_if,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+version_zero_alloc(VALUE klass)
+{
+    return bad_version_alloc(klass, &version_zero_type);
+}
+
+static void
+init_version_zero(VALUE mod, VALUE base)
+{
+    VALUE c = rb_define_class_under(mod, "VersionZero", base);
+    rb_define_alloc_func(c, version_zero_alloc);
+    RB_RANDOM_DATA_INIT_PARENT(version_zero_type);
+}
+
+#if DEFINE_VERSION_MAX
+/* version max */
+static const rb_random_interface_t random_version_max_if;
+static rb_random_data_type_t version_max_type = {
+    "random/version_max",
+    {
+        rb_random_mark,
+        RUBY_TYPED_DEFAULT_FREE,
+    },
+    RB_RANDOM_PARENT,
+    (void *)&random_version_max_if,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+version_max_alloc(VALUE klass)
+{
+    return bad_version_alloc(klass, &version_max_type);
+}
+
+static void
+init_version_max(VALUE mod, VALUE base)
+{
+    VALUE c = rb_define_class_under(mod, "VersionMax", base);
+    rb_define_alloc_func(c, version_max_alloc);
+    RB_RANDOM_DATA_INIT_PARENT(version_max_type);
+}
+#else
+static void
+init_version_max(mod, base)
+{
+}
+#endif
+
+void
+Init_random_bad_version(VALUE mod, VALUE base)
+{
+    init_version_zero(mod, base);
+    init_version_max(mod, base);
+}
+
+#undef RUBY_RANDOM_INTERFACE_VERSION_MAJOR
+
+#define RUBY_RANDOM_INTERFACE_VERSION_MAJOR 0
+static const rb_random_interface_t random_version_zero_if = {
+    0,
+    RB_RANDOM_INTERFACE_DEFINE(bad_version)
+};
+#undef RUBY_RANDOM_INTERFACE_VERSION_MAJOR
+
+#if DEFINE_VERSION_MAX
+#define RUBY_RANDOM_INTERFACE_VERSION_MAJOR RUBY_RANDOM_INTERFACE_VERSION_MAJOR_MAX
+static const rb_random_interface_t random_version_max_if = {
+    0,
+    RB_RANDOM_INTERFACE_DEFINE(bad_version)
+};
+#undef RUBY_RANDOM_INTERFACE_VERSION_MAJOR
+#endif
diff --git a/ext/-test-/random/depend b/ext/-test-/random/depend
index 602526cf7b..f2cbf7fc14 100644
--- a/ext/-test-/random/depend
+++ b/ext/-test-/random/depend
@@ -1,4 +1,164 @@
 # AUTOGENERATED DEPENDENCIES START
+bad_version.o: $(RUBY_EXTCONF_H)
+bad_version.o: $(arch_hdrdir)/ruby/config.h
+bad_version.o: $(hdrdir)/ruby/assert.h
+bad_version.o: $(hdrdir)/ruby/backward.h
+bad_version.o: $(hdrdir)/ruby/backward/2/assume.h
+bad_version.o: $(hdrdir)/ruby/backward/2/attributes.h
+bad_version.o: $(hdrdir)/ruby/backward/2/bool.h
+bad_version.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bad_version.o: $(hdrdir)/ruby/backward/2/limits.h
+bad_version.o: $(hdrdir)/ruby/backward/2/long_long.h
+bad_version.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bad_version.o: $(hdrdir)/ruby/backward/2/stdarg.h
+bad_version.o: $(hdrdir)/ruby/defines.h
+bad_version.o: $(hdrdir)/ruby/intern.h
+bad_version.o: $(hdrdir)/ruby/internal/abi.h
+bad_version.o: $(hdrdir)/ruby/internal/anyargs.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bad_version.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bad_version.o: $(hdrdir)/ruby/internal/assume.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/cold.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/const.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/error.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/format.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/pure.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/warning.h
+bad_version.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bad_version.o: $(hdrdir)/ruby/internal/cast.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_is.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bad_version.o: $(hdrdir)/ruby/internal/compiler_since.h
+bad_version.o: $(hdrdir)/ruby/internal/config.h
+bad_version.o: $(hdrdir)/ruby/internal/constant_p.h
+bad_version.o: $(hdrdir)/ruby/internal/core.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rarray.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rclass.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rdata.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rfile.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rhash.h
+bad_version.o: $(hdrdir)/ruby/internal/core/robject.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rstring.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bad_version.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bad_version.o: $(hdrdir)/ruby/internal/ctype.h
+bad_version.o: $(hdrdir)/ruby/internal/dllexport.h
+bad_version.o: $(hdrdir)/ruby/internal/dosish.h
+bad_version.o: $(hdrdir)/ruby/internal/error.h
+bad_version.o: $(hdrdir)/ruby/internal/eval.h
+bad_version.o: $(hdrdir)/ruby/internal/event.h
+bad_version.o: $(hdrdir)/ruby/internal/fl_type.h
+bad_version.o: $(hdrdir)/ruby/internal/gc.h
+bad_version.o: $(hdrdir)/ruby/internal/glob.h
+bad_version.o: $(hdrdir)/ruby/internal/globals.h
+bad_version.o: $(hdrdir)/ruby/internal/has/attribute.h
+bad_version.o: $(hdrdir)/ruby/internal/has/builtin.h
+bad_version.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bad_version.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bad_version.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bad_version.o: $(hdrdir)/ruby/internal/has/extension.h
+bad_version.o: $(hdrdir)/ruby/internal/has/feature.h
+bad_version.o: $(hdrdir)/ruby/internal/has/warning.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/array.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/class.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/compar.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/complex.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/cont.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/dir.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/enum.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/error.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/eval.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/file.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/gc.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/hash.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/io.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/load.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/object.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/parse.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/proc.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/process.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/random.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/range.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/rational.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/re.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/select.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/signal.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/string.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/struct.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/thread.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/time.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/variable.h
+bad_version.o: $(hdrdir)/ruby/internal/intern/vm.h
+bad_version.o: $(hdrdir)/ruby/internal/interpreter.h
+bad_version.o: $(hdrdir)/ruby/internal/iterator.h
+bad_version.o: $(hdrdir)/ruby/internal/memory.h
+bad_version.o: $(hdrdir)/ruby/internal/method.h
+bad_version.o: $(hdrdir)/ruby/internal/module.h
+bad_version.o: $(hdrdir)/ruby/internal/newobj.h
+bad_version.o: $(hdrdir)/ruby/internal/rgengc.h
+bad_version.o: $(hdrdir)/ruby/internal/scan_args.h
+bad_version.o: $(hdrdir)/ruby/internal/special_consts.h
+bad_version.o: $(hdrdir)/ruby/internal/static_assert.h
+bad_version.o: $(hdrdir)/ruby/internal/stdalign.h
+bad_version.o: $(hdrdir)/ruby/internal/stdbool.h
+bad_version.o: $(hdrdir)/ruby/internal/symbol.h
+bad_version.o: $(hdrdir)/ruby/internal/value.h
+bad_version.o: $(hdrdir)/ruby/internal/value_type.h
+bad_version.o: $(hdrdir)/ruby/internal/variable.h
+bad_version.o: $(hdrdir)/ruby/internal/warning_push.h
+bad_version.o: $(hdrdir)/ruby/internal/xmalloc.h
+bad_version.o: $(hdrdir)/ruby/missing.h
+bad_version.o: $(hdrdir)/ruby/random.h
+bad_version.o: $(hdrdir)/ruby/ruby.h
+bad_version.o: $(hdrdir)/ruby/st.h
+bad_version.o: $(hdrdir)/ruby/subst.h
+bad_version.o: bad_version.c
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
 init.o: $(hdrdir)/ruby.h
diff --git a/ext/-test-/random/loop.c b/ext/-test-/random/loop.c
index 0572096403..b789ab1d01 100644
--- a/ext/-test-/random/loop.c
+++ b/ext/-test-/random/loop.c
@@ -13,6 +13,7 @@ static const rb_random_interface_t random_loop_if = {
     RB_RANDOM_INTERFACE_DEFINE_WITH_REAL(loop)
 };
 
+RB_RANDOM_DEFINE_INIT_INT32_FUNC(loop)
 static size_t
 random_loop_memsize(const void *ptr)
 {
diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend
index 8729695886..ce977821b8 100644
--- a/ext/-test-/rational/depend
+++ b/ext/-test-/rational/depend
@@ -174,5 +174,6 @@ rat.o: $(top_srcdir)/internal/static_assert.h
 rat.o: $(top_srcdir)/internal/vm.h
 rat.o: $(top_srcdir)/internal/warnings.h
 rat.o: $(top_srcdir)/ruby_assert.h
+rat.o: $(top_srcdir)/shape.h
 rat.o: rat.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/rb_call_super_kw/rb_call_super_kw.c b/ext/-test-/rb_call_super_kw/rb_call_super_kw.c
index 7f094545d2..61681ed733 100644
--- a/ext/-test-/rb_call_super_kw/rb_call_super_kw.c
+++ b/ext/-test-/rb_call_super_kw/rb_call_super_kw.c
@@ -7,7 +7,8 @@ rb_call_super_kw_m(int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_rb_call_super_kw(void) {
+Init_rb_call_super_kw(void)
+{
     VALUE module = rb_define_module("Bug");
     module = rb_define_module_under(module, "RbCallSuperKw");
     rb_define_method(module, "m", rb_call_super_kw_m, -1);
diff --git a/ext/-test-/st/foreach/foreach.c b/ext/-test-/st/foreach/foreach.c
index 27ac18046f..cde49fb26d 100644
--- a/ext/-test-/st/foreach/foreach.c
+++ b/ext/-test-/st/foreach/foreach.c
@@ -12,22 +12,22 @@ static void
 force_unpack_check(struct checker *c, st_data_t key, st_data_t val)
 {
     if (c->nr == 0) {
-	st_data_t i;
+        st_data_t i;
 
-	if (c->tbl->bins != NULL) rb_bug("should be packed\n");
+        if (c->tbl->bins != NULL) rb_bug("should be packed\n");
 
-	/* force unpacking during iteration: */
-	for (i = 1; i < expect_size; i++)
-	    st_add_direct(c->tbl, i, i);
+        /* force unpacking during iteration: */
+        for (i = 1; i < expect_size; i++)
+            st_add_direct(c->tbl, i, i);
 
-	if (c->tbl->bins == NULL) rb_bug("should be unpacked\n");
+        if (c->tbl->bins == NULL) rb_bug("should be unpacked\n");
     }
 
     if (key != c->nr) {
-	rb_bug("unexpected key: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)key, (VALUE)c->nr);
+        rb_bug("unexpected key: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)key, (VALUE)c->nr);
     }
     if (val != c->nr) {
-	rb_bug("unexpected val: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)val, (VALUE)c->nr);
+        rb_bug("unexpected val: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)val, (VALUE)c->nr);
     }
 
     c->nr++;
@@ -39,34 +39,34 @@ unp_fec_i(st_data_t key, st_data_t val, st_data_t args, int error)
     struct checker *c = (struct checker *)args;
 
     if (error) {
-	if (c->test == ID2SYM(rb_intern("delete2")))
-	    return ST_STOP;
+        if (c->test == ID2SYM(rb_intern("delete2")))
+            return ST_STOP;
 
-	rb_bug("unexpected error");
+        rb_bug("unexpected error");
     }
 
     force_unpack_check(c, key, val);
 
     if (c->test == ID2SYM(rb_intern("check"))) {
-	return ST_CHECK;
+        return ST_CHECK;
     }
     if (c->test == ID2SYM(rb_intern("delete1"))) {
-	if (c->nr == 1) return ST_DELETE;
-	return ST_CHECK;
+        if (c->nr == 1) return ST_DELETE;
+        return ST_CHECK;
     }
     if (c->test == ID2SYM(rb_intern("delete2"))) {
-	if (c->nr == 1) {
-	    st_data_t k = 0;
-	    st_data_t v;
-
-	    if (!st_delete(c->tbl, &k, &v)) {
-		rb_bug("failed to delete\n");
-	    }
-	    if (v != 0) {
-		rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
-	    }
-	}
-	return ST_CHECK;
+        if (c->nr == 1) {
+            st_data_t k = 0;
+            st_data_t v;
+
+            if (!st_delete(c->tbl, &k, &v)) {
+                rb_bug("failed to delete\n");
+            }
+            if (v != 0) {
+                rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
+            }
+        }
+        return ST_CHECK;
     }
 
     rb_raise(rb_eArgError, "unexpected arg: %+"PRIsVALUE, c->test);
@@ -89,13 +89,13 @@ unp_fec(VALUE self, VALUE test)
     st_foreach_check(tbl, unp_fec_i, (st_data_t)&c, -1);
 
     if (c.test == ID2SYM(rb_intern("delete2"))) {
-	if (c.nr != 1) {
-	    rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
-	}
+        if (c.nr != 1) {
+            rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
+        }
     }
     else if (c.nr != expect_size) {
-	rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE")\n",
-		(VALUE)c.nr, (VALUE)expect_size);
+        rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE")\n",
+                (VALUE)c.nr, (VALUE)expect_size);
     }
 
     if (tbl->bins == NULL) rb_bug("should be unpacked\n");
@@ -112,22 +112,22 @@ unp_fe_i(st_data_t key, st_data_t val, st_data_t args)
 
     force_unpack_check(c, key, val);
     if (c->test == ID2SYM(rb_intern("unpacked"))) {
-	return ST_CONTINUE;
+        return ST_CONTINUE;
     }
     else if (c->test == ID2SYM(rb_intern("unpack_delete"))) {
-	if (c->nr == 1) {
-	    st_data_t k = 0;
-	    st_data_t v;
-
-	    if (!st_delete(c->tbl, &k, &v)) {
-		rb_bug("failed to delete\n");
-	    }
-	    if (v != 0) {
-		rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
-	    }
-	    return ST_CONTINUE;
-	}
-	rb_bug("should never get here\n");
+        if (c->nr == 1) {
+            st_data_t k = 0;
+            st_data_t v;
+
+            if (!st_delete(c->tbl, &k, &v)) {
+                rb_bug("failed to delete\n");
+            }
+            if (v != 0) {
+                rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
+            }
+            return ST_CONTINUE;
+        }
+        rb_bug("should never get here\n");
     }
 
     rb_raise(rb_eArgError, "unexpected arg: %+"PRIsVALUE, c->test);
@@ -150,13 +150,13 @@ unp_fe(VALUE self, VALUE test)
     st_foreach(tbl, unp_fe_i, (st_data_t)&c);
 
     if (c.test == ID2SYM(rb_intern("unpack_delete"))) {
-	if (c.nr != 1) {
-	    rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
-	}
+        if (c.nr != 1) {
+            rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
+        }
     }
     else if (c.nr != expect_size) {
-	rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE"o)\n",
-		(VALUE)c.nr, (VALUE)expect_size);
+        rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE"o)\n",
+                (VALUE)c.nr, (VALUE)expect_size);
     }
 
     if (tbl->bins == NULL) rb_bug("should be unpacked\n");
diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c
index aa8015e86c..7e8d5d9fe2 100644
--- a/ext/-test-/st/numhash/numhash.c
+++ b/ext/-test-/st/numhash/numhash.c
@@ -42,7 +42,7 @@ numhash_aref(VALUE self, VALUE key)
     st_table *tbl = (st_table *)Check_TypedStruct(self, &numhash_type);
     if (!SPECIAL_CONST_P(key)) rb_raise(rb_eArgError, "not a special const");
     if (st_lookup(tbl, (st_data_t)key, &data))
-	return (VALUE)data;
+        return (VALUE)data;
     return Qnil;
 }
 
@@ -79,12 +79,12 @@ update_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
     VALUE ret = rb_yield_values(existing ? 2 : 1, (VALUE)*key, (VALUE)*value);
     switch (ret) {
       case Qfalse:
-	return ST_STOP;
+        return ST_STOP;
       case Qnil:
-	return ST_DELETE;
+        return ST_DELETE;
       default:
-	*value = ret;
-	return ST_CONTINUE;
+        *value = ret;
+        return ST_CONTINUE;
     }
 }
 
@@ -93,9 +93,9 @@ numhash_update(VALUE self, VALUE key)
 {
     st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
     if (st_update(table, (st_data_t)key, update_func, 0))
-	return Qtrue;
+        return Qtrue;
     else
-	return Qfalse;
+        return Qfalse;
 }
 
 #if SIZEOF_LONG == SIZEOF_VOIDP
@@ -117,7 +117,7 @@ numhash_delete_safe(VALUE self, VALUE key)
     st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
     st_data_t val, k = (st_data_t)key;
     if (st_delete_safe(table, &k, &val, (st_data_t)self)) {
-	return val;
+        return val;
     }
     return Qnil;
 }
diff --git a/ext/-test-/st/update/update.c b/ext/-test-/st/update/update.c
index 979ad3e334..ea7fab12e1 100644
--- a/ext/-test-/st/update/update.c
+++ b/ext/-test-/st/update/update.c
@@ -7,12 +7,12 @@ update_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
     VALUE ret = rb_yield_values(existing ? 2 : 1, (VALUE)*key, (VALUE)*value);
     switch (ret) {
       case Qfalse:
-	return ST_STOP;
+        return ST_STOP;
       case Qnil:
-	return ST_DELETE;
+        return ST_DELETE;
       default:
-	*value = ret;
-	return ST_CONTINUE;
+        *value = ret;
+        return ST_CONTINUE;
     }
 }
 
@@ -20,9 +20,9 @@ static VALUE
 test_st_update(VALUE self, VALUE key)
 {
     if (st_update(RHASH_TBL(self), (st_data_t)key, update_func, 0))
-	return Qtrue;
+        return Qtrue;
     else
-	return Qfalse;
+        return Qfalse;
 }
 
 void
diff --git a/ext/-test-/string/coderange.c b/ext/-test-/string/coderange.c
index bc998ca372..4197ecca9f 100644
--- a/ext/-test-/string/coderange.c
+++ b/ext/-test-/string/coderange.c
@@ -8,13 +8,13 @@ coderange_int2sym(int coderange)
 {
     switch (coderange) {
       case ENC_CODERANGE_7BIT:
-	return sym_7bit;
+        return sym_7bit;
       case ENC_CODERANGE_VALID:
-	return sym_valid;
+        return sym_valid;
       case ENC_CODERANGE_UNKNOWN:
-	return sym_unknown;
+        return sym_unknown;
       case ENC_CODERANGE_BROKEN:
-	return sym_broken;
+        return sym_broken;
     }
     rb_bug("wrong condition of coderange");
     UNREACHABLE_RETURN(Qnil);
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
index 1eadb8b4fd..468ee7a3b1 100644
--- a/ext/-test-/string/cstr.c
+++ b/ext/-test-/string/cstr.c
@@ -42,11 +42,11 @@ bug_str_cstr_term_char(VALUE str)
     len = rb_enc_mbminlen(enc);
     c = rb_enc_precise_mbclen(s, s + len, enc);
     if (!MBCLEN_CHARFOUND_P(c)) {
-	c = (unsigned char)*s;
+        c = (unsigned char)*s;
     }
     else {
-	c = rb_enc_mbc_to_codepoint(s, s + len, enc);
-	if (!c) return Qnil;
+        c = rb_enc_mbc_to_codepoint(s, s + len, enc);
+        if (!c) return Qnil;
     }
     return rb_enc_uint_chr((unsigned int)c, enc);
 }
@@ -65,14 +65,14 @@ bug_str_unterminated_substring(VALUE str, VALUE vbeg, VALUE vlen)
 #if USE_RVARGC
         RSTRING(str)->as.embed.len = (short)len;
 #else
-	RSTRING(str)->basic.flags &= ~RSTRING_EMBED_LEN_MASK;
-	RSTRING(str)->basic.flags |= len << RSTRING_EMBED_LEN_SHIFT;
+        RSTRING(str)->basic.flags &= ~RSTRING_EMBED_LEN_MASK;
+        RSTRING(str)->basic.flags |= len << RSTRING_EMBED_LEN_SHIFT;
 #endif
         memmove(RSTRING(str)->as.embed.ary, RSTRING(str)->as.embed.ary + beg, len);
     }
     else {
-	RSTRING(str)->as.heap.ptr += beg;
-	RSTRING(str)->as.heap.len = len;
+        RSTRING(str)->as.heap.ptr += beg;
+        RSTRING(str)->as.heap.len = len;
     }
     return str;
 }
@@ -104,7 +104,7 @@ bug_str_s_cstr_term_char(VALUE self, VALUE str)
     const int term_fill_len = (termlen);\
     *term_fill_ptr = '\0';\
     if (UNLIKELY(term_fill_len > 1))\
-	memset(term_fill_ptr, 0, term_fill_len);\
+        memset(term_fill_ptr, 0, term_fill_len);\
 } while (0)
 
 static VALUE
diff --git a/ext/-test-/string/fstring.c b/ext/-test-/string/fstring.c
index 2374319fe3..64f079251d 100644
--- a/ext/-test-/string/fstring.c
+++ b/ext/-test-/string/fstring.c
@@ -12,13 +12,13 @@ bug_s_fstring(VALUE self, VALUE str)
 VALUE
 bug_s_rb_enc_interned_str(VALUE self, VALUE encoding)
 {
-    return rb_enc_interned_str("foo", 3, RDATA(encoding)->data);
+    return rb_enc_interned_str("foo", 3, NIL_P(encoding) ? NULL : RDATA(encoding)->data);
 }
 
 VALUE
 bug_s_rb_enc_str_new(VALUE self, VALUE encoding)
 {
-    return rb_enc_str_new("foo", 3, RDATA(encoding)->data);
+    return rb_enc_str_new("foo", 3, NIL_P(encoding) ? NULL : RDATA(encoding)->data);
 }
 
 void
diff --git a/ext/-test-/string/qsort.c b/ext/-test-/string/qsort.c
index fb7ea3d8cb..4a641e74e3 100644
--- a/ext/-test-/string/qsort.c
+++ b/ext/-test-/string/qsort.c
@@ -35,22 +35,22 @@ bug_str_qsort_bang(int argc, VALUE *argv, VALUE str)
     rb_scan_args(argc, argv, "03", &beg, &len, &size);
     l = RSTRING_LEN(str);
     if (!NIL_P(beg) && (b = NUM2INT(beg)) < 0 && (b += l) < 0) {
-	rb_raise(rb_eArgError, "out of bounds");
+        rb_raise(rb_eArgError, "out of bounds");
     }
     if (!NIL_P(size) && (s = NUM2INT(size)) < 0) {
-	rb_raise(rb_eArgError, "negative size");
+        rb_raise(rb_eArgError, "negative size");
     }
     if (NIL_P(len) ||
-	(((n = NUM2INT(len)) < 0) ?
-	 (rb_raise(rb_eArgError, "negative length"), 0) :
-	 (b + n * s > l))) {
-	n = (l - b) / s;
+        (((n = NUM2INT(len)) < 0) ?
+         (rb_raise(rb_eArgError, "negative length"), 0) :
+         (b + n * s > l))) {
+        n = (l - b) / s;
     }
     rb_str_modify(str);
     d.enc = rb_enc_get(str);
     d.elsize = s;
     ruby_qsort(RSTRING_PTR(str) + b, n, s,
-	       rb_block_given_p() ? cmp_1 : cmp_2, &d);
+               rb_block_given_p() ? cmp_1 : cmp_2, &d);
     return str;
 }
 
diff --git a/ext/-test-/string/set_len.c b/ext/-test-/string/set_len.c