Skip to content

Commit eedf6ce

Browse files
committed
Auto merge of #62944 - RalfJung:miri, r=oli-obk
bump Miri Fixes #62919. r? @oli-obk
2 parents 185b9ac + f2900b0 commit eedf6ce

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

Diff for: src/libcore/intrinsics.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,6 @@ pub(crate) fn is_aligned_and_not_null<T>(ptr: *const T) -> bool {
13331333

13341334
/// Checks whether the regions of memory starting at `src` and `dst` of size
13351335
/// `count * size_of::<T>()` overlap.
1336-
#[cfg(not(miri))] // Cannot compare with `>` across allocations in Miri
13371336
fn overlaps<T>(src: *const T, dst: *const T, count: usize) -> bool {
13381337
let src_usize = src as usize;
13391338
let dst_usize = dst as usize;
@@ -1438,7 +1437,6 @@ pub unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize) {
14381437

14391438
debug_assert!(is_aligned_and_not_null(src), "attempt to copy from unaligned or null pointer");
14401439
debug_assert!(is_aligned_and_not_null(dst), "attempt to copy to unaligned or null pointer");
1441-
#[cfg(not(miri))]
14421440
debug_assert!(!overlaps(src, dst, count), "attempt to copy to overlapping memory");
14431441
copy_nonoverlapping(src, dst, count)
14441442
}

0 commit comments

Comments
 (0)