Skip to content

Commit d7ea278

Browse files
borsbors
committed
Auto merge of #124703 - matthiaskrgr:rollup-2lljptd, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #123356 (Reduce code size of `thread::set_current`) - #124159 (Move thread parking to `sys::sync`) - #124293 (Let miri and const eval execute intrinsics' fallback bodies) - #124677 (Set non-leaf frame pointers on Fuchsia targets) - #124692 (We do not coerce `&mut &mut T -> *mut mut T`) - #124698 (Rewrite `rustdoc-determinism` test in Rust) - #124700 (Remove an unnecessary cast) - #124701 (Docs: suggest `uN::checked_sub` instead of check-then-unchecked) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7dd170f + 5f4f4fb commit d7ea278

File tree

43 files changed

+263
-126
lines changed

Some content is hidden

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

43 files changed

+263
-126
lines changed

‎compiler/rustc_const_eval/src/const_eval/dummy_machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl<'mir, 'tcx: 'mir> interpret::Machine<'mir, 'tcx> for DummyMachine {
105105
_destination: &interpret::MPlaceTy<'tcx, Self::Provenance>,
106106
_target: Option<BasicBlock>,
107107
_unwind: UnwindAction,
108-
) -> interpret::InterpResult<'tcx> {
108+
) -> interpret::InterpResult<'tcx, Option<ty::Instance<'tcx>>> {
109109
unimplemented!()
110110
}
111111

‎compiler/rustc_const_eval/src/const_eval/machine.rs

+24-7
Original file line numberDiff line numberDiff line change
@@ -459,16 +459,26 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
459459
dest: &MPlaceTy<'tcx, Self::Provenance>,
460460
target: Option<mir::BasicBlock>,
461461
_unwind: mir::UnwindAction,
462-
) -> InterpResult<'tcx> {
462+
) -> InterpResult<'tcx, Option<ty::Instance<'tcx>>> {
463463
// Shared intrinsics.
464464
if ecx.emulate_intrinsic(instance, args, dest, target)? {
465-
return Ok(());
465+
return Ok(None);
466466
}
467467
let intrinsic_name = ecx.tcx.item_name(instance.def_id());
468468

469469
// CTFE-specific intrinsics.
470470
let Some(ret) = target else {
471-
throw_unsup_format!("intrinsic `{intrinsic_name}` is not supported at compile-time");
471+
// Handle diverging intrinsics. We can't handle any of them (that are not already
472+
// handled above), but check if there is a fallback body.
473+
if ecx.tcx.intrinsic(instance.def_id()).unwrap().must_be_overridden {
474+
throw_unsup_format!(
475+
"intrinsic `{intrinsic_name}` is not supported at compile-time"
476+
);
477+
}
478+
return Ok(Some(ty::Instance {
479+
def: ty::InstanceDef::Item(instance.def_id()),
480+
args: instance.args,
481+
}));
472482
};
473483
match intrinsic_name {
474484
sym::ptr_guaranteed_cmp => {
@@ -536,14 +546,21 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
536546
// not the optimization stage.)
537547
sym::is_val_statically_known => ecx.write_scalar(Scalar::from_bool(false), dest)?,
538548
_ => {
539-
throw_unsup_format!(
540-
"intrinsic `{intrinsic_name}` is not supported at compile-time"
541-
);
549+
// We haven't handled the intrinsic, let's see if we can use a fallback body.
550+
if ecx.tcx.intrinsic(instance.def_id()).unwrap().must_be_overridden {
551+
throw_unsup_format!(
552+
"intrinsic `{intrinsic_name}` is not supported at compile-time"
553+
);
554+
}
555+
return Ok(Some(ty::Instance {
556+
def: ty::InstanceDef::Item(instance.def_id()),
557+
args: instance.args,
558+
}));
542559
}
543560
}
544561

545562
ecx.go_to_block(ret);
546-
Ok(())
563+
Ok(None)
547564
}
548565

549566
fn assert_panic(

‎compiler/rustc_const_eval/src/interpret/intrinsics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
414414
}
415415
self.copy_op(&self.project_index(&input, index)?, dest)?;
416416
}
417-
sym::likely | sym::unlikely | sym::black_box => {
417+
sym::black_box => {
418418
// These just return their argument
419419
self.copy_op(&args[0], dest)?;
420420
}

‎compiler/rustc_const_eval/src/interpret/machine.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,17 @@ pub trait Machine<'mir, 'tcx: 'mir>: Sized {
216216

217217
/// Directly process an intrinsic without pushing a stack frame. It is the hook's
218218
/// responsibility to advance the instruction pointer as appropriate.
219+
///
220+
/// Returns `None` if the intrinsic was fully handled.
221+
/// Otherwise, returns an `Instance` of the function that implements the intrinsic.
219222
fn call_intrinsic(
220223
ecx: &mut InterpCx<'mir, 'tcx, Self>,
221224
instance: ty::Instance<'tcx>,
222225
args: &[OpTy<'tcx, Self::Provenance>],
223226
destination: &MPlaceTy<'tcx, Self::Provenance>,
224227
target: Option<mir::BasicBlock>,
225228
unwind: mir::UnwindAction,
226-
) -> InterpResult<'tcx>;
229+
) -> InterpResult<'tcx, Option<ty::Instance<'tcx>>>;
227230

228231
/// Called to evaluate `Assert` MIR terminators that trigger a panic.
229232
fn assert_panic(

‎compiler/rustc_const_eval/src/interpret/terminator.rs

+16-2
Original file line numberDiff line numberDiff line change
@@ -539,14 +539,28 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
539539
ty::InstanceDef::Intrinsic(def_id) => {
540540
assert!(self.tcx.intrinsic(def_id).is_some());
541541
// FIXME: Should `InPlace` arguments be reset to uninit?
542-
M::call_intrinsic(
542+
if let Some(fallback) = M::call_intrinsic(
543543
self,
544544
instance,
545545
&self.copy_fn_args(args),
546546
destination,
547547
target,
548548
unwind,
549-
)
549+
)? {
550+
assert!(!self.tcx.intrinsic(fallback.def_id()).unwrap().must_be_overridden);
551+
assert!(matches!(fallback.def, ty::InstanceDef::Item(_)));
552+
return self.eval_fn_call(
553+
FnVal::Instance(fallback),
554+
(caller_abi, caller_fn_abi),
555+
args,
556+
with_caller_location,
557+
destination,
558+
target,
559+
unwind,
560+
);
561+
} else {
562+
Ok(())
563+
}
550564
}
551565
ty::InstanceDef::VTableShim(..)
552566
| ty::InstanceDef::ReifyShim(..)

‎compiler/rustc_resolve/src/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pub(crate) fn registered_tools(tcx: TyCtxt<'_>, (): ()) -> RegisteredTools {
141141
}
142142
// We implicitly add `rustfmt`, `clippy`, `diagnostic` to known tools,
143143
// but it's not an error to register them explicitly.
144-
let predefined_tools = [sym::clippy, sym::rustfmt, sym::diagnostic];
144+
let predefined_tools = [sym::clippy, sym::rustfmt, sym::diagnostic, sym::miri];
145145
registered_tools.extend(predefined_tools.iter().cloned().map(Ident::with_dummy_span));
146146
registered_tools
147147
}

‎compiler/rustc_target/src/spec/base/fuchsia.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::spec::{crt_objects, cvs, Cc, LinkOutputKind, LinkerFlavor, Lld, TargetOptions};
1+
use crate::spec::{
2+
crt_objects, cvs, Cc, FramePointer, LinkOutputKind, LinkerFlavor, Lld, TargetOptions,
3+
};
24

35
pub fn opts() -> TargetOptions {
46
// This mirrors the linker options provided by clang. We presume lld for
@@ -38,6 +40,7 @@ pub fn opts() -> TargetOptions {
3840
]),
3941
position_independent_executables: true,
4042
has_thread_local: true,
43+
frame_pointer: FramePointer::NonLeaf,
4144
..Default::default()
4245
}
4346
}

‎library/core/src/intrinsics.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@ pub const unsafe fn assume(b: bool) {
987987
#[unstable(feature = "core_intrinsics", issue = "none")]
988988
#[rustc_intrinsic]
989989
#[rustc_nounwind]
990+
#[cfg_attr(not(bootstrap), miri::intrinsic_fallback_checks_ub)]
990991
pub const fn likely(b: bool) -> bool {
991992
b
992993
}
@@ -1006,6 +1007,7 @@ pub const fn likely(b: bool) -> bool {
10061007
#[unstable(feature = "core_intrinsics", issue = "none")]
10071008
#[rustc_intrinsic]
10081009
#[rustc_nounwind]
1010+
#[cfg_attr(not(bootstrap), miri::intrinsic_fallback_checks_ub)]
10091011
pub const fn unlikely(b: bool) -> bool {
10101012
b
10111013
}
@@ -2469,6 +2471,7 @@ extern "rust-intrinsic" {
24692471
#[rustc_nounwind]
24702472
#[rustc_do_not_const_check]
24712473
#[inline]
2474+
#[cfg_attr(not(bootstrap), miri::intrinsic_fallback_checks_ub)]
24722475
pub const fn ptr_guaranteed_cmp<T>(ptr: *const T, other: *const T) -> u8 {
24732476
(ptr == other) as u8
24742477
}
@@ -2733,8 +2736,10 @@ pub const fn ub_checks() -> bool {
27332736
#[unstable(feature = "core_intrinsics", issue = "none")]
27342737
#[rustc_nounwind]
27352738
#[rustc_intrinsic]
2739+
#[cfg_attr(not(bootstrap), miri::intrinsic_fallback_checks_ub)]
27362740
pub const unsafe fn const_allocate(_size: usize, _align: usize) -> *mut u8 {
2737-
// const eval overrides this function, but runtime code should always just return null pointers.
2741+
// const eval overrides this function, but runtime code for now just returns null pointers.
2742+
// See <https://github.com/rust-lang/rust/issues/93935>.
27382743
crate::ptr::null_mut()
27392744
}
27402745

@@ -2752,7 +2757,10 @@ pub const unsafe fn const_allocate(_size: usize, _align: usize) -> *mut u8 {
27522757
#[unstable(feature = "core_intrinsics", issue = "none")]
27532758
#[rustc_nounwind]
27542759
#[rustc_intrinsic]
2755-
pub const unsafe fn const_deallocate(_ptr: *mut u8, _size: usize, _align: usize) {}
2760+
#[cfg_attr(not(bootstrap), miri::intrinsic_fallback_checks_ub)]
2761+
pub const unsafe fn const_deallocate(_ptr: *mut u8, _size: usize, _align: usize) {
2762+
// Runtime NOP
2763+
}
27562764

27572765
/// `ptr` must point to a vtable.
27582766
/// The intrinsic will return the size stored in that vtable.

‎library/core/src/num/uint_macros.rs

+26-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ macro_rules! uint_impl {
7777
without modifying the original"]
7878
#[inline(always)]
7979
pub const fn count_ones(self) -> u32 {
80-
return intrinsics::ctpop(self as $ActualT);
80+
return intrinsics::ctpop(self);
8181
}
8282

8383
/// Returns the number of zeros in the binary representation of `self`.
@@ -636,6 +636,31 @@ macro_rules! uint_impl {
636636
/// If you're just trying to avoid the panic in debug mode, then **do not**
637637
/// use this. Instead, you're looking for [`wrapping_sub`].
638638
///
639+
/// If you find yourself writing code like this:
640+
///
641+
/// ```
642+
/// # let foo = 30_u32;
643+
/// # let bar = 20;
644+
/// if foo >= bar {
645+
/// // SAFETY: just checked it will not overflow
646+
/// let diff = unsafe { foo.unchecked_sub(bar) };
647+
/// // ... use diff ...
648+
/// }
649+
/// ```
650+
///
651+
/// Consider changing it to
652+
///
653+
/// ```
654+
/// # let foo = 30_u32;
655+
/// # let bar = 20;
656+
/// if let Some(diff) = foo.checked_sub(bar) {
657+
/// // ... use diff ...
658+
/// }
659+
/// ```
660+
///
661+
/// As that does exactly the same thing -- including telling the optimizer
662+
/// that the subtraction cannot overflow -- but avoids needing `unsafe`.
663+
///
639664
/// # Safety
640665
///
641666
/// This results in undefined behavior when

‎library/std/src/sys/pal/sgx/thread.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ mod task_queue {
6767
pub mod wait_notify {
6868
use crate::pin::Pin;
6969
use crate::sync::Arc;
70-
use crate::sys_common::thread_parking::Parker;
70+
use crate::sys::sync::Parker;
7171

7272
pub struct Notifier(Arc<Parker>);
7373

‎library/std/src/sys/pal/teeos/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ pub mod thread;
3030
pub mod thread_local_dtor;
3131
#[path = "../unix/thread_local_key.rs"]
3232
pub mod thread_local_key;
33-
#[path = "../unsupported/thread_parking.rs"]
34-
pub mod thread_parking;
3533
#[allow(non_upper_case_globals)]
3634
#[path = "../unix/time.rs"]
3735
pub mod time;

‎library/std/src/sys/pal/uefi/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ pub mod stdio;
3030
pub mod thread;
3131
#[path = "../unsupported/thread_local_key.rs"]
3232
pub mod thread_local_key;
33-
#[path = "../unsupported/thread_parking.rs"]
34-
pub mod thread_parking;
3533
pub mod time;
3634

3735
mod helpers;

‎library/std/src/sys/pal/unix/thread_parking/netbsd.rs ‎library/std/src/sys/pal/unix/thread_parking.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Only used on NetBSD. If other platforms start using id-based parking, use
2+
// separate modules for each platform.
3+
#![cfg(target_os = "netbsd")]
4+
15
use crate::ffi::{c_int, c_void};
26
use crate::ptr;
37
use crate::time::Duration;

‎library/std/src/sys/pal/unix/thread_parking/mod.rs

-24
This file was deleted.

‎library/std/src/sys/pal/unsupported/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ pub mod thread;
1414
#[cfg(target_thread_local)]
1515
pub mod thread_local_dtor;
1616
pub mod thread_local_key;
17-
pub mod thread_parking;
1817
pub mod time;
1918

2019
mod common;

‎library/std/src/sys/pal/wasi/mod.rs

-7
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ pub mod thread_local_dtor;
3939
pub mod thread_local_key;
4040
pub mod time;
4141

42-
cfg_if::cfg_if! {
43-
if #[cfg(not(target_feature = "atomics"))] {
44-
#[path = "../unsupported/thread_parking.rs"]
45-
pub mod thread_parking;
46-
}
47-
}
48-
4942
#[path = "../unsupported/common.rs"]
5043
#[deny(unsafe_op_in_unsafe_fn)]
5144
#[allow(unused)]

‎library/std/src/sys/pal/wasip2/mod.rs

-9
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,6 @@ pub mod thread_local_key;
4141
#[path = "../wasi/time.rs"]
4242
pub mod time;
4343

44-
cfg_if::cfg_if! {
45-
if #[cfg(target_feature = "atomics")] {
46-
compile_error!("The wasm32-wasip2 target does not support atomics");
47-
} else {
48-
#[path = "../unsupported/thread_parking.rs"]
49-
pub mod thread_parking;
50-
}
51-
}
52-
5344
#[path = "../unsupported/common.rs"]
5445
#[deny(unsafe_op_in_unsafe_fn)]
5546
#[allow(unused)]

‎library/std/src/sys/pal/wasm/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ cfg_if::cfg_if! {
5050
} else {
5151
#[path = "../unsupported/thread.rs"]
5252
pub mod thread;
53-
#[path = "../unsupported/thread_parking.rs"]
54-
pub mod thread_parking;
5553
}
5654
}
5755

‎library/std/src/sys/pal/windows/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ pub mod stdio;
3333
pub mod thread;
3434
pub mod thread_local_dtor;
3535
pub mod thread_local_key;
36-
pub mod thread_parking;
3736
pub mod time;
3837
cfg_if::cfg_if! {
3938
if #[cfg(not(target_vendor = "uwp"))] {

‎library/std/src/sys/pal/xous/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ pub mod process;
1818
pub mod stdio;
1919
pub mod thread;
2020
pub mod thread_local_key;
21-
pub mod thread_parking;
2221
pub mod time;
2322

2423
#[path = "../unsupported/common.rs"]

‎library/std/src/sys/pal/zkvm/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ pub mod time;
3232
#[path = "../unsupported/thread.rs"]
3333
pub mod thread;
3434

35-
#[path = "../unsupported/thread_parking.rs"]
36-
pub mod thread_parking;
37-
3835
mod abi;
3936

4037
use crate::io as std_io;

‎library/std/src/sys/sync/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ mod condvar;
22
mod mutex;
33
mod once;
44
mod rwlock;
5+
mod thread_parking;
56

67
pub use condvar::Condvar;
78
pub use mutex::Mutex;
89
pub use once::{Once, OnceState};
910
pub use rwlock::RwLock;
11+
pub use thread_parking::Parker;

‎library/std/src/sys/pal/unix/thread_parking/darwin.rs ‎library/std/src/sys/sync/thread_parking/darwin.rs

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
//! provided by libdispatch, as the underlying Mach semaphore is only dubiously
1111
//! public.
1212
13+
#![allow(non_camel_case_types)]
14+
1315
use crate::pin::Pin;
1416
use crate::sync::atomic::{
1517
AtomicI8,

‎library/std/src/sys_common/thread_parking/futex.rs ‎library/std/src/sys/sync/thread_parking/futex.rs

File renamed without changes.

‎library/std/src/sys_common/thread_parking/id.rs ‎library/std/src/sys/sync/thread_parking/id.rs

File renamed without changes.

0 commit comments

Comments
 (0)