Skip to content

Commit 69f11ff

Browse files
borsbors
committed
Auto merge of rust-lang#94628 - Dylan-DPC:rollup-v2slupe, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#94362 (Add well known values to `--check-cfg` implementation) - rust-lang#94577 (only disable SIMD for doctests in Miri (not for the stdlib build itself)) - rust-lang#94595 (Fix invalid `unresolved imports` errors for a single-segment import) - rust-lang#94596 (Delay bug in expr adjustment when check_expr is called multiple times) - rust-lang#94618 (Don't round stack size up for created threads in Windows) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5a7e4c6 + 629e7aa commit 69f11ff

File tree

24 files changed

+296
-34
lines changed

24 files changed

+296
-34
lines changed

‎compiler/rustc_interface/src/interface.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ pub fn parse_check_cfg(specs: Vec<String>) -> CheckCfg {
207207
"`values()` first argument must be a simple identifer"
208208
);
209209
}
210+
} else if args.is_empty() {
211+
cfg.well_known_values = true;
212+
continue 'specs;
210213
}
211214
}
212215
}

‎compiler/rustc_resolve/src/imports.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,9 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
720720
note: Vec::new(),
721721
suggestion: None,
722722
};
723-
errors.push((path, err));
723+
if path.contains("::") {
724+
errors.push((path, err))
725+
}
724726
}
725727
}
726728

‎compiler/rustc_session/src/config.rs

Lines changed: 110 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use rustc_data_structures::impl_stable_hash_via_hash;
1313

1414
use rustc_target::abi::{Align, TargetDataLayout};
1515
use rustc_target::spec::{LinkerFlavor, SplitDebuginfo, Target, TargetTriple, TargetWarnings};
16+
use rustc_target::spec::{PanicStrategy, SanitizerSet, TARGETS};
1617

1718
use rustc_serialize::json;
1819

@@ -1025,13 +1026,19 @@ pub fn to_crate_config(cfg: FxHashSet<(String, Option<String>)>) -> CrateConfig
10251026
pub struct CheckCfg<T = String> {
10261027
/// The set of all `names()`, if None no name checking is performed
10271028
pub names_valid: Option<FxHashSet<T>>,
1029+
/// Is well known values activated
1030+
pub well_known_values: bool,
10281031
/// The set of all `values()`
10291032
pub values_valid: FxHashMap<T, FxHashSet<T>>,
10301033
}
10311034

10321035
impl<T> Default for CheckCfg<T> {
10331036
fn default() -> Self {
1034-
CheckCfg { names_valid: Default::default(), values_valid: Default::default() }
1037+
CheckCfg {
1038+
names_valid: Default::default(),
1039+
values_valid: Default::default(),
1040+
well_known_values: false,
1041+
}
10351042
}
10361043
}
10371044

@@ -1047,6 +1054,7 @@ impl<T> CheckCfg<T> {
10471054
.iter()
10481055
.map(|(a, b)| (f(a), b.iter().map(|b| f(b)).collect()))
10491056
.collect(),
1057+
well_known_values: self.well_known_values,
10501058
}
10511059
}
10521060
}
@@ -1060,8 +1068,9 @@ pub fn to_crate_check_config(cfg: CheckCfg) -> CrateCheckConfig {
10601068

10611069
impl CrateCheckConfig {
10621070
/// Fills a `CrateCheckConfig` with well-known configuration names.
1063-
pub fn fill_well_known(&mut self) {
1064-
// NOTE: This should be kept in sync with `default_configuration`
1071+
fn fill_well_known_names(&mut self) {
1072+
// NOTE: This should be kept in sync with `default_configuration` and
1073+
// `fill_well_known_values`
10651074
const WELL_KNOWN_NAMES: &[Symbol] = &[
10661075
sym::unix,
10671076
sym::windows,
@@ -1086,11 +1095,106 @@ impl CrateCheckConfig {
10861095
sym::doctest,
10871096
sym::feature,
10881097
];
1098+
1099+
// We only insert well-known names if `names()` was activated
10891100
if let Some(names_valid) = &mut self.names_valid {
1090-
for &name in WELL_KNOWN_NAMES {
1091-
names_valid.insert(name);
1092-
}
1101+
names_valid.extend(WELL_KNOWN_NAMES);
1102+
}
1103+
}
1104+
1105+
/// Fills a `CrateCheckConfig` with well-known configuration values.
1106+
fn fill_well_known_values(&mut self) {
1107+
if !self.well_known_values {
1108+
return;
10931109
}
1110+
1111+
// NOTE: This should be kept in sync with `default_configuration` and
1112+
// `fill_well_known_names`
1113+
1114+
let panic_values = &PanicStrategy::all();
1115+
1116+
let atomic_values = &[
1117+
sym::ptr,
1118+
sym::integer(8usize),
1119+
sym::integer(16usize),
1120+
sym::integer(32usize),
1121+
sym::integer(64usize),
1122+
sym::integer(128usize),
1123+
];
1124+
1125+
let sanitize_values = SanitizerSet::all()
1126+
.into_iter()
1127+
.map(|sanitizer| Symbol::intern(sanitizer.as_str().unwrap()));
1128+
1129+
// No-values
1130+
for name in [
1131+
sym::unix,
1132+
sym::windows,
1133+
sym::debug_assertions,
1134+
sym::proc_macro,
1135+
sym::test,
1136+
sym::doc,
1137+
sym::doctest,
1138+
sym::target_thread_local,
1139+
] {
1140+
self.values_valid.entry(name).or_default();
1141+
}
1142+
1143+
// Pre-defined values
1144+
self.values_valid.entry(sym::panic).or_default().extend(panic_values);
1145+
self.values_valid.entry(sym::sanitize).or_default().extend(sanitize_values);
1146+
self.values_valid.entry(sym::target_has_atomic).or_default().extend(atomic_values);
1147+
self.values_valid
1148+
.entry(sym::target_has_atomic_load_store)
1149+
.or_default()
1150+
.extend(atomic_values);
1151+
self.values_valid
1152+
.entry(sym::target_has_atomic_equal_alignment)
1153+
.or_default()
1154+
.extend(atomic_values);
1155+
1156+
// Target specific values
1157+
for target in
1158+
TARGETS.iter().map(|target| Target::expect_builtin(&TargetTriple::from_triple(target)))
1159+
{
1160+
self.values_valid
1161+
.entry(sym::target_os)
1162+
.or_default()
1163+
.insert(Symbol::intern(&target.options.os));
1164+
self.values_valid
1165+
.entry(sym::target_family)
1166+
.or_default()
1167+
.extend(target.options.families.iter().map(|family| Symbol::intern(family)));
1168+
self.values_valid
1169+
.entry(sym::target_arch)
1170+
.or_default()
1171+
.insert(Symbol::intern(&target.arch));
1172+
self.values_valid
1173+
.entry(sym::target_endian)
1174+
.or_default()
1175+
.insert(Symbol::intern(&target.options.endian.as_str()));
1176+
self.values_valid
1177+
.entry(sym::target_env)
1178+
.or_default()
1179+
.insert(Symbol::intern(&target.options.env));
1180+
self.values_valid
1181+
.entry(sym::target_abi)
1182+
.or_default()
1183+
.insert(Symbol::intern(&target.options.abi));
1184+
self.values_valid
1185+
.entry(sym::target_vendor)
1186+
.or_default()
1187+
.insert(Symbol::intern(&target.options.vendor));
1188+
self.values_valid
1189+
.entry(sym::target_pointer_width)
1190+
.or_default()
1191+
.insert(sym::integer(target.pointer_width));
1192+
}
1193+
}
1194+
1195+
pub fn fill_well_known(&mut self) {
1196+
self.fill_well_known_names();
1197+
self.fill_well_known_values();
10941198
}
10951199

10961200
/// Fills a `CrateCheckConfig` with configuration names and values that are actually active.

‎compiler/rustc_span/src/symbol.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,7 @@ symbols! {
10631063
proc_macro_path_invoc,
10641064
profiler_builtins,
10651065
profiler_runtime,
1066+
ptr,
10661067
ptr_guaranteed_eq,
10671068
ptr_guaranteed_ne,
10681069
ptr_null,

‎compiler/rustc_target/src/spec/mod.rs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,16 @@ impl PanicStrategy {
186186
}
187187
}
188188

189-
pub fn desc_symbol(&self) -> Symbol {
189+
pub const fn desc_symbol(&self) -> Symbol {
190190
match *self {
191191
PanicStrategy::Unwind => sym::unwind,
192192
PanicStrategy::Abort => sym::abort,
193193
}
194194
}
195+
196+
pub const fn all() -> [Symbol; 2] {
197+
[Self::Abort.desc_symbol(), Self::Unwind.desc_symbol()]
198+
}
195199
}
196200

197201
impl ToJson for PanicStrategy {
@@ -614,7 +618,7 @@ impl SanitizerSet {
614618
/// Return sanitizer's name
615619
///
616620
/// Returns none if the flags is a set of sanitizers numbering not exactly one.
617-
fn as_str(self) -> Option<&'static str> {
621+
pub fn as_str(self) -> Option<&'static str> {
618622
Some(match self {
619623
SanitizerSet::ADDRESS => "address",
620624
SanitizerSet::CFI => "cfi",
@@ -2137,6 +2141,18 @@ impl Target {
21372141
))
21382142
}
21392143

2144+
/// Load a built-in target
2145+
pub fn expect_builtin(target_triple: &TargetTriple) -> Target {
2146+
match *target_triple {
2147+
TargetTriple::TargetTriple(ref target_triple) => {
2148+
load_builtin(target_triple).expect("built-in target")
2149+
}
2150+
TargetTriple::TargetPath(..) => {
2151+
panic!("built-in targets doens't support target-paths")
2152+
}
2153+
}
2154+
}
2155+
21402156
/// Search for a JSON file specifying the given target triple.
21412157
///
21422158
/// If none is found in `$RUST_TARGET_PATH`, look for a file called `target.json` inside the

‎compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
315315
}
316316
// FIXME: currently we never try to compose autoderefs
317317
// and ReifyFnPointer/UnsafeFnPointer, but we could.
318-
_ => bug!(
319-
"while adjusting {:?}, can't compose {:?} and {:?}",
320-
expr,
321-
entry.get(),
322-
adj
318+
_ => self.tcx.sess.delay_span_bug(
319+
expr.span,
320+
&format!(
321+
"while adjusting {:?}, can't compose {:?} and {:?}",
322+
expr,
323+
entry.get(),
324+
adj
325+
),
323326
),
324327
};
325328
*entry.get_mut() = adj;

‎compiler/rustc_typeck/src/check/fn_ctxt/checks.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
234234
// This is more complicated than just checking type equality, as arguments could be coerced
235235
// This version writes those types back so further type checking uses the narrowed types
236236
let demand_compatible = |idx, final_arg_types: &mut Vec<Option<(Ty<'tcx>, Ty<'tcx>)>>| {
237-
// Do not check argument compatibility if the number of args do not match
238-
if arg_count_error.is_some() {
239-
return;
240-
}
241-
242237
let formal_input_ty: Ty<'tcx> = formal_input_tys[idx];
243238
let expected_input_ty: Ty<'tcx> = expected_input_tys[idx];
244239
let provided_arg = &provided_args[idx];

‎library/core/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,12 @@ pub mod arch {
408408
#[allow(missing_debug_implementations, dead_code, unsafe_op_in_unsafe_fn, unused_unsafe)]
409409
#[allow(rustdoc::bare_urls)]
410410
#[unstable(feature = "portable_simd", issue = "86656")]
411-
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
411+
#[cfg(not(all(miri, doctest)))] // Skip SIMD doctests in Miri
412412
mod core_simd;
413413

414414
#[doc = include_str!("../../portable-simd/crates/core_simd/src/core_simd_docs.md")]
415415
#[unstable(feature = "portable_simd", issue = "86656")]
416-
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
416+
#[cfg(not(all(miri, doctest)))] // Skip SIMD doctests in Miri
417417
pub mod simd {
418418
#[unstable(feature = "portable_simd", issue = "86656")]
419419
pub use crate::core_simd::simd::*;

‎library/core/src/slice/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::option::Option::{None, Some};
1616
use crate::ptr;
1717
use crate::result::Result;
1818
use crate::result::Result::{Err, Ok};
19-
#[cfg(not(miri))] // Miri does not support all SIMD intrinsics
19+
#[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests
2020
use crate::simd::{self, Simd};
2121
use crate::slice;
2222

@@ -3540,7 +3540,7 @@ impl<T> [T] {
35403540
/// assert_eq!(basic_simd_sum(&numbers[1..99]), 4949.0);
35413541
/// ```
35423542
#[unstable(feature = "portable_simd", issue = "86656")]
3543-
#[cfg(not(miri))] // Miri does not support all SIMD intrinsics
3543+
#[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests
35443544
pub fn as_simd<const LANES: usize>(&self) -> (&[T], &[Simd<T, LANES>], &[T])
35453545
where
35463546
Simd<T, LANES>: AsRef<[T; LANES]>,
@@ -3584,7 +3584,7 @@ impl<T> [T] {
35843584
/// be lifted in a way that would make it possible to see panics from this
35853585
/// method for something like `LANES == 3`.
35863586
#[unstable(feature = "portable_simd", issue = "86656")]
3587-
#[cfg(not(miri))] // Miri does not support all SIMD intrinsics
3587+
#[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests
35883588
pub fn as_simd_mut<const LANES: usize>(&mut self) -> (&mut [T], &mut [Simd<T, LANES>], &mut [T])
35893589
where
35903590
Simd<T, LANES>: AsMut<[T; LANES]>,

‎library/core/tests/simd.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(not(miri))] // Miri does not support all SIMD intrinsics
2-
31
use core::simd::f32x4;
42

53
#[test]

‎library/core/tests/slice.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,9 +2457,11 @@ take_tests! {
24572457
(take_last_mut_empty, (), None, &mut []),
24582458
}
24592459

2460+
#[cfg(not(miri))] // unused in Miri
24602461
const EMPTY_MAX: &'static [()] = &[(); usize::MAX];
24612462

24622463
// can't be a constant due to const mutability rules
2464+
#[cfg(not(miri))] // unused in Miri
24632465
macro_rules! empty_max_mut {
24642466
() => {
24652467
&mut [(); usize::MAX] as _

‎library/std/src/sys/windows/thread.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,9 @@ impl Thread {
3030
// PTHREAD_STACK_MIN bytes big. Windows has no such lower limit, it's
3131
// just that below a certain threshold you can't do anything useful.
3232
// That threshold is application and architecture-specific, however.
33-
// Round up to the next 64 kB because that's what the NT kernel does,
34-
// might as well make it explicit.
35-
let stack_size = (stack + 0xfffe) & (!0xfffe);
3633
let ret = c::CreateThread(
3734
ptr::null_mut(),
38-
stack_size,
35+
stack,
3936
thread_start,
4037
p as *mut _,
4138
c::STACK_SIZE_PARAM_IS_A_RESERVATION,

‎src/test/ui/check-cfg/empty-values.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
// Check that a an empty values() is rejected
1+
// Check warning for unexpected cfg value
22
//
3-
// check-fail
3+
// check-pass
44
// compile-flags: --check-cfg=values() -Z unstable-options
55

6+
#[cfg(test = "value")]
7+
//~^ WARNING unexpected `cfg` condition value
8+
pub fn f() {}
9+
610
fn main() {}

‎src/test/ui/check-cfg/empty-values.stderr

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
error: invalid `--check-cfg` argument: `values()` (expected `names(name1, name2, ... nameN)` or `values(name, "value1", "value2", ... "valueN")`)
1+
warning: unexpected `cfg` condition value
2+
--> $DIR/empty-values.rs:6:7
3+
|
4+
LL | #[cfg(test = "value")]
5+
| ^^^^^^^^^^^^^^
6+
|
7+
= note: `#[warn(unexpected_cfgs)]` on by default
8+
= note: no expected value for `test`
9+
10+
warning: 1 warning emitted
211

‎src/test/ui/check-cfg/well-known-values.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// This test check that we lint on non well known values and that we don't lint on well known
2+
// values
3+
//
4+
// check-pass
5+
// compile-flags: --check-cfg=values() -Z unstable-options
6+
7+
#[cfg(target_os = "linuz")]
8+
//~^ WARNING unexpected `cfg` condition value
9+
fn target_os_linux_misspell() {}
10+
11+
#[cfg(target_os = "linux")]
12+
fn target_os_linux() {}
13+
14+
#[cfg(target_has_atomic = "0")]
15+
//~^ WARNING unexpected `cfg` condition value
16+
fn target_has_atomic_invalid() {}
17+
18+
#[cfg(target_has_atomic = "8")]
19+
fn target_has_atomic() {}
20+
21+
#[cfg(unix = "aa")]
22+
//~^ WARNING unexpected `cfg` condition value
23+
fn unix_with_value() {}
24+
25+
#[cfg(unix)]
26+
fn unix() {}
27+
28+
fn main() {}

0 commit comments

Comments
 (0)