forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#116915 - bend-n:unwet, r=saethlin
Add an assume that the index is inbounds to slice::get_unchecked Fixes rust-lang#116878
- Loading branch information
Showing
7 changed files
with
33 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,10 @@ | ||
//@compile-flags: -Zmiri-strict-provenance | ||
//@error-in-other-file: /retag .* tag does not exist in the borrow stack/ | ||
|
||
fn main() { | ||
unsafe { | ||
let a = [1, 2, 3]; | ||
let s = &a[0..0]; | ||
assert_eq!(s.len(), 0); | ||
assert_eq!(*s.get_unchecked(1), 2); | ||
assert_eq!(*s.as_ptr().add(1), 2); //~ ERROR: /retag .* tag does not exist in the borrow stack/ | ||
} | ||
} |
24 changes: 10 additions & 14 deletions
24
src/tools/miri/tests/fail/stacked_borrows/zst_slice.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
//@compile-flags: -Zmiri-disable-stacked-borrows | ||
fn main() { | ||
let v: Vec<u8> = Vec::with_capacity(10); | ||
let undef = unsafe { *v.get_unchecked(5) }; //~ ERROR: uninitialized | ||
let undef = unsafe { *v.as_ptr().add(5) }; //~ ERROR: uninitialized | ||
let x = undef + 1; | ||
panic!("this should never print: {}", x); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// no-system-llvm | ||
// compile-flags: -O | ||
// ignore-debug: the debug assertions get in the way | ||
#![crate_type = "lib"] | ||
|
||
/// Make sure no bounds checks are emitted after a `get_unchecked`. | ||
// CHECK-LABEL: @unchecked_slice_no_bounds_check | ||
#[no_mangle] | ||
pub unsafe fn unchecked_slice_no_bounds_check(s: &[u8]) -> u8 { | ||
let a = *s.get_unchecked(1); | ||
// CHECK-NOT: panic_bounds_check | ||
a + s[0] | ||
} |