Skip to content

Commit 919a9f5

Browse files
borsbors
committed
Auto merge of rust-lang#120594 - saethlin:delayed-debug-asserts, r=<try>
Toggle assert_unsafe_precondition in codegen instead of expansion r? `@ghost` rust-lang#120539 (comment)
2 parents bf3c6c5 + 6dd581b commit 919a9f5

File tree

31 files changed

+1008
-1205
lines changed

31 files changed

+1008
-1205
lines changed

Diff for: ‎compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,14 @@ fn codegen_regular_intrinsic_call<'tcx>(
438438
fx.bcx.ins().trap(TrapCode::User(0));
439439
return;
440440
}
441+
sym::debug_assertions => {
442+
let bool_layout = fx.layout_of(fx.tcx.types.bool);
443+
let val = CValue::by_val(
444+
fx.bcx.ins().iconst(types::I8, fx.tcx.sess.opts.debug_assertions as i64),
445+
bool_layout,
446+
);
447+
ret.write_cvalue(fx, val);
448+
}
441449
sym::likely | sym::unlikely => {
442450
intrinsic_args!(fx, args => (a); intrinsic);
443451

Diff for: ‎compiler/rustc_codegen_ssa/src/mir/intrinsic.rs

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
8484
return;
8585
}
8686

87+
sym::debug_assertions => bx.const_bool(bx.tcx().sess.opts.debug_assertions),
8788
sym::va_start => bx.va_start(args[0].immediate()),
8889
sym::va_end => bx.va_end(args[0].immediate()),
8990
sym::size_of_val => {

Diff for: ‎compiler/rustc_const_eval/src/const_eval/machine.rs

+5
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,11 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
536536
// (We know the value here in the machine of course, but this is the runtime of that code,
537537
// not the optimization stage.)
538538
sym::is_val_statically_known => ecx.write_scalar(Scalar::from_bool(false), dest)?,
539+
540+
sym::debug_assertions => {
541+
ecx.write_scalar(Scalar::from_bool(ecx.tcx.sess.opts.debug_assertions), dest)?
542+
}
543+
539544
_ => {
540545
throw_unsup_format!(
541546
"intrinsic `{intrinsic_name}` is not supported at compile-time"

Diff for: ‎compiler/rustc_hir_analysis/src/check/intrinsic.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ pub fn intrinsic_operation_unsafety(tcx: TyCtxt<'_>, intrinsic_id: DefId) -> hir
112112
| sym::forget
113113
| sym::black_box
114114
| sym::variant_count
115-
| sym::ptr_mask => hir::Unsafety::Normal,
115+
| sym::ptr_mask
116+
| sym::debug_assertions => hir::Unsafety::Normal,
116117
_ => hir::Unsafety::Unsafe,
117118
};
118119

@@ -461,6 +462,8 @@ pub fn check_intrinsic_type(tcx: TyCtxt<'_>, it: &hir::ForeignItem<'_>) {
461462
(0, vec![Ty::new_imm_ptr(tcx, Ty::new_unit(tcx))], tcx.types.usize)
462463
}
463464

465+
sym::debug_assertions => (0, Vec::new(), tcx.types.bool),
466+
464467
other => {
465468
tcx.dcx().emit_err(UnrecognizedIntrinsicFunction { span: it.span, name: other });
466469
return;

Diff for: ‎library/core/src/intrinsics.rs

+17-2
Original file line numberDiff line numberDiff line change
@@ -2569,6 +2569,12 @@ extern "rust-intrinsic" {
25692569
#[rustc_nounwind]
25702570
#[cfg(not(bootstrap))]
25712571
pub fn is_val_statically_known<T: Copy>(arg: T) -> bool;
2572+
2573+
#[rustc_const_unstable(feature = "delayed_debug_assertions", issue = "none")]
2574+
#[rustc_safe_intrinsic]
2575+
#[rustc_nounwind]
2576+
#[cfg(not(bootstrap))]
2577+
pub(crate) fn debug_assertions() -> bool;
25722578
}
25732579

25742580
// FIXME: Seems using `unstable` here completely ignores `rustc_allow_const_fn_unstable`
@@ -2604,10 +2610,18 @@ pub const unsafe fn is_val_statically_known<T: Copy>(_arg: T) -> bool {
26042610
///
26052611
/// So in a sense it is UB if this macro is useful, but we expect callers of `unsafe fn` to make
26062612
/// the occasional mistake, and this check should help them figure things out.
2607-
#[allow_internal_unstable(const_eval_select)] // permit this to be called in stably-const fn
2613+
#[allow_internal_unstable(const_eval_select, delayed_debug_assertions)] // permit this to be called in stably-const fn
26082614
macro_rules! assert_unsafe_precondition {
26092615
($name:expr, $([$($tt:tt)*])?($($i:ident:$ty:ty),*$(,)?) => $e:expr $(,)?) => {
2610-
if cfg!(debug_assertions) {
2616+
{
2617+
#[cfg(bootstrap)]
2618+
let should_check = cfg!(debug_assertions);
2619+
2620+
// Turn assertions off in Miri, but otherwise check in codegen
2621+
#[cfg(not(bootstrap))]
2622+
let should_check = !cfg!(miri) && ::core::intrinsics::debug_assertions();
2623+
2624+
if should_check {
26112625
// allow non_snake_case to allow capturing const generics
26122626
#[allow(non_snake_case)]
26132627
#[inline(always)]
@@ -2625,6 +2639,7 @@ macro_rules! assert_unsafe_precondition {
26252639

26262640
::core::intrinsics::const_eval_select(($($i,)*), comptime, runtime);
26272641
}
2642+
}
26282643
};
26292644
}
26302645
pub(crate) use assert_unsafe_precondition;

Diff for: ‎library/core/src/ptr/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1208,10 +1208,12 @@ pub const unsafe fn read<T>(src: *const T) -> T {
12081208

12091209
// SAFETY: the caller must guarantee that `src` is valid for reads.
12101210
unsafe {
1211+
/*
12111212
assert_unsafe_precondition!(
12121213
"ptr::read requires that the pointer argument is aligned and non-null",
12131214
[T](src: *const T) => is_aligned_and_not_null(src)
12141215
);
1216+
*/
12151217
crate::intrinsics::read_via_copy(src)
12161218
}
12171219
}
@@ -1408,10 +1410,12 @@ pub const unsafe fn write<T>(dst: *mut T, src: T) {
14081410
// `dst` cannot overlap `src` because the caller has mutable access
14091411
// to `dst` while `src` is owned by this function.
14101412
unsafe {
1413+
/*
14111414
assert_unsafe_precondition!(
14121415
"ptr::write requires that the pointer argument is aligned and non-null",
14131416
[T](dst: *mut T) => is_aligned_and_not_null(dst)
14141417
);
1418+
*/
14151419
intrinsics::write_via_move(dst, src)
14161420
}
14171421
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff

+58-22
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,28 @@
2424
debug ptr => _6;
2525
scope 11 (inlined NonNull::<[bool; 0]>::new_unchecked) {
2626
debug ptr => _6;
27-
let mut _8: *const [bool; 0];
28-
let mut _9: *mut [bool; 0];
27+
let mut _9: *const [bool; 0];
2928
scope 12 {
30-
scope 13 (inlined NonNull::<T>::new_unchecked::runtime::<[bool; 0]>) {
31-
debug ptr => _9;
32-
scope 14 (inlined std::ptr::mut_ptr::<impl *mut [bool; 0]>::is_null) {
33-
debug self => _9;
34-
let mut _10: *mut u8;
35-
scope 15 {
36-
scope 16 (inlined std::ptr::mut_ptr::<impl *mut T>::is_null::runtime_impl) {
37-
debug ptr => _10;
38-
scope 17 (inlined std::ptr::mut_ptr::<impl *mut u8>::addr) {
39-
debug self => _10;
40-
scope 18 {
41-
scope 19 (inlined std::ptr::mut_ptr::<impl *mut u8>::cast::<()>) {
42-
debug self => _10;
29+
let _8: bool;
30+
scope 13 {
31+
debug should_check => _8;
32+
scope 14 (inlined NonNull::<T>::new_unchecked::runtime::<[bool; 0]>) {
33+
debug ptr => _6;
34+
let _10: !;
35+
scope 15 (inlined std::ptr::mut_ptr::<impl *mut [bool; 0]>::is_null) {
36+
debug self => _6;
37+
let mut _11: *mut u8;
38+
scope 16 {
39+
scope 17 (inlined std::ptr::mut_ptr::<impl *mut T>::is_null::runtime_impl) {
40+
debug ptr => _11;
41+
let mut _12: usize;
42+
scope 18 (inlined std::ptr::mut_ptr::<impl *mut u8>::addr) {
43+
debug self => _11;
44+
let mut _13: *mut ();
45+
scope 19 {
46+
scope 20 (inlined std::ptr::mut_ptr::<impl *mut u8>::cast::<()>) {
47+
debug self => _11;
48+
}
4349
}
4450
}
4551
}
@@ -66,6 +72,7 @@
6672
StorageLive(_1);
6773
StorageLive(_2);
6874
StorageLive(_3);
75+
StorageLive(_10);
6976
StorageLive(_4);
7077
StorageLive(_5);
7178
StorageLive(_6);
@@ -75,10 +82,33 @@
7582
StorageDead(_7);
7683
StorageLive(_8);
7784
StorageLive(_9);
78-
StorageLive(_10);
79-
_8 = const {0x1 as *mut [bool; 0]} as *const [bool; 0] (PointerCoercion(MutToConstPointer));
80-
_5 = NonNull::<[bool; 0]> { pointer: _8 };
81-
StorageDead(_10);
85+
_8 = intrinsics::debug_assertions() -> [return: bb2, unwind unreachable];
86+
}
87+
88+
bb1: {
89+
StorageDead(_1);
90+
return;
91+
}
92+
93+
bb2: {
94+
switchInt(_8) -> [0: bb4, otherwise: bb3];
95+
}
96+
97+
bb3: {
98+
StorageLive(_11);
99+
_11 = const {0x1 as *mut [bool; 0]} as *mut u8 (PtrToPtr);
100+
StorageLive(_12);
101+
StorageLive(_13);
102+
_13 = _11 as *mut () (PtrToPtr);
103+
_12 = move _13 as usize (Transmute);
104+
StorageDead(_13);
105+
StorageDead(_11);
106+
switchInt(move _12) -> [0: bb5, otherwise: bb6];
107+
}
108+
109+
bb4: {
110+
_9 = const {0x1 as *mut [bool; 0]} as *const [bool; 0] (PointerCoercion(MutToConstPointer));
111+
_5 = NonNull::<[bool; 0]> { pointer: _9 };
82112
StorageDead(_9);
83113
StorageDead(_8);
84114
StorageDead(_6);
@@ -87,16 +117,22 @@
87117
_3 = move _4 as std::ptr::Unique<[bool]> (PointerCoercion(Unsize));
88118
StorageDead(_4);
89119
_2 = Box::<[bool]>(_3, const std::alloc::Global);
120+
StorageDead(_10);
90121
StorageDead(_3);
91122
_1 = A { foo: move _2 };
92123
StorageDead(_2);
93124
_0 = const ();
94125
drop(_1) -> [return: bb1, unwind unreachable];
95126
}
96127

97-
bb1: {
98-
StorageDead(_1);
99-
return;
128+
bb5: {
129+
StorageDead(_12);
130+
_10 = core::panicking::panic_nounwind(const "unsafe precondition(s) violated: NonNull::new_unchecked requires that the pointer is non-null") -> unwind unreachable;
131+
}
132+
133+
bb6: {
134+
StorageDead(_12);
135+
goto -> bb4;
100136
}
101137
}
102138

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff

+60-24
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,28 @@
2424
debug ptr => _6;
2525
scope 11 (inlined NonNull::<[bool; 0]>::new_unchecked) {
2626
debug ptr => _6;
27-
let mut _8: *const [bool; 0];
28-
let mut _9: *mut [bool; 0];
27+
let mut _9: *const [bool; 0];
2928
scope 12 {
30-
scope 13 (inlined NonNull::<T>::new_unchecked::runtime::<[bool; 0]>) {
31-
debug ptr => _9;
32-
scope 14 (inlined std::ptr::mut_ptr::<impl *mut [bool; 0]>::is_null) {
33-
debug self => _9;
34-
let mut _10: *mut u8;
35-
scope 15 {
36-
scope 16 (inlined std::ptr::mut_ptr::<impl *mut T>::is_null::runtime_impl) {
37-
debug ptr => _10;
38-
scope 17 (inlined std::ptr::mut_ptr::<impl *mut u8>::addr) {
39-
debug self => _10;
40-
scope 18 {
41-
scope 19 (inlined std::ptr::mut_ptr::<impl *mut u8>::cast::<()>) {
42-
debug self => _10;
29+
let _8: bool;
30+
scope 13 {
31+
debug should_check => _8;
32+
scope 14 (inlined NonNull::<T>::new_unchecked::runtime::<[bool; 0]>) {
33+
debug ptr => _6;
34+
let _10: !;
35+
scope 15 (inlined std::ptr::mut_ptr::<impl *mut [bool; 0]>::is_null) {
36+
debug self => _6;
37+
let mut _11: *mut u8;
38+
scope 16 {
39+
scope 17 (inlined std::ptr::mut_ptr::<impl *mut T>::is_null::runtime_impl) {
40+
debug ptr => _11;
41+
let mut _12: usize;
42+
scope 18 (inlined std::ptr::mut_ptr::<impl *mut u8>::addr) {
43+
debug self => _11;
44+
let mut _13: *mut ();
45+
scope 19 {
46+
scope 20 (inlined std::ptr::mut_ptr::<impl *mut u8>::cast::<()>) {
47+
debug self => _11;
48+
}
4349
}
4450
}
4551
}
@@ -66,6 +72,7 @@
6672
StorageLive(_1);
6773
StorageLive(_2);
6874
StorageLive(_3);
75+
StorageLive(_10);
6976
StorageLive(_4);
7077
StorageLive(_5);
7178
StorageLive(_6);
@@ -75,10 +82,37 @@
7582
StorageDead(_7);
7683
StorageLive(_8);
7784
StorageLive(_9);
78-
StorageLive(_10);
79-
_8 = const {0x1 as *mut [bool; 0]} as *const [bool; 0] (PointerCoercion(MutToConstPointer));
80-
_5 = NonNull::<[bool; 0]> { pointer: _8 };
81-
StorageDead(_10);
85+
_8 = intrinsics::debug_assertions() -> [return: bb3, unwind unreachable];
86+
}
87+
88+
bb1: {
89+
StorageDead(_1);
90+
return;
91+
}
92+
93+
bb2 (cleanup): {
94+
resume;
95+
}
96+
97+
bb3: {
98+
switchInt(_8) -> [0: bb5, otherwise: bb4];
99+
}
100+
101+
bb4: {
102+
StorageLive(_11);
103+
_11 = const {0x1 as *mut [bool; 0]} as *mut u8 (PtrToPtr);
104+
StorageLive(_12);
105+
StorageLive(_13);
106+
_13 = _11 as *mut () (PtrToPtr);
107+
_12 = move _13 as usize (Transmute);
108+
StorageDead(_13);
109+
StorageDead(_11);
110+
switchInt(move _12) -> [0: bb6, otherwise: bb7];
111+
}
112+
113+
bb5: {
114+
_9 = const {0x1 as *mut [bool; 0]} as *const [bool; 0] (PointerCoercion(MutToConstPointer));
115+
_5 = NonNull::<[bool; 0]> { pointer: _9 };
82116
StorageDead(_9);
83117
StorageDead(_8);
84118
StorageDead(_6);
@@ -87,20 +121,22 @@
87121
_3 = move _4 as std::ptr::Unique<[bool]> (PointerCoercion(Unsize));
88122
StorageDead(_4);
89123
_2 = Box::<[bool]>(_3, const std::alloc::Global);
124+
StorageDead(_10);
90125
StorageDead(_3);
91126
_1 = A { foo: move _2 };
92127
StorageDead(_2);
93128
_0 = const ();
94129
drop(_1) -> [return: bb1, unwind: bb2];
95130
}
96131

97-
bb1: {
98-
StorageDead(_1);
99-
return;
132+
bb6: {
133+
StorageDead(_12);
134+
_10 = core::panicking::panic_nounwind(const "unsafe precondition(s) violated: NonNull::new_unchecked requires that the pointer is non-null") -> unwind unreachable;
100135
}
101136

102-
bb2 (cleanup): {
103-
resume;
137+
bb7: {
138+
StorageDead(_12);
139+
goto -> bb5;
104140
}
105141
}
106142

0 commit comments

Comments
 (0)