Skip to content

Commit 46ecc10

Browse files
committedNov 20, 2023
Auto merge of #118082 - compiler-errors:rollup-ejsc8yd, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #117828 (Avoid iterating over hashmaps in astconv) - #117832 (interpret: simplify handling of shifts by no longer trying to handle signed and unsigned shift amounts in the same branch) - #117891 (Recover `dyn` and `impl` after `for<...>`) - #117957 (if available use a Child's pidfd for kill/wait) - #117988 (Handle attempts to have multiple `cfg`d tail expressions) - #117994 (Ignore but do not assume region obligations from unifying headers in negative coherence) - #118000 (Make regionck care about placeholders in outlives components) - #118068 (subtree update cg_gcc 2023/11/17) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 79e961f + 791ed33 commit 46ecc10

File tree

54 files changed

+795
-147
lines changed

Some content is hidden

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

54 files changed

+795
-147
lines changed
 

‎compiler/rustc_codegen_gcc/.github/workflows/ci.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ jobs:
9999
- name: Build
100100
run: |
101101
./y.sh prepare --only-libcore
102-
./y.sh build
103-
cargo test
102+
# TODO: remove --features master when it is back to the default.
103+
./y.sh build --features master
104+
# TODO: remove --features master when it is back to the default.
105+
cargo test --features master
104106
./clean_all.sh
105107
106108
- name: Prepare dependencies
@@ -121,7 +123,8 @@ jobs:
121123

122124
- name: Run tests
123125
run: |
124-
./test.sh --release --clean --build-sysroot ${{ matrix.commands }}
126+
# TODO: remove --features master when it is back to the default.
127+
./test.sh --features master --release --clean --build-sysroot ${{ matrix.commands }}
125128
126129
duplicates:
127130
runs-on: ubuntu-latest

‎compiler/rustc_codegen_gcc/.github/workflows/failures.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ jobs:
2121
libgccjit_version:
2222
- gcc: "libgccjit.so"
2323
artifacts_branch: "master"
24+
# TODO: switch back to --no-default-features in the case of libgccjit 12 when the default is to enable
25+
# master again.
26+
extra: "--features master"
2427
- gcc: "libgccjit_without_int128.so"
2528
artifacts_branch: "master-without-128bit-integers"
29+
extra: "--features master"
2630
- gcc: "libgccjit12.so"
2731
artifacts_branch: "gcc12"
28-
extra: "--no-default-features"
2932
# FIXME(antoyo): we need to set GCC_EXEC_PREFIX so that the linker can find the linker plugin.
3033
# Not sure why it's not found otherwise.
3134
env_extra: "TEST_FLAGS='-Cpanic=abort -Zpanic-abort-tests' GCC_EXEC_PREFIX=/usr/lib/gcc/"

0 commit comments

Comments
 (0)
Please sign in to comment.