Skip to content

update Miri #62823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 23, 2019
Merged

update Miri #62823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca61fb
update Miri
RalfJung Jul 20, 2019
10f877b
disable overlapping check with Miri (does not work without intptrcast)
RalfJung Jul 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/libcore/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 18 files
+2 −2 README.md
+3 −3 benches/helpers/miri_helper.rs
+1 −1 rust-version
+5 −5 src/bin/miri-rustc-tests.rs
+18 −10 src/bin/miri.rs
+4 −5 src/eval.rs
+8 −0 src/helpers.rs
+2 −2 src/machine.rs
+1 −1 src/shims/foreign_items.rs
+2 −2 src/shims/tls.rs
+0 −0 tests/compile-fail-norustc/copy_nonoverlapping.rs
+0 −0 tests/compile-fail-norustc/copy_null.rs
+0 −0 tests/compile-fail-norustc/copy_unaligned.rs
+1 −1 tests/compile-fail/validity/dangling_ref1.rs
+1 −1 tests/compile-fail/validity/dangling_ref2.rs
+7 −0 tests/compiletest.rs
+17 −0 tests/run-pass/arrays.rs
+1 −0 tests/run-pass/arrays.stdout