diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index 56e45c3695f..aff36aba01f 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -1333,6 +1333,7 @@ pub(crate) fn is_aligned_and_not_null(ptr: *const T) -> bool { /// Checks whether the regions of memory starting at `src` and `dst` of size /// `count * size_of::()` overlap. +#[cfg(not(miri))] // Cannot compare with `>` across allocations in Miri fn overlaps(src: *const T, dst: *const T, count: usize) -> bool { let src_usize = src as usize; let dst_usize = dst as usize; @@ -1437,6 +1438,7 @@ pub unsafe fn copy_nonoverlapping(src: *const T, dst: *mut T, count: usize) { debug_assert!(is_aligned_and_not_null(src), "attempt to copy from unaligned or null pointer"); debug_assert!(is_aligned_and_not_null(dst), "attempt to copy to unaligned or null pointer"); + #[cfg(not(miri))] debug_assert!(!overlaps(src, dst, count), "attempt to copy to overlapping memory"); copy_nonoverlapping(src, dst, count) } diff --git a/src/tools/miri b/src/tools/miri index b5ddc94bf02..b269bb07078 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit b5ddc94bf02c641e5acbb08ae742014f40347f10 +Subproject commit b269bb07078446c9c153e0f2acaf83bf8f19b935