Skip to content

Commit 7a90c3f

Browse files
saethlinsaethlin
committed
Add #[track_caller] to all ub-checked functions
1 parent 47937f2 commit 7a90c3f

15 files changed

+40
-17
lines changed

‎library/core/src/alloc/layout.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ impl Layout {
123123
#[must_use]
124124
#[inline]
125125
#[rustc_allow_const_fn_unstable(ptr_alignment_type)]
126+
#[track_caller]
126127
pub const unsafe fn from_size_align_unchecked(size: usize, align: usize) -> Self {
127128
assert_unsafe_precondition!(
128129
check_library_ub,

‎library/core/src/ascii/ascii_char.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ impl AsciiChar {
503503
/// something useful. It might be tightened before stabilization.)
504504
#[unstable(feature = "ascii_char", issue = "110998")]
505505
#[inline]
506+
#[track_caller]
506507
pub const unsafe fn digit_unchecked(d: u8) -> Self {
507508
assert_unsafe_precondition!(
508509
check_language_ub,

‎library/core/src/char/convert.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ pub(super) const fn from_u32(i: u32) -> Option<char> {
2121
/// Converts a `u32` to a `char`, ignoring validity. See [`char::from_u32_unchecked`].
2222
#[inline]
2323
#[must_use]
24+
#[track_caller]
2425
pub(super) const unsafe fn from_u32_unchecked(i: u32) -> char {
2526
// SAFETY: the caller must guarantee that `i` is a valid char value.
2627
unsafe {

‎library/core/src/hint.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ use crate::{intrinsics, ub_checks};
9696
#[inline]
9797
#[stable(feature = "unreachable", since = "1.27.0")]
9898
#[rustc_const_stable(feature = "const_unreachable_unchecked", since = "1.57.0")]
99-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
99+
#[track_caller]
100100
pub const unsafe fn unreachable_unchecked() -> ! {
101101
ub_checks::assert_unsafe_precondition!(
102102
check_language_ub,
@@ -196,6 +196,7 @@ pub const unsafe fn unreachable_unchecked() -> ! {
196196
#[doc(alias = "assume")]
197197
#[stable(feature = "hint_assert_unchecked", since = "1.81.0")]
198198
#[rustc_const_stable(feature = "hint_assert_unchecked", since = "1.81.0")]
199+
#[track_caller]
199200
pub const unsafe fn assert_unchecked(cond: bool) {
200201
// SAFETY: The caller promised `cond` is true.
201202
unsafe {

‎library/core/src/intrinsics.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3297,6 +3297,7 @@ pub const fn ptr_metadata<P: ptr::Pointee<Metadata = M> + ?Sized, M>(_ptr: *cons
32973297
#[inline(always)]
32983298
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
32993299
#[rustc_diagnostic_item = "ptr_copy_nonoverlapping"]
3300+
#[track_caller]
33003301
pub const unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize) {
33013302
extern "rust-intrinsic" {
33023303
#[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")]
@@ -3399,6 +3400,7 @@ pub const unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: us
33993400
#[inline(always)]
34003401
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
34013402
#[rustc_diagnostic_item = "ptr_copy"]
3403+
#[track_caller]
34023404
pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
34033405
extern "rust-intrinsic" {
34043406
#[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")]
@@ -3479,6 +3481,7 @@ pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
34793481
#[inline(always)]
34803482
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
34813483
#[rustc_diagnostic_item = "ptr_write_bytes"]
3484+
#[track_caller]
34823485
pub const unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
34833486
extern "rust-intrinsic" {
34843487
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ macro_rules! int_impl {
510510
#[must_use = "this returns the result of the operation, \
511511
without modifying the original"]
512512
#[inline(always)]
513-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
513+
#[track_caller]
514514
pub const unsafe fn unchecked_add(self, rhs: Self) -> Self {
515515
assert_unsafe_precondition!(
516516
check_language_ub,
@@ -662,7 +662,7 @@ macro_rules! int_impl {
662662
#[must_use = "this returns the result of the operation, \
663663
without modifying the original"]
664664
#[inline(always)]
665-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
665+
#[track_caller]
666666
pub const unsafe fn unchecked_sub(self, rhs: Self) -> Self {
667667
assert_unsafe_precondition!(
668668
check_language_ub,
@@ -814,7 +814,7 @@ macro_rules! int_impl {
814814
#[must_use = "this returns the result of the operation, \
815815
without modifying the original"]
816816
#[inline(always)]
817-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
817+
#[track_caller]
818818
pub const unsafe fn unchecked_mul(self, rhs: Self) -> Self {
819819
assert_unsafe_precondition!(
820820
check_language_ub,
@@ -1163,7 +1163,7 @@ macro_rules! int_impl {
11631163
without modifying the original"]
11641164
#[rustc_const_unstable(feature = "unchecked_neg", issue = "85122")]
11651165
#[inline(always)]
1166-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1166+
#[track_caller]
11671167
pub const unsafe fn unchecked_neg(self) -> Self {
11681168
assert_unsafe_precondition!(
11691169
check_language_ub,
@@ -1296,7 +1296,7 @@ macro_rules! int_impl {
12961296
without modifying the original"]
12971297
#[rustc_const_unstable(feature = "unchecked_shifts", issue = "85122")]
12981298
#[inline(always)]
1299-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1299+
#[track_caller]
13001300
pub const unsafe fn unchecked_shl(self, rhs: u32) -> Self {
13011301
assert_unsafe_precondition!(
13021302
check_language_ub,
@@ -1422,7 +1422,7 @@ macro_rules! int_impl {
14221422
without modifying the original"]
14231423
#[rustc_const_unstable(feature = "unchecked_shifts", issue = "85122")]
14241424
#[inline(always)]
1425-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1425+
#[track_caller]
14261426
pub const unsafe fn unchecked_shr(self, rhs: u32) -> Self {
14271427
assert_unsafe_precondition!(
14281428
check_language_ub,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ where
364364
#[rustc_const_stable(feature = "nonzero", since = "1.28.0")]
365365
#[must_use]
366366
#[inline]
367+
#[track_caller]
367368
pub const unsafe fn new_unchecked(n: T) -> Self {
368369
match Self::new(n) {
369370
Some(n) => n,
@@ -404,6 +405,7 @@ where
404405
#[unstable(feature = "nonzero_from_mut", issue = "106290")]
405406
#[must_use]
406407
#[inline]
408+
#[track_caller]
407409
pub unsafe fn from_mut_unchecked(n: &mut T) -> &mut Self {
408410
match Self::from_mut(n) {
409411
Some(n) => n,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ macro_rules! uint_impl {
557557
#[must_use = "this returns the result of the operation, \
558558
without modifying the original"]
559559
#[inline(always)]
560-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
560+
#[track_caller]
561561
pub const unsafe fn unchecked_add(self, rhs: Self) -> Self {
562562
assert_unsafe_precondition!(
563563
check_language_ub,
@@ -749,7 +749,7 @@ macro_rules! uint_impl {
749749
#[must_use = "this returns the result of the operation, \
750750
without modifying the original"]
751751
#[inline(always)]
752-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
752+
#[track_caller]
753753
pub const unsafe fn unchecked_sub(self, rhs: Self) -> Self {
754754
assert_unsafe_precondition!(
755755
check_language_ub,
@@ -906,7 +906,7 @@ macro_rules! uint_impl {
906906
#[must_use = "this returns the result of the operation, \
907907
without modifying the original"]
908908
#[inline(always)]
909-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
909+
#[track_caller]
910910
pub const unsafe fn unchecked_mul(self, rhs: Self) -> Self {
911911
assert_unsafe_precondition!(
912912
check_language_ub,
@@ -1485,7 +1485,7 @@ macro_rules! uint_impl {
14851485
without modifying the original"]
14861486
#[rustc_const_unstable(feature = "unchecked_shifts", issue = "85122")]
14871487
#[inline(always)]
1488-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1488+
#[track_caller]
14891489
pub const unsafe fn unchecked_shl(self, rhs: u32) -> Self {
14901490
assert_unsafe_precondition!(
14911491
check_language_ub,
@@ -1611,7 +1611,7 @@ macro_rules! uint_impl {
16111611
without modifying the original"]
16121612
#[rustc_const_unstable(feature = "unchecked_shifts", issue = "85122")]
16131613
#[inline(always)]
1614-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1614+
#[track_caller]
16151615
pub const unsafe fn unchecked_shr(self, rhs: u32) -> Self {
16161616
assert_unsafe_precondition!(
16171617
check_language_ub,

‎library/core/src/ops/index_range.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ impl IndexRange {
1818
/// # Safety
1919
/// - `start <= end`
2020
#[inline]
21+
#[track_caller]
2122
pub const unsafe fn new_unchecked(start: usize, end: usize) -> Self {
2223
ub_checks::assert_unsafe_precondition!(
2324
check_library_ub,

‎library/core/src/ptr/alignment.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ impl Alignment {
7575
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
7676
#[rustc_const_unstable(feature = "ptr_alignment_type", issue = "102070")]
7777
#[inline]
78+
#[track_caller]
7879
pub const unsafe fn new_unchecked(align: usize) -> Self {
7980
assert_unsafe_precondition!(
8081
check_language_ub,

‎library/core/src/ptr/const_ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ impl<T: ?Sized> *const T {
713713
#[unstable(feature = "ptr_sub_ptr", issue = "95892")]
714714
#[rustc_const_unstable(feature = "const_ptr_sub_ptr", issue = "95892")]
715715
#[inline]
716-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
716+
#[track_caller]
717717
pub const unsafe fn sub_ptr(self, origin: *const T) -> usize
718718
where
719719
T: Sized,

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,7 @@ pub const unsafe fn swap<T>(x: *mut T, y: *mut T) {
11381138
#[stable(feature = "swap_nonoverlapping", since = "1.27.0")]
11391139
#[rustc_const_unstable(feature = "const_swap", issue = "83163")]
11401140
#[rustc_diagnostic_item = "ptr_swap_nonoverlapping"]
1141+
#[track_caller]
11411142
pub const unsafe fn swap_nonoverlapping<T>(x: *mut T, y: *mut T, count: usize) {
11421143
#[allow(unused)]
11431144
macro_rules! attempt_swap_as_chunks {
@@ -1268,6 +1269,7 @@ const unsafe fn swap_nonoverlapping_simple_untyped<T>(x: *mut T, y: *mut T, coun
12681269
#[stable(feature = "rust1", since = "1.0.0")]
12691270
#[rustc_const_unstable(feature = "const_replace", issue = "83164")]
12701271
#[rustc_diagnostic_item = "ptr_replace"]
1272+
#[track_caller]
12711273
pub const unsafe fn replace<T>(dst: *mut T, src: T) -> T {
12721274
// SAFETY: the caller must guarantee that `dst` is valid to be
12731275
// cast to a mutable reference (valid for writes, aligned, initialized),
@@ -1394,7 +1396,7 @@ pub const unsafe fn replace<T>(dst: *mut T, src: T) -> T {
13941396
#[inline]
13951397
#[stable(feature = "rust1", since = "1.0.0")]
13961398
#[rustc_const_stable(feature = "const_ptr_read", since = "1.71.0")]
1397-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1399+
#[track_caller]
13981400
#[rustc_diagnostic_item = "ptr_read"]
13991401
pub const unsafe fn read<T>(src: *const T) -> T {
14001402
// It would be semantically correct to implement this via `copy_nonoverlapping`
@@ -1620,7 +1622,7 @@ pub const unsafe fn read_unaligned<T>(src: *const T) -> T {
16201622
#[stable(feature = "rust1", since = "1.0.0")]
16211623
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
16221624
#[rustc_diagnostic_item = "ptr_write"]
1623-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1625+
#[track_caller]
16241626
pub const unsafe fn write<T>(dst: *mut T, src: T) {
16251627
// Semantically, it would be fine for this to be implemented as a
16261628
// `copy_nonoverlapping` and appropriate drop suppression of `src`.
@@ -1802,7 +1804,7 @@ pub const unsafe fn write_unaligned<T>(dst: *mut T, src: T) {
18021804
/// ```
18031805
#[inline]
18041806
#[stable(feature = "volatile", since = "1.9.0")]
1805-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1807+
#[track_caller]
18061808
#[rustc_diagnostic_item = "ptr_read_volatile"]
18071809
pub unsafe fn read_volatile<T>(src: *const T) -> T {
18081810
// SAFETY: the caller must uphold the safety contract for `volatile_load`.
@@ -1882,7 +1884,7 @@ pub unsafe fn read_volatile<T>(src: *const T) -> T {
18821884
#[inline]
18831885
#[stable(feature = "volatile", since = "1.9.0")]
18841886
#[rustc_diagnostic_item = "ptr_write_volatile"]
1885-
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
1887+
#[track_caller]
18861888
pub unsafe fn write_volatile<T>(dst: *mut T, src: T) {
18871889
// SAFETY: the caller must uphold the safety contract for `volatile_store`.
18881890
unsafe {

‎library/core/src/ptr/non_null.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ impl<T: ?Sized> NonNull<T> {
192192
#[stable(feature = "nonnull", since = "1.25.0")]
193193
#[rustc_const_stable(feature = "const_nonnull_new_unchecked", since = "1.25.0")]
194194
#[inline]
195+
#[track_caller]
195196
pub const unsafe fn new_unchecked(ptr: *mut T) -> Self {
196197
// SAFETY: the caller must guarantee that `ptr` is non-null.
197198
unsafe {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,7 @@ impl<T> [T] {
923923
/// [undefined behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
924924
#[unstable(feature = "slice_swap_unchecked", issue = "88539")]
925925
#[rustc_const_unstable(feature = "const_swap", issue = "83163")]
926+
#[track_caller]
926927
pub const unsafe fn swap_unchecked(&mut self, a: usize, b: usize) {
927928
assert_unsafe_precondition!(
928929
check_library_ub,
@@ -1268,6 +1269,7 @@ impl<T> [T] {
12681269
#[unstable(feature = "slice_as_chunks", issue = "74985")]
12691270
#[inline]
12701271
#[must_use]
1272+
#[track_caller]
12711273
pub const unsafe fn as_chunks_unchecked<const N: usize>(&self) -> &[[T; N]] {
12721274
assert_unsafe_precondition!(
12731275
check_language_ub,
@@ -1425,6 +1427,7 @@ impl<T> [T] {
14251427
#[unstable(feature = "slice_as_chunks", issue = "74985")]
14261428
#[inline]
14271429
#[must_use]
1430+
#[track_caller]
14281431
pub const unsafe fn as_chunks_unchecked_mut<const N: usize>(&mut self) -> &mut [[T; N]] {
14291432
assert_unsafe_precondition!(
14301433
check_language_ub,
@@ -1951,6 +1954,7 @@ impl<T> [T] {
19511954
#[rustc_const_stable(feature = "const_slice_split_at_unchecked", since = "1.77.0")]
19521955
#[inline]
19531956
#[must_use]
1957+
#[track_caller]
19541958
pub const unsafe fn split_at_unchecked(&self, mid: usize) -> (&[T], &[T]) {
19551959
// HACK: the const function `from_raw_parts` is used to make this
19561960
// function const; previously the implementation used
@@ -2004,6 +2008,7 @@ impl<T> [T] {
20042008
#[rustc_const_unstable(feature = "const_slice_split_at_mut", issue = "101804")]
20052009
#[inline]
20062010
#[must_use]
2011+
#[track_caller]
20072012
pub const unsafe fn split_at_mut_unchecked(&mut self, mid: usize) -> (&mut [T], &mut [T]) {
20082013
let len = self.len();
20092014
let ptr = self.as_mut_ptr();

‎library/core/src/str/traits.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ unsafe impl SliceIndex<str> for ops::Range<usize> {
188188
}
189189
}
190190
#[inline]
191+
#[track_caller]
191192
unsafe fn get_unchecked(self, slice: *const str) -> *const Self::Output {
192193
let slice = slice as *const [u8];
193194

@@ -215,6 +216,7 @@ unsafe impl SliceIndex<str> for ops::Range<usize> {
215216
}
216217
}
217218
#[inline]
219+
#[track_caller]
218220
unsafe fn get_unchecked_mut(self, slice: *mut str) -> *mut Self::Output {
219221
let slice = slice as *mut [u8];
220222

@@ -290,6 +292,7 @@ unsafe impl SliceIndex<str> for range::Range<usize> {
290292
}
291293
}
292294
#[inline]
295+
#[track_caller]
293296
unsafe fn get_unchecked(self, slice: *const str) -> *const Self::Output {
294297
let slice = slice as *const [u8];
295298

@@ -317,6 +320,7 @@ unsafe impl SliceIndex<str> for range::Range<usize> {
317320
}
318321
}
319322
#[inline]
323+
#[track_caller]
320324
unsafe fn get_unchecked_mut(self, slice: *mut str) -> *mut Self::Output {
321325
let slice = slice as *mut [u8];
322326

0 commit comments

Comments
 (0)