Skip to content

Commit 321d17a

Browse files
borsBLANKatGITHUB
bors
authored and
BLANKatGITHUB
committed
Auto merge of rust-lang#133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee
Rollup of 7 pull requests Successful merges: - rust-lang#131304 (float types: move copysign, abs, signum to libcore) - rust-lang#132907 (Change intrinsic declarations to new style) - rust-lang#132971 (Handle infer vars in anon consts on stable) - rust-lang#133003 (Make `CloneToUninit` dyn-compatible) - rust-lang#133004 (btree: simplify the backdoor between set and map) - rust-lang#133008 (update outdated comment about test-float-parse) - rust-lang#133012 (Add test cases for rust-lang#125918) r? `@ghost` `@rustbot` modify labels: rollup
1 parent a4cedec commit 321d17a

File tree

12 files changed

+49
-5
lines changed

12 files changed

+49
-5
lines changed

‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -882,12 +882,10 @@ extern "C" LLVMRustResult LLVMRustOptimize(
882882
SanitizerOptions->SanitizeKernelAddress) {
883883
OptimizerLastEPCallbacks.push_back(
884884
#if LLVM_VERSION_GE(20, 0)
885-
[SanitizerOptions, TM](ModulePassManager &MPM,
886-
OptimizationLevel Level,
887-
ThinOrFullLTOPhase phase) {
885+
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level,
886+
ThinOrFullLTOPhase phase) {
888887
#else
889-
[SanitizerOptions, TM](ModulePassManager &MPM,
890-
OptimizationLevel Level) {
888+
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level) {
891889
#endif
892890
auto CompileKernel = SanitizerOptions->SanitizeKernelAddress;
893891
AddressSanitizerOptions opts = AddressSanitizerOptions{
@@ -897,12 +895,16 @@ extern "C" LLVMRustResult LLVMRustOptimize(
897895
/*UseAfterScope=*/true,
898896
AsanDetectStackUseAfterReturnMode::Runtime,
899897
};
898+
<<<<<<< HEAD
900899
MPM.addPass(AddressSanitizerPass(
901900
opts,
902901
/*UseGlobalGC*/ true,
903902
// UseOdrIndicator should be false on windows machines
904903
// https://reviews.llvm.org/D137227
905904
!TM->getTargetTriple().isOSWindows()));
905+
=======
906+
MPM.addPass(AddressSanitizerPass(opts));
907+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
906908
});
907909
}
908910
if (SanitizerOptions->SanitizeHWAddress) {

‎library/std/src/os/nuttx/raw.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
//! NuttX raw type definitions
3+
=======
4+
//! rtems raw type definitions
5+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
26

37
#![stable(feature = "raw_ext", since = "1.1.0")]
48
#![deprecated(

‎src/ci/run.sh

+4
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,16 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNE
115115
if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
116116
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
117117
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.remap-debuginfo"
118+
<<<<<<< HEAD
118119

119120
if [ "$DEPLOY_ALT" != "" ]; then
120121
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level=2"
121122
else
122123
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level-std=1"
123124
fi
125+
=======
126+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level-std=1"
127+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
124128

125129
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
126130
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"

‎src/tools/compiletest/src/directive-list.rs

+3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,10 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
120120
"incremental",
121121
"known-bug",
122122
"llvm-cov-flags",
123+
<<<<<<< HEAD
123124
"max-llvm-major-version",
125+
=======
126+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
124127
"min-cdb-version",
125128
"min-gdb-version",
126129
"min-lldb-version",

‎src/tools/compiletest/src/header.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,7 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision {
15471547
};
15481548
}
15491549
} else if let Some(version_string) =
1550+
<<<<<<< HEAD
15501551
config.parse_name_value_directive(line, "max-llvm-major-version")
15511552
{
15521553
let max_version = extract_llvm_version(&version_string);
@@ -1561,6 +1562,8 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision {
15611562
};
15621563
}
15631564
} else if let Some(version_string) =
1565+
=======
1566+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
15641567
config.parse_name_value_directive(line, "min-system-llvm-version")
15651568
{
15661569
let min_version = extract_llvm_version(&version_string);

‎src/tools/compiletest/src/header/tests.rs

+3
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ fn llvm_version() {
299299

300300
let config: Config = cfg().llvm_version("10.6.2").build();
301301
assert!(!check_ignore(&config, "//@ exact-llvm-major-version: 10"));
302+
<<<<<<< HEAD
302303

303304
let config: Config = cfg().llvm_version("19.0.0").build();
304305
assert!(!check_ignore(&config, "//@ max-llvm-major-version: 19"));
@@ -308,6 +309,8 @@ fn llvm_version() {
308309

309310
let config: Config = cfg().llvm_version("20.0.0").build();
310311
assert!(check_ignore(&config, "//@ max-llvm-major-version: 19"));
312+
=======
313+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
311314
}
312315

313316
#[test]

‎src/tools/tidy/src/known_bug.rs

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::walk::*;
66

77
pub fn check(filepath: &Path, bad: &mut bool) {
88
walk(filepath, |path, _is_dir| filter_not_rust(path), &mut |entry, contents| {
9+
<<<<<<< HEAD
910
let file: &Path = entry.path();
1011

1112
// files in "auxiliary" do not need to crash by themselves
@@ -22,6 +23,10 @@ pub fn check(filepath: &Path, bad: &mut bool) {
2223
_aux_file_rs
2324
]) && !contents.lines().any(|line| line.starts_with("//@ known-bug: "))
2425
{
26+
=======
27+
let file = entry.path();
28+
if !contents.lines().any(|line| line.starts_with("//@ known-bug: ")) {
29+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
2530
tidy_error!(
2631
bad,
2732
"{} crash/ice test does not have a \"//@ known-bug: \" directive",

‎tests/assembly/riscv-soft-abi-with-float-features.rs

+4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
//@ compile-flags: --target riscv64imac-unknown-none-elf -Ctarget-feature=+f,+d
33
//@ needs-llvm-components: riscv
44
//@ revisions: LLVM-PRE-20 LLVM-POST-20
5+
<<<<<<< HEAD
56
//@ [LLVM-PRE-20] max-llvm-major-version: 19
7+
=======
8+
//@ [LLVM-PRE-20] ignore-llvm-version: 20 - 99
9+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
610
//@ [LLVM-POST-20] min-llvm-version: 20
711

812
#![feature(no_core, lang_items, f16)]

‎tests/assembly/x86_64-cmp.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
//@ revisions: DEBUG LLVM-PRE-20-OPTIM LLVM-20-OPTIM
22
//@ [DEBUG] compile-flags: -C opt-level=0
33
//@ [LLVM-PRE-20-OPTIM] compile-flags: -C opt-level=3
4+
<<<<<<< HEAD
45
//@ [LLVM-PRE-20-OPTIM] max-llvm-major-version: 19
6+
=======
7+
//@ [LLVM-PRE-20-OPTIM] ignore-llvm-version: 20 - 99
8+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
59
//@ [LLVM-20-OPTIM] compile-flags: -C opt-level=3
610
//@ [LLVM-20-OPTIM] min-llvm-version: 20
711
//@ assembly-output: emit-asm

‎tests/codegen/branch-protection-old-llvm.rs

+4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
//@ [LEAF] compile-flags: -Z branch-protection=pac-ret,leaf
88
//@ [BKEY] compile-flags: -Z branch-protection=pac-ret,b-key
99
//@ compile-flags: --target aarch64-unknown-linux-gnu
10+
<<<<<<< HEAD
1011
//@ max-llvm-major-version: 18
12+
=======
13+
//@ ignore-llvm-version: 19 - 99
14+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
1115

1216
#![crate_type = "lib"]
1317
#![feature(no_core, lang_items)]

‎tests/codegen/call-metadata.rs

+4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
// scalar value.
33

44
//@ compile-flags: -O -C no-prepopulate-passes
5+
<<<<<<< HEAD
56
//@ max-llvm-major-version: 18
7+
=======
8+
//@ ignore-llvm-version: 19 - 99
9+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
610

711
#![crate_type = "lib"]
812

‎tests/codegen/integer-cmp.rs

+4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
//@ revisions: llvm-pre-20 llvm-20
55
//@ [llvm-20] min-llvm-version: 20
6+
<<<<<<< HEAD
67
//@ [llvm-pre-20] max-llvm-major-version: 19
8+
=======
9+
//@ [llvm-pre-20] ignore-llvm-version: 20 - 99
10+
>>>>>>> dae7ac13 (Auto merge of #133026 - workingjubilee:rollup-q8ig6ah, r=workingjubilee)
711
//@ compile-flags: -C opt-level=3
812

913
#![crate_type = "lib"]

0 commit comments

Comments
 (0)