Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit bdb8cb4

Browse files
committed
Auto merge of rust-lang#118078 - compiler-errors:rollup-8ln8dvl, r=compiler-errors
Rollup of 8 pull requests Successful merges: - rust-lang#115526 (Add arm64e-apple-ios & arm64e-apple-darwin targets) - rust-lang#115691 (Add `$message_type` field to distinguish json diagnostic outputs) - rust-lang#117828 (Avoid iterating over hashmaps in astconv) - rust-lang#117832 (interpret: simplify handling of shifts by no longer trying to handle signed and unsigned shift amounts in the same branch) - rust-lang#117891 (Recover `dyn` and `impl` after `for<...>`) - rust-lang#117957 (if available use a Child's pidfd for kill/wait) - rust-lang#117994 (Ignore but do not assume region obligations from unifying headers in negative coherence) - rust-lang#118068 (subtree update cg_gcc 2023/11/17) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4f3da90 + ad735c9 commit bdb8cb4

File tree

64 files changed

+713
-219
lines changed

Some content is hidden

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

64 files changed

+713
-219
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,9 +2591,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
25912591

25922592
[[package]]
25932593
name = "object"
2594-
version = "0.32.0"
2594+
version = "0.32.1"
25952595
source = "registry+https://github.com/rust-lang/crates.io-index"
2596-
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
2596+
checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
25972597
dependencies = [
25982598
"compiler_builtins",
25992599
"crc32fast",

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

Lines changed: 6 additions & 3 deletions
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

Lines changed: 4 additions & 1 deletion
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/"

compiler/rustc_codegen_gcc/.github/workflows/m68k.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,10 @@ jobs:
114114
- name: Build
115115
run: |
116116
./y.sh prepare --only-libcore --cross
117-
./y.sh build --target-triple m68k-unknown-linux-gnu
118-
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test
117+
# TODO: remove --features master when it is back to the default.
118+
./y.sh build --target-triple m68k-unknown-linux-gnu --features master
119+
# TODO: remove --features master when it is back to the default.
120+
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test --features master
119121
./clean_all.sh
120122
121123
- name: Prepare dependencies
@@ -136,4 +138,5 @@ jobs:
136138

137139
- name: Run tests
138140
run: |
139-
./test.sh --release --clean --build-sysroot ${{ matrix.commands }}
141+
# TODO: remove --features master when it is back to the default.
142+
./test.sh --release --features master --clean --build-sysroot ${{ matrix.commands }}

compiler/rustc_codegen_gcc/.github/workflows/release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ jobs:
7878
- name: Build
7979
run: |
8080
./y.sh prepare --only-libcore
81-
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot
82-
cargo test
81+
# TODO: remove --features master when it is back to the default.
82+
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot --features master
83+
# TODO: remove --features master when it is back to the default.
84+
cargo test --features master
8385
./clean_all.sh
8486
8587
- name: Prepare dependencies
@@ -102,4 +104,5 @@ jobs:
102104

103105
- name: Run tests
104106
run: |
105-
EMBED_LTO_BITCODE=1 ./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }}
107+
# TODO: remove --features master when it is back to the default.
108+
EMBED_LTO_BITCODE=1 ./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }} --features master

compiler/rustc_codegen_gcc/.github/workflows/stdarch.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ jobs:
9292
- name: Build
9393
run: |
9494
./y.sh prepare --only-libcore
95-
./y.sh build --release --release-sysroot
96-
cargo test
95+
# TODO: remove `--features master` when it is back to the default.
96+
./y.sh build --release --release-sysroot --features master
97+
# TODO: remove --features master when it is back to the default.
98+
cargo test --features master
9799
98100
- name: Clean
99101
if: ${{ !matrix.cargo_runner }}
@@ -111,12 +113,14 @@ jobs:
111113
uses: actions-rs/[email protected]
112114
with:
113115
command: build
114-
args: --release
116+
# TODO: remove `--features master` when it is back to the default.
117+
args: --release --features master
115118

116119
- name: Run tests
117120
if: ${{ !matrix.cargo_runner }}
118121
run: |
119-
./test.sh --release --clean --release-sysroot --build-sysroot --mini-tests --std-tests --test-libcore
122+
# TODO: remove `--features master` when it is back to the default.
123+
./test.sh --release --clean --release-sysroot --build-sysroot --mini-tests --std-tests --test-libcore --features master
120124
121125
- name: Run stdarch tests
122126
if: ${{ !matrix.cargo_runner }}

compiler/rustc_codegen_gcc/Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ dependencies = [
7474
[[package]]
7575
name = "gccjit"
7676
version = "1.0.0"
77-
source = "git+https://github.com/antoyo/gccjit.rs#c52a218f5529321285b4489e5562a00e5428e033"
77+
source = "git+https://github.com/antoyo/gccjit.rs#6e290f25b1d1edab5ae9ace486fd2dc8c08d6421"
7878
dependencies = [
7979
"gccjit_sys",
8080
]
8181

8282
[[package]]
8383
name = "gccjit_sys"
8484
version = "0.0.1"
85-
source = "git+https://github.com/antoyo/gccjit.rs#c52a218f5529321285b4489e5562a00e5428e033"
85+
source = "git+https://github.com/antoyo/gccjit.rs#6e290f25b1d1edab5ae9ace486fd2dc8c08d6421"
8686
dependencies = [
8787
"libc",
8888
]

compiler/rustc_codegen_gcc/build_sysroot/build_sysroot.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ fi
2828
# Copy files to sysroot
2929
mkdir -p sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
3030
cp -r target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
31+
# Copy the source files to the sysroot (Rust for Linux needs this).
32+
source_dir=sysroot/lib/rustlib/src/rust
33+
mkdir -p $source_dir
34+
cp -r sysroot_src/library/ $source_dir

compiler/rustc_codegen_gcc/build_system/src/build.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@ fn build_sysroot(
194194
copier,
195195
)?;
196196

197+
// Copy the source files to the sysroot (Rust for Linux needs this).
198+
let sysroot_src_path = "sysroot/lib/rustlib/src/rust";
199+
fs::create_dir_all(&sysroot_src_path)
200+
.map_err(|error| format!("Failed to create directory `{}`: {:?}", sysroot_src_path, error))?;
201+
run_command(&[&"cp", &"-r", &"sysroot_src/library/", &sysroot_src_path], None)?;
202+
197203
Ok(())
198204
}
199205

compiler/rustc_codegen_gcc/failing-ui-tests12.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ tests/ui/target-feature/missing-plusminus.rs
3838
tests/ui/sse2.rs
3939
tests/ui/codegen/issue-79865-llvm-miscompile.rs
4040
tests/ui/intrinsics/intrinsics-integer.rs
41+
tests/ui/std-backtrace.rs
42+
tests/ui/mir/alignment/packed.rs

0 commit comments

Comments
 (0)