Skip to content

Commit 212ef77

Browse files
committed
Auto merge of #154366 - bjorn3:sync_cg_clif-2026-03-25, r=bjorn3
Subtree sync for rustc_codegen_cranelift The main highlights this time are a bunch of inline asm fixes for graviola and a Cranelift update. r? @ghost @rustbot label +A-codegen +A-cranelift +T-compiler +subtree-sync
2 parents 64d5cb6 + d7f7241 commit 212ef77

21 files changed

Lines changed: 388 additions & 215 deletions

compiler/rustc_codegen_cranelift/.github/workflows/abi-cafe.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# TARGET_TRIPLE: x86_64-pc-windows-gnu
4444

4545
steps:
46-
- uses: actions/checkout@v4
46+
- uses: actions/checkout@v6
4747

4848
- name: CPU features
4949
if: matrix.os == 'ubuntu-latest'
@@ -56,7 +56,7 @@ jobs:
5656
run: .github/scripts/free-disk-space.sh
5757

5858
- name: Cache cargo target dir
59-
uses: actions/cache@v4
59+
uses: actions/cache@v5
6060
with:
6161
path: build/cg_clif
6262
key: ${{ runner.os }}-${{ matrix.env.TARGET_TRIPLE }}-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}

compiler/rustc_codegen_cranelift/.github/workflows/audit.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

compiler/rustc_codegen_cranelift/.github/workflows/main.yml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,22 @@ env:
1919
RUSTFLAGS: "-Dwarnings"
2020

2121
jobs:
22+
todo_check:
23+
runs-on: ubuntu-latest
24+
timeout-minutes: 10
25+
26+
steps:
27+
- uses: actions/checkout@v6
28+
29+
- name: Check todo
30+
run: ./y.sh check-todo
31+
2232
rustfmt:
2333
runs-on: ubuntu-latest
2434
timeout-minutes: 10
2535

2636
steps:
27-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
2838

2939
- name: Avoid installing rustc-dev
3040
run: |
@@ -78,14 +88,14 @@ jobs:
7888
TARGET_TRIPLE: x86_64-pc-windows-gnu
7989

8090
steps:
81-
- uses: actions/checkout@v4
91+
- uses: actions/checkout@v6
8292

8393
- name: CPU features
8494
if: matrix.os == 'ubuntu-latest'
8595
run: cat /proc/cpuinfo
8696

8797
- name: Cache cargo target dir
88-
uses: actions/cache@v4
98+
uses: actions/cache@v5
8999
with:
90100
path: build/cg_clif
91101
key: ${{ runner.os }}-${{ matrix.env.TARGET_TRIPLE }}-cargo-build-target-${{ hashFiles('rust-toolchain.toml', '**/Cargo.lock') }}
@@ -127,7 +137,7 @@ jobs:
127137
timeout-minutes: 60
128138

129139
steps:
130-
- uses: actions/checkout@v4
140+
- uses: actions/checkout@v6
131141

132142
- name: CPU features
133143
run: cat /proc/cpuinfo
@@ -149,13 +159,13 @@ jobs:
149159
timeout-minutes: 60
150160

151161
steps:
152-
- uses: actions/checkout@v4
162+
- uses: actions/checkout@v6
153163

154164
- name: CPU features
155165
run: cat /proc/cpuinfo
156166

157167
- name: Cache cargo target dir
158-
uses: actions/cache@v4
168+
uses: actions/cache@v5
159169
with:
160170
path: build/cg_clif
161171
key: ${{ runner.os }}-x86_64-unknown-linux-gnu-cargo-build-target-${{ hashFiles('rust-toolchain.toml', '**/Cargo.lock') }}
@@ -201,10 +211,10 @@ jobs:
201211
TARGET_TRIPLE: x86_64-pc-windows-gnu
202212

203213
steps:
204-
- uses: actions/checkout@v4
214+
- uses: actions/checkout@v6
205215

206216
- name: Cache cargo target dir
207-
uses: actions/cache@v4
217+
uses: actions/cache@v5
208218
with:
209219
path: build/cg_clif
210220
key: ${{ runner.os }}-${{ matrix.env.TARGET_TRIPLE }}-dist-cargo-build-target-${{ hashFiles('rust-toolchain.toml', '**/Cargo.lock') }}
@@ -223,7 +233,7 @@ jobs:
223233
run: tar cvfJ cg_clif.tar.xz dist
224234

225235
- name: Upload prebuilt cg_clif
226-
uses: actions/upload-artifact@v4
236+
uses: actions/upload-artifact@v6
227237
with:
228238
name: cg_clif-${{ matrix.env.TARGET_TRIPLE }}
229239
path: cg_clif.tar.xz
@@ -232,7 +242,7 @@ jobs:
232242
runs-on: ubuntu-latest
233243
timeout-minutes: 10
234244
if: ${{ github.ref == 'refs/heads/main' }}
235-
needs: [rustfmt, test, bench, dist]
245+
needs: [todo_check, rustfmt, test, bench, dist]
236246

237247
permissions:
238248
contents: write # for creating the dev tag and release
@@ -242,7 +252,7 @@ jobs:
242252
cancel-in-progress: true
243253

244254
steps:
245-
- uses: actions/checkout@v4
255+
- uses: actions/checkout@v6
246256

247257
- name: Download all built artifacts
248258
uses: actions/download-artifact@v4

compiler/rustc_codegen_cranelift/.github/workflows/rustc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
timeout-minutes: 60
1212

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515

1616
- name: CPU features
1717
run: cat /proc/cpuinfo
1818

1919
- name: Cache cargo target dir
20-
uses: actions/cache@v4
20+
uses: actions/cache@v5
2121
with:
2222
path: build/cg_clif
2323
key: ${{ runner.os }}-rustc-test-cargo-build-target-${{ hashFiles('rust-toolchain.toml', 'Cargo.lock') }}
@@ -31,13 +31,13 @@ jobs:
3131
timeout-minutes: 60
3232

3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v6
3535

3636
- name: CPU features
3737
run: cat /proc/cpuinfo
3838

3939
- name: Cache cargo target dir
40-
uses: actions/cache@v4
40+
uses: actions/cache@v5
4141
with:
4242
path: build/cg_clif
4343
key: ${{ runner.os }}-rustc-test-cargo-build-target-${{ hashFiles('rust-toolchain.toml', 'Cargo.lock') }}

0 commit comments

Comments
 (0)