mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 23:04:33 +00:00
Rollup merge of #129551 - RalfJung:ub-checks-fallback, r=saethlin
ub_checks intrinsics: fall back to cfg(ub_checks) Not sure why the fallback body uses `debug_assertions`, probably a leftover from when `cfg!(ub_checks)` did not exist yet? r? `@saethlin`
This commit is contained in:
commit
015620869d
@ -2949,7 +2949,7 @@ pub const unsafe fn typed_swap<T>(x: *mut T, y: *mut T) {
|
||||
/// sysroot which is built without ub_checks but with `#[rustc_preserve_ub_checks]`.
|
||||
/// For code that gets monomorphized in the user crate (i.e., generic functions and functions with
|
||||
/// `#[inline]`), gating assertions on `ub_checks()` rather than `cfg!(ub_checks)` means that
|
||||
/// assertions are enabled whenever the *user crate* has UB checks enabled. However if the
|
||||
/// assertions are enabled whenever the *user crate* has UB checks enabled. However, if the
|
||||
/// user has UB checks disabled, the checks will still get optimized out. This intrinsic is
|
||||
/// primarily used by [`ub_checks::assert_unsafe_precondition`].
|
||||
#[rustc_const_unstable(feature = "const_ub_checks", issue = "none")]
|
||||
@ -2957,7 +2957,7 @@ pub const unsafe fn typed_swap<T>(x: *mut T, y: *mut T) {
|
||||
#[inline(always)]
|
||||
#[rustc_intrinsic]
|
||||
pub const fn ub_checks() -> bool {
|
||||
cfg!(debug_assertions)
|
||||
cfg!(ub_checks)
|
||||
}
|
||||
|
||||
/// Allocates a block of memory at compile time.
|
||||
|
@ -203,6 +203,7 @@
|
||||
#![feature(cfg_sanitize)]
|
||||
#![feature(cfg_target_has_atomic)]
|
||||
#![feature(cfg_target_has_atomic_equal_alignment)]
|
||||
#![feature(cfg_ub_checks)]
|
||||
#![feature(const_for)]
|
||||
#![feature(const_mut_refs)]
|
||||
#![feature(const_precise_live_drops)]
|
||||
|
Loading…
Reference in New Issue
Block a user