Skip to content

Commit

Permalink
Auto merge of rust-lang#62944 - RalfJung:miri, r=oli-obk
Browse files Browse the repository at this point in the history
bump Miri

Fixes rust-lang#62919.

r? @oli-obk
  • Loading branch information
bors committed Jul 25, 2019
2 parents 185b9ac + f2900b0 commit eedf6ce
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions src/libcore/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,6 @@ 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 @@ -1438,7 +1437,6 @@ 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
Submodule miri updated 39 files
+4 −4 README.md
+1 −1 rust-version
+2 −2 src/eval.rs
+5 −18 src/helpers.rs
+9 −4 src/intptrcast.rs
+1 −0 src/lib.rs
+8 −17 src/machine.rs
+11 −103 src/operator.rs
+2 −1 src/shims/foreign_items.rs
+4 −4 src/stacked_borrows.rs
+2 −2 tests/compile-fail/cast_box_int_to_fn_ptr.rs
+1 −1 tests/compile-fail/cast_int_to_fn_ptr.rs
+0 −13 tests/compile-fail/getrandom.rs
+1 −1 tests/compile-fail/intptrcast_alignment_check.rs
+0 −10 tests/compile-fail/intptrcast_cast_int_to_fn_ptr.rs
+0 −6 tests/compile-fail/intptrcast_null_pointer_deref.rs
+0 −7 tests/compile-fail/intptrcast_wild_pointer_deref.rs
+0 −0 tests/compile-fail/pointer_byte_read.rs
+0 −7 tests/compile-fail/pointer_byte_read_1.rs
+0 −7 tests/compile-fail/ptr_bitops1.rs
+0 −5 tests/compile-fail/ptr_bitops2.rs
+0 −10 tests/compile-fail/ptr_eq_dangling.rs
+0 −6 tests/compile-fail/ptr_eq_integer.rs
+0 −9 tests/compile-fail/ptr_eq_out_of_bounds.rs
+0 −6 tests/compile-fail/ptr_eq_out_of_bounds_null.rs
+0 −8 tests/compile-fail/ptr_int_cast.rs
+1 −1 tests/compile-fail/ptr_offset_int_plus_int.rs
+1 −1 tests/compile-fail/ptr_offset_int_plus_ptr.rs
+0 −5 tests/compile-fail/ptr_rem.rs
+0 −8 tests/compile-fail/ptr_wrapping_offset_int_plus_ptr.rs
+1 −1 tests/compile-fail/validity/dangling_ref1.rs
+1 −1 tests/compile-fail/wild_pointer_deref.rs
+2 −6 tests/compiletest.rs
+0 −26 tests/run-pass-noseed/intptrcast.rs
+2 −2 tests/run-pass/bitop-beyond-alignment.rs
+0 −2 tests/run-pass/hashmap.rs
+0 −1 tests/run-pass/heap_allocator.rs
+89 −0 tests/run-pass/intptrcast.rs
+0 −1 tests/run-pass/malloc.rs

0 comments on commit eedf6ce

Please sign in to comment.