Skip to content

Commit f63ea9a

Browse files
committed
Merge branch 'master' into mmtk
2 parents c26ce09 + 813e125 commit f63ea9a

File tree

269 files changed

+5031
-2727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+5031
-2727
lines changed

Diff for: .github/actions/setup/directories/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ runs:
8888
git config --global init.defaultBranch garbage
8989
9090
- if: inputs.checkout
91-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
91+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
9292
with:
9393
path: ${{ inputs.srcdir }}
9494
fetch-depth: ${{ inputs.fetch-depth }}

Diff for: .github/workflows/annocheck.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- run: id
6464
working-directory:
6565

66-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
66+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
6767
with:
6868
sparse-checkout-cone-mode: false
6969
sparse-checkout: /.github
@@ -74,7 +74,7 @@ jobs:
7474
builddir: build
7575
makeup: true
7676

77-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
77+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
7878
with:
7979
ruby-version: '3.0'
8080
bundler: none

Diff for: .github/workflows/baseruby.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
- ruby-3.3
5252

5353
steps:
54-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
54+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
5555
with:
5656
ruby-version: ${{ matrix.ruby }}
5757
bundler: none
5858

59-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
59+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
6060

6161
- uses: ./.github/actions/setup/ubuntu
6262

Diff for: .github/workflows/bundled_gems.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232

3333
steps:
34-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
34+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
3535
with:
3636
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
3737

Diff for: .github/workflows/check_dependencies.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
)}}
4646
4747
steps:
48-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
48+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
4949

5050
- uses: ./.github/actions/setup/ubuntu
5151
if: ${{ contains(matrix.os, 'ubuntu') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
- uses: ./.github/actions/setup/directories
5757

58-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
58+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
5959
with:
6060
ruby-version: '3.0'
6161
bundler: none

Diff for: .github/workflows/check_misc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
21+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
2222
with:
2323
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
2424

Diff for: .github/workflows/codeql-analysis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Checkout repository
66-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
66+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
6767

6868
- name: Install libraries
6969
if: ${{ contains(matrix.os, 'macos') }}
@@ -80,15 +80,15 @@ jobs:
8080
run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
8181

8282
- name: Initialize CodeQL
83-
uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
83+
uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
8484
with:
8585
languages: ${{ matrix.language }}
8686

8787
- name: Autobuild
88-
uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
88+
uses: github/codeql-action/autobuild@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
8989

9090
- name: Perform CodeQL Analysis
91-
uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
91+
uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
9292
with:
9393
category: '/language:${{ matrix.language }}'
9494
upload: False
@@ -118,7 +118,7 @@ jobs:
118118
continue-on-error: true
119119

120120
- name: Upload SARIF
121-
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
121+
uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
122122
with:
123123
sarif_file: sarif-results/${{ matrix.language }}.sarif
124124
continue-on-error: true

Diff for: .github/workflows/compilers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
- run: id
234234
working-directory:
235235

236-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
236+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
237237
with:
238238
sparse-checkout-cone-mode: false
239239
sparse-checkout: /.github

Diff for: .github/workflows/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
)}}
5353
5454
steps:
55-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
55+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
5656
with:
5757
sparse-checkout-cone-mode: false
5858
sparse-checkout: /.github

Diff for: .github/workflows/mingw.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
steps:
6868
- name: Set up Ruby & MSYS2
69-
uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
69+
uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
7070
with:
7171
ruby-version: ${{ matrix.baseruby }}
7272

@@ -97,7 +97,7 @@ jobs:
9797
$result
9898
working-directory:
9999

100-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
100+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
101101
with:
102102
sparse-checkout-cone-mode: false
103103
sparse-checkout: /.github

Diff for: .github/workflows/prism.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
)}}
5656
5757
steps:
58-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
58+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
5959
with:
6060
sparse-checkout-cone-mode: false
6161
sparse-checkout: /.github

Diff for: .github/workflows/rjit-bindgen.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jobs:
4747
4848
steps:
4949
- name: Set up Ruby
50-
uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
50+
uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
5151
with:
5252
ruby-version: '3.1'
5353

54-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
54+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
5555
with:
5656
sparse-checkout-cone-mode: false
5757
sparse-checkout: /.github

Diff for: .github/workflows/rjit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
)}}
5656
5757
steps:
58-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
58+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
5959
with:
6060
sparse-checkout-cone-mode: false
6161
sparse-checkout: /.github

Diff for: .github/workflows/scorecards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: 'Checkout code'
35-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
35+
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
3636
with:
3737
persist-credentials: false
3838

@@ -67,6 +67,6 @@ jobs:
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: 'Upload to code-scanning'
70-
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v2.1.27
70+
uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v2.1.27
7171
with:
7272
sarif_file: results.sarif

Diff for: .github/workflows/spec_guards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ jobs:
4545
- ruby-3.3
4646

4747
steps:
48-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
48+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
4949

50-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
50+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
5151
with:
5252
ruby-version: ${{ matrix.ruby }}
5353
bundler: none

Diff for: .github/workflows/ubuntu.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
configure: '--disable-yjit'
3434
- test_task: check
3535
configure: '--enable-shared --enable-load-relative'
36+
- test_task: check
37+
configure: '--with-shared-gc'
3638
- test_task: test-bundler-parallel
3739
- test_task: test-bundled-gems
3840
- test_task: check
@@ -56,7 +58,7 @@ jobs:
5658
)}}
5759
5860
steps:
59-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
61+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
6062
with:
6163
sparse-checkout-cone-mode: false
6264
sparse-checkout: /.github
@@ -65,7 +67,7 @@ jobs:
6567
with:
6668
arch: ${{ matrix.arch }}
6769

68-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
70+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
6971
with:
7072
ruby-version: '3.0'
7173
bundler: none

Diff for: .github/workflows/wasm.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
)}}
6262
6363
steps:
64-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
64+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
6565
with:
6666
sparse-checkout-cone-mode: false
6767
sparse-checkout: /.github
@@ -100,7 +100,7 @@ jobs:
100100
run: |
101101
echo "WASI_SDK_PATH=/opt/wasi-sdk" >> $GITHUB_ENV
102102
103-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
103+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
104104
with:
105105
ruby-version: '3.0'
106106
bundler: none
@@ -136,7 +136,7 @@ jobs:
136136
- run: tar cfz ../install.tar.gz -C ../install .
137137

138138
- name: Upload artifacts
139-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
139+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
140140
with:
141141
name: ruby-wasm-install
142142
path: ${{ github.workspace }}/install.tar.gz
@@ -164,7 +164,7 @@ jobs:
164164
- name: Save Pull Request number
165165
if: ${{ github.event_name == 'pull_request' }}
166166
run: echo "${{ github.event.pull_request.number }}" >> ${{ github.workspace }}/github-pr-info.txt
167-
- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
167+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
168168
if: ${{ github.event_name == 'pull_request' }}
169169
with:
170170
name: github-pr-info

Diff for: .github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
${{ steps.find-tools.outputs.needs }}
9292
if: ${{ steps.find-tools.outputs.needs != '' }}
9393

94-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
94+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
9595
with:
9696
ruby-version: '3.0'
9797
bundler: none
@@ -123,7 +123,7 @@ jobs:
123123
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
124124
shell: pwsh
125125

126-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
126+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
127127
with:
128128
sparse-checkout-cone-mode: false
129129
sparse-checkout: /.github

Diff for: .github/workflows/yjit-macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
)}}
3838
3939
steps:
40-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
40+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
4141

4242
- run: RUST_BACKTRACE=1 cargo test
4343
working-directory: yjit
@@ -79,7 +79,7 @@ jobs:
7979
)}}
8080
8181
steps:
82-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
82+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
8383
with:
8484
sparse-checkout-cone-mode: false
8585
sparse-checkout: /.github

Diff for: .github/workflows/yjit-ubuntu.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
)}}
3737
3838
steps:
39-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
39+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
4040

4141
# For now we can't run cargo test --offline because it complains about the
4242
# capstone dependency, even though the dependency is optional
@@ -68,7 +68,7 @@ jobs:
6868
)}}
6969
7070
steps:
71-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
71+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
7272

7373
# Check that we don't have linting errors in release mode, too
7474
- run: cargo clippy --all-targets --all-features
@@ -125,7 +125,7 @@ jobs:
125125
)}}
126126
127127
steps:
128-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
128+
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
129129
with:
130130
sparse-checkout-cone-mode: false
131131
sparse-checkout: /.github
@@ -145,7 +145,7 @@ jobs:
145145
if: ${{ matrix.rust_version }}
146146
run: rustup install ${{ matrix.rust_version }} --profile minimal
147147

148-
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # v1.173.0
148+
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
149149
with:
150150
ruby-version: '3.0'
151151
bundler: none
@@ -182,7 +182,7 @@ jobs:
182182
make -s -j ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
183183
RUN_OPTS="$RUN_OPTS" MSPECOPT=--debug
184184
YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" YJIT_BINDGEN_DIFF_OPTS="$YJIT_BINDGEN_DIFF_OPTS"
185-
timeout-minutes: 60
185+
timeout-minutes: 90
186186
env:
187187
RUBY_TESTOPTS: '-q --tty=no'
188188
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ lcov*.info
263263
/lib/prism/dsl.rb
264264
/lib/prism/mutation_compiler.rb
265265
/lib/prism/node.rb
266+
/lib/prism/reflection.rb
266267
/lib/prism/serialize.rb
267268
/lib/prism/visitor.rb
268269
/prism/api_node.c

0 commit comments

Comments
 (0)