Skip to content

Commit c073f56

Browse files
borsbors
committed
Auto merge of rust-lang#120395 - bjorn3:sync_cg_clif-2024-01-26, r=bjorn3
Subtree sync for rustc_codegen_cranelift A couple of fixes as well as an update to Cranelift 0.104, which includes a fix for the ABI of `Option<u128>`. r? `@ghost` `@rustbot` label +A-codegen +A-cranelift +T-compiler
2 parents e7bbe8c + 3701802 commit c073f56

24 files changed

+434
-323
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
TARGET_TRIPLE: x86_64-pc-windows-gnu
3434

3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737

3838
- name: CPU features
3939
if: matrix.os == 'ubuntu-latest'
4040
run: cat /proc/cpuinfo
4141

4242
- name: Cache cargo target dir
43-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4444
with:
4545
path: build/cg_clif
4646
key: ${{ runner.os }}-${{ matrix.env.TARGET_TRIPLE }}-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
audit:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- run: |
1515
sed -i 's/components.*/components = []/' rust-toolchain
1616
echo 'profile = "minimal"' >> rust-toolchain

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
timeout-minutes: 10
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Avoid installing rustc-dev
1616
run: |
@@ -64,14 +64,14 @@ jobs:
6464
TARGET_TRIPLE: x86_64-pc-windows-gnu
6565

6666
steps:
67-
- uses: actions/checkout@v3
67+
- uses: actions/checkout@v4
6868

6969
- name: CPU features
7070
if: matrix.os == 'ubuntu-latest'
7171
run: cat /proc/cpuinfo
7272

7373
- name: Cache cargo target dir
74-
uses: actions/cache@v3
74+
uses: actions/cache@v4
7575
with:
7676
path: build/cg_clif
7777
key: ${{ runner.os }}-${{ matrix.env.TARGET_TRIPLE }}-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}
@@ -138,7 +138,7 @@ jobs:
138138
shell: bash
139139

140140
steps:
141-
- uses: actions/checkout@v3
141+
- uses: actions/checkout@v4
142142

143143
- name: CPU features
144144
run: cat /proc/cpuinfo
@@ -164,13 +164,13 @@ jobs:
164164
shell: bash
165165

166166
steps:
167-
- uses: actions/checkout@v3
167+
- uses: actions/checkout@v4
168168

169169
- name: CPU features
170170
run: cat /proc/cpuinfo
171171

172172
- name: Cache cargo target dir
173-
uses: actions/cache@v3
173+
uses: actions/cache@v4
174174
with:
175175
path: build/cg_clif
176176
key: ${{ runner.os }}-x86_64-unknown-linux-gnu-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}
@@ -221,10 +221,10 @@ jobs:
221221
TARGET_TRIPLE: x86_64-pc-windows-gnu
222222

223223
steps:
224-
- uses: actions/checkout@v3
224+
- uses: actions/checkout@v4
225225

226226
- name: Cache cargo target dir
227-
uses: actions/cache@v3
227+
uses: actions/cache@v4
228228
with:
229229
path: build/cg_clif
230230
key: ${{ runner.os }}-${{ matrix.env.TARGET_TRIPLE }}-dist-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}
@@ -276,7 +276,7 @@ jobs:
276276
cancel-in-progress: true
277277

278278
steps:
279-
- uses: actions/checkout@v3
279+
- uses: actions/checkout@v4
280280

281281
- name: Download all built artifacts
282282
uses: actions/download-artifact@v4

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
timeout-minutes: 60
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313

1414
- name: CPU features
1515
run: cat /proc/cpuinfo
1616

1717
- name: Cache cargo target dir
18-
uses: actions/cache@v3
18+
uses: actions/cache@v4
1919
with:
2020
path: build/cg_clif
2121
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}
@@ -32,13 +32,13 @@ jobs:
3232
timeout-minutes: 60
3333

3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636

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

4040
- name: Cache cargo target dir
41-
uses: actions/cache@v3
41+
uses: actions/cache@v4
4242
with:
4343
path: build/cg_clif
4444
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}

‎compiler/rustc_codegen_cranelift/.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33

4-
// source for rustc_* is not included in the rust-src component; disable the errors about this
4+
// in case rustc.source is disabled for performance reasons; disable the errors about this
55
"rust-analyzer.diagnostics.disabled": ["unresolved-extern-crate", "unresolved-macro-call"],
6+
"rust-analyzer.rustc.source": "discover",
67
"rust-analyzer.imports.granularity.enforce": true,
78
"rust-analyzer.imports.granularity.group": "module",
89
"rust-analyzer.imports.prefix": "crate",

0 commit comments

Comments
 (0)