diff options
| author | Ralf Jung <post@ralfj.de> | 2019-07-20 17:04:55 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-07-21 12:28:06 +0200 |
| commit | 10f877b5ea4ddbdfb2364a1ff82ad4fa37b76ae7 (patch) | |
| tree | 709e7727c19e95e2032d048a1543c68e8c752f5b /src/libcore | |
| parent | dca61fb9f1fb496db9b4a9711ead31249c2096f2 (diff) | |
| download | rust-10f877b5ea4ddbdfb2364a1ff82ad4fa37b76ae7.tar.gz rust-10f877b5ea4ddbdfb2364a1ff82ad4fa37b76ae7.zip | |
disable overlapping check with Miri (does not work without intptrcast)
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/intrinsics.rs | 2 |
1 files changed, 2 insertions, 0 deletions
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<T>(ptr: *const T) -> bool { /// Checks whether the regions of memory starting at `src` and `dst` of size /// `count * size_of::<T>()` overlap. +#[cfg(not(miri))] // Cannot compare with `>` across allocations in Miri fn overlaps<T>(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<T>(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) } |
