Skip to content

Commit 763ad52

Browse files
borsbors
committed
Auto merge of #131423 - cuviper:beta-next, r=cuviper
[beta] backports - Only add an automatic SONAME for Rust dylibs #130960 - Reject leading unsafe in `cfg!(...)` and `--check-cfg` #131057, resolving #131055 - Disable jump threading `UnOp::Not` for non-bool #131201 - Update LLVM submodule #131448 - Split x86_64-msvc-ext into two jobs #130072 - Use a small runner for msvc-ext2 job #130151 r? ghost
2 parents 6a3b69c + 1439844 commit 763ad52

File tree

17 files changed

+252
-33
lines changed

17 files changed

+252
-33
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/19.1-2024-07-30
36+
branch = rustc/19.1-2024-09-17
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

‎compiler/rustc_builtin_macros/src/cfg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn parse_cfg<'a>(cx: &ExtCtxt<'a>, span: Span, tts: TokenStream) -> PResult<'a,
4343
return Err(cx.dcx().create_err(errors::RequiresCfgPattern { span }));
4444
}
4545

46-
let cfg = p.parse_meta_item(AllowLeadingUnsafe::Yes)?;
46+
let cfg = p.parse_meta_item(AllowLeadingUnsafe::No)?;
4747

4848
let _ = p.eat(&token::Comma);
4949

‎compiler/rustc_codegen_ssa/src/back/link.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2493,7 +2493,7 @@ fn add_order_independent_options(
24932493
}
24942494
}
24952495

2496-
cmd.set_output_kind(link_output_kind, out_filename);
2496+
cmd.set_output_kind(link_output_kind, crate_type, out_filename);
24972497

24982498
add_relro_args(cmd, sess);
24992499

‎compiler/rustc_codegen_ssa/src/back/linker.rs

+69-14
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,12 @@ pub trait Linker {
266266
fn is_cc(&self) -> bool {
267267
false
268268
}
269-
fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path);
269+
fn set_output_kind(
270+
&mut self,
271+
output_kind: LinkOutputKind,
272+
crate_type: CrateType,
273+
out_filename: &Path,
274+
);
270275
fn link_dylib_by_name(&mut self, _name: &str, _verbatim: bool, _as_needed: bool) {
271276
bug!("dylib linked with unsupported linker")
272277
}
@@ -387,7 +392,7 @@ impl<'a> GccLinker<'a> {
387392
]);
388393
}
389394

390-
fn build_dylib(&mut self, out_filename: &Path) {
395+
fn build_dylib(&mut self, crate_type: CrateType, out_filename: &Path) {
391396
// On mac we need to tell the linker to let this library be rpathed
392397
if self.sess.target.is_like_osx {
393398
if !self.is_ld {
@@ -418,7 +423,7 @@ impl<'a> GccLinker<'a> {
418423
let mut out_implib = OsString::from("--out-implib=");
419424
out_implib.push(out_filename.with_file_name(implib_name));
420425
self.link_arg(out_implib);
421-
} else {
426+
} else if crate_type == CrateType::Dylib {
422427
// When dylibs are linked by a full path this value will get into `DT_NEEDED`
423428
// instead of the full path, so the library can be later found in some other
424429
// location than that specific path.
@@ -465,7 +470,12 @@ impl<'a> Linker for GccLinker<'a> {
465470
!self.is_ld
466471
}
467472

468-
fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) {
473+
fn set_output_kind(
474+
&mut self,
475+
output_kind: LinkOutputKind,
476+
crate_type: CrateType,
477+
out_filename: &Path,
478+
) {
469479
match output_kind {
470480
LinkOutputKind::DynamicNoPicExe => {
471481
if !self.is_ld && self.is_gnu {
@@ -500,10 +510,10 @@ impl<'a> Linker for GccLinker<'a> {
500510
self.link_args(&["-static", "-pie", "--no-dynamic-linker", "-z", "text"]);
501511
}
502512
}
503-
LinkOutputKind::DynamicDylib => self.build_dylib(out_filename),
513+
LinkOutputKind::DynamicDylib => self.build_dylib(crate_type, out_filename),
504514
LinkOutputKind::StaticDylib => {
505515
self.link_or_cc_arg("-static");
506-
self.build_dylib(out_filename);
516+
self.build_dylib(crate_type, out_filename);
507517
}
508518
LinkOutputKind::WasiReactorExe => {
509519
self.link_args(&["--entry", "_initialize"]);
@@ -859,7 +869,12 @@ impl<'a> Linker for MsvcLinker<'a> {
859869
&mut self.cmd
860870
}
861871

862-
fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) {
872+
fn set_output_kind(
873+
&mut self,
874+
output_kind: LinkOutputKind,
875+
_crate_type: CrateType,
876+
out_filename: &Path,
877+
) {
863878
match output_kind {
864879
LinkOutputKind::DynamicNoPicExe
865880
| LinkOutputKind::DynamicPicExe
@@ -1111,7 +1126,13 @@ impl<'a> Linker for EmLinker<'a> {
11111126
true
11121127
}
11131128

1114-
fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
1129+
fn set_output_kind(
1130+
&mut self,
1131+
_output_kind: LinkOutputKind,
1132+
_crate_type: CrateType,
1133+
_out_filename: &Path,
1134+
) {
1135+
}
11151136

11161137
fn link_dylib_by_name(&mut self, name: &str, _verbatim: bool, _as_needed: bool) {
11171138
// Emscripten always links statically
@@ -1260,7 +1281,12 @@ impl<'a> Linker for WasmLd<'a> {
12601281
&mut self.cmd
12611282
}
12621283

1263-
fn set_output_kind(&mut self, output_kind: LinkOutputKind, _out_filename: &Path) {
1284+
fn set_output_kind(
1285+
&mut self,
1286+
output_kind: LinkOutputKind,
1287+
_crate_type: CrateType,
1288+
_out_filename: &Path,
1289+
) {
12641290
match output_kind {
12651291
LinkOutputKind::DynamicNoPicExe
12661292
| LinkOutputKind::DynamicPicExe
@@ -1409,7 +1435,13 @@ impl<'a> Linker for L4Bender<'a> {
14091435
&mut self.cmd
14101436
}
14111437

1412-
fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
1438+
fn set_output_kind(
1439+
&mut self,
1440+
_output_kind: LinkOutputKind,
1441+
_crate_type: CrateType,
1442+
_out_filename: &Path,
1443+
) {
1444+
}
14131445

14141446
fn link_staticlib_by_name(&mut self, name: &str, _verbatim: bool, whole_archive: bool) {
14151447
self.hint_static();
@@ -1556,7 +1588,12 @@ impl<'a> Linker for AixLinker<'a> {
15561588
&mut self.cmd
15571589
}
15581590

1559-
fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) {
1591+
fn set_output_kind(
1592+
&mut self,
1593+
output_kind: LinkOutputKind,
1594+
_crate_type: CrateType,
1595+
out_filename: &Path,
1596+
) {
15601597
match output_kind {
15611598
LinkOutputKind::DynamicDylib => {
15621599
self.hint_dynamic();
@@ -1763,7 +1800,13 @@ impl<'a> Linker for PtxLinker<'a> {
17631800
&mut self.cmd
17641801
}
17651802

1766-
fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
1803+
fn set_output_kind(
1804+
&mut self,
1805+
_output_kind: LinkOutputKind,
1806+
_crate_type: CrateType,
1807+
_out_filename: &Path,
1808+
) {
1809+
}
17671810

17681811
fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) {
17691812
panic!("staticlibs not supported")
@@ -1829,7 +1872,13 @@ impl<'a> Linker for LlbcLinker<'a> {
18291872
&mut self.cmd
18301873
}
18311874

1832-
fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
1875+
fn set_output_kind(
1876+
&mut self,
1877+
_output_kind: LinkOutputKind,
1878+
_crate_type: CrateType,
1879+
_out_filename: &Path,
1880+
) {
1881+
}
18331882

18341883
fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) {
18351884
panic!("staticlibs not supported")
@@ -1900,7 +1949,13 @@ impl<'a> Linker for BpfLinker<'a> {
19001949
&mut self.cmd
19011950
}
19021951

1903-
fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
1952+
fn set_output_kind(
1953+
&mut self,
1954+
_output_kind: LinkOutputKind,
1955+
_crate_type: CrateType,
1956+
_out_filename: &Path,
1957+
) {
1958+
}
19041959

19051960
fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) {
19061961
panic!("staticlibs not supported")

‎compiler/rustc_interface/src/interface.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ pub(crate) fn parse_check_cfg(dcx: DiagCtxtHandle<'_>, specs: Vec<String>) -> Ch
174174
}
175175
};
176176

177-
let meta_item = match parser.parse_meta_item(AllowLeadingUnsafe::Yes) {
177+
let meta_item = match parser.parse_meta_item(AllowLeadingUnsafe::No) {
178178
Ok(meta_item) if parser.token == token::Eof => meta_item,
179179
Ok(..) => expected_error(),
180180
Err(err) => {

‎compiler/rustc_mir_transform/src/jump_threading.rs

+8
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,16 @@ impl<'tcx, 'a> TOFinder<'tcx, 'a> {
492492
}
493493
// Transfer the conditions on the copy rhs, after inversing polarity.
494494
Rvalue::UnaryOp(UnOp::Not, Operand::Move(place) | Operand::Copy(place)) => {
495+
if !place.ty(self.body, self.tcx).ty.is_bool() {
496+
// Constructing the conditions by inverting the polarity
497+
// of equality is only correct for bools. That is to say,
498+
// `!a == b` is not `a != b` for integers greater than 1 bit.
499+
return;
500+
}
495501
let Some(conditions) = state.try_get_idx(lhs, self.map) else { return };
496502
let Some(place) = self.map.find(place.as_ref()) else { return };
503+
// FIXME: I think This could be generalized to not bool if we
504+
// actually perform a logical not on the condition's value.
497505
let conds = conditions.map(self.arena, Condition::inv);
498506
state.insert_value_idx(place, conds, self.map);
499507
}

‎src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh

+10-5
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ case $HOST_TARGET in
5858
# Strangely, Linux targets do not work here. cargo always says
5959
# "error: cannot produce cdylib for ... as the target ... does not support these crate types".
6060
# Only run "pass" tests, which is quite a bit faster.
61-
python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass
62-
python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass
61+
#FIXME: Re-enable this once CI issues are fixed
62+
#python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass
63+
#python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass
6364
;;
6465
*)
6566
echo "FATAL: unexpected host $HOST_TARGET"
@@ -68,6 +69,10 @@ case $HOST_TARGET in
6869
esac
6970
# Also smoke-test `x.py miri`. This doesn't run any actual tests (that would take too long),
7071
# but it ensures that the crates build properly when tested with Miri.
71-
python3 "$X_PY" miri --stage 2 library/core --test-args notest
72-
python3 "$X_PY" miri --stage 2 library/alloc --test-args notest
73-
python3 "$X_PY" miri --stage 2 library/std --test-args notest
72+
73+
#FIXME: Re-enable this for msvc once CI issues are fixed
74+
if [ "$HOST_TARGET" != "x86_64-pc-windows-msvc" ]; then
75+
python3 "$X_PY" miri --stage 2 library/core --test-args notest
76+
python3 "$X_PY" miri --stage 2 library/alloc --test-args notest
77+
python3 "$X_PY" miri --stage 2 library/std --test-args notest
78+
fi

‎src/ci/github-actions/jobs.yml

+16
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ runners:
2424
os: macos-14
2525
<<: *base-job
2626

27+
- &job-windows
28+
os: windows-2022
29+
<<: *base-job
30+
2731
- &job-windows-8c
2832
os: windows-2022-8core-32gb
2933
<<: *base-job
@@ -373,6 +377,18 @@ auto:
373377
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
374378
<<: *job-windows-8c
375379

380+
# Temporary builder to workaround CI issues
381+
- image: x86_64-msvc-ext2
382+
env:
383+
SCRIPT: >
384+
python x.py test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass &&
385+
python x.py test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass &&
386+
python x.py miri --stage 2 library/core --test-args notest &&
387+
python x.py miri --stage 2 library/alloc --test-args notest &&
388+
python x.py miri --stage 2 library/std --test-args notest
389+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
390+
<<: *job-windows
391+
376392
# 32/64-bit MinGW builds.
377393
#
378394
# We are using MinGW with POSIX threads since LLVM requires

‎src/llvm-project

Submodule llvm-project updated 145 files

‎tests/mir-opt/jump_threading.bitwise_not.JumpThreading.panic-abort.diff

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
- // MIR for `bitwise_not` before JumpThreading
2+
+ // MIR for `bitwise_not` after JumpThreading
3+
4+
fn bitwise_not() -> i32 {
5+
let mut _0: i32;
6+
let mut _1: i32;
7+
let mut _2: bool;
8+
let mut _3: i32;
9+
let mut _4: i32;
10+
scope 1 {
11+
debug a => _1;
12+
}
13+
14+
bb0: {
15+
StorageLive(_1);
16+
_1 = const 0_i32;
17+
_1 = const 1_i32;
18+
StorageLive(_2);
19+
StorageLive(_3);
20+
StorageLive(_4);
21+
_4 = copy _1;
22+
_3 = Not(move _4);
23+
StorageDead(_4);
24+
_2 = Eq(move _3, const 0_i32);
25+
switchInt(move _2) -> [0: bb2, otherwise: bb1];
26+
}
27+
28+
bb1: {
29+
StorageDead(_3);
30+
_0 = const 1_i32;
31+
goto -> bb3;
32+
}
33+
34+
bb2: {
35+
StorageDead(_3);
36+
_0 = const 0_i32;
37+
goto -> bb3;
38+
}
39+
40+
bb3: {
41+
StorageDead(_2);
42+
StorageDead(_1);
43+
return;
44+
}
45+
}
46+

‎tests/mir-opt/jump_threading.bitwise_not.JumpThreading.panic-unwind.diff

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
- // MIR for `bitwise_not` before JumpThreading
2+
+ // MIR for `bitwise_not` after JumpThreading
3+
4+
fn bitwise_not() -> i32 {
5+
let mut _0: i32;
6+
let mut _1: i32;
7+
let mut _2: bool;
8+
let mut _3: i32;
9+
let mut _4: i32;
10+
scope 1 {
11+
debug a => _1;
12+
}
13+
14+
bb0: {
15+
StorageLive(_1);
16+
_1 = const 0_i32;
17+
_1 = const 1_i32;
18+
StorageLive(_2);
19+
StorageLive(_3);
20+
StorageLive(_4);
21+
_4 = copy _1;
22+
_3 = Not(move _4);
23+
StorageDead(_4);
24+
_2 = Eq(move _3, const 0_i32);
25+
switchInt(move _2) -> [0: bb2, otherwise: bb1];
26+
}
27+
28+
bb1: {
29+
StorageDead(_3);
30+
_0 = const 1_i32;
31+
goto -> bb3;
32+
}
33+
34+
bb2: {
35+
StorageDead(_3);
36+
_0 = const 0_i32;
37+
goto -> bb3;
38+
}
39+
40+
bb3: {
41+
StorageDead(_2);
42+
StorageDead(_1);
43+
return;
44+
}
45+
}
46+

0 commit comments

Comments
 (0)