Auto merge of #2523 - saethlin:protector-test, r=RalfJung
Add a protector test that demonstrates the base tag diagnostic Per https://github.com/rust-lang/miri/pull/2519#issuecomment-1232736295, this demonstrates this case for protector diagnostics: ``` help: <3131> was created here, as a base tag for alloc1623 --> tests/fail/stacked_borrows/invalidate_against_protector3.rs:10:19 | 10 | let ptr = std::alloc::alloc(std::alloc::Layout::for_value(&0i32)) as *mut i32; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` This diagnostic is inspired by what Miri used to do with https://github.com/rust-lang/rust/issues/60076#issuecomment-1214169179
This commit is contained in:
commit
2d50443401
@ -332,7 +332,7 @@ impl<'span, 'history, 'ecx, 'mir, 'tcx> DiagnosticCx<'span, 'history, 'ecx, 'mir
|
||||
// this allocation.
|
||||
if self.history.base.0.tag() == tag {
|
||||
Some((
|
||||
format!("{:?} was created here, as a base tag for {:?}", tag, self.history.id),
|
||||
format!("{:?} was created here, as the base tag for {:?}", tag, self.history.id),
|
||||
self.history.base.1.data()
|
||||
))
|
||||
} else {
|
||||
|
15
tests/fail/stacked_borrows/invalidate_against_protector3.rs
Normal file
15
tests/fail/stacked_borrows/invalidate_against_protector3.rs
Normal file
@ -0,0 +1,15 @@
|
||||
use std::alloc::{alloc, Layout};
|
||||
|
||||
fn inner(x: *mut i32, _y: &i32) {
|
||||
// If `x` and `y` alias, retagging is fine with this... but we really
|
||||
// shouldn't be allowed to write to `x` at all because `y` was assumed to be
|
||||
// immutable for the duration of this call.
|
||||
unsafe { *x = 0 }; //~ ERROR: protect
|
||||
}
|
||||
|
||||
fn main() {
|
||||
unsafe {
|
||||
let ptr = alloc(Layout::for_value(&0i32)) as *mut i32;
|
||||
inner(ptr, &*ptr);
|
||||
};
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
error: Undefined Behavior: not granting access to tag <TAG> because that would remove [SharedReadOnly for <TAG>] which is protected because it is an argument of call ID
|
||||
--> $DIR/invalidate_against_protector3.rs:LL:CC
|
||||
|
|
||||
LL | unsafe { *x = 0 };
|
||||
| ^^^^^^ not granting access to tag <TAG> because that would remove [SharedReadOnly for <TAG>] which is protected because it is an argument of call ID
|
||||
|
|
||||
= help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental
|
||||
= help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information
|
||||
help: <TAG> was created here, as the base tag for ALLOC
|
||||
--> $DIR/invalidate_against_protector3.rs:LL:CC
|
||||
|
|
||||
LL | let ptr = alloc(Layout::for_value(&0i32)) as *mut i32;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
help: <TAG> is this argument
|
||||
--> $DIR/invalidate_against_protector3.rs:LL:CC
|
||||
|
|
||||
LL | fn inner(x: *mut i32, _y: &i32) {
|
||||
| ^^
|
||||
= note: BACKTRACE:
|
||||
= note: inside `inner` at $DIR/invalidate_against_protector3.rs:LL:CC
|
||||
note: inside `main` at $DIR/invalidate_against_protector3.rs:LL:CC
|
||||
--> $DIR/invalidate_against_protector3.rs:LL:CC
|
||||
|
|
||||
LL | inner(ptr, &*ptr);
|
||||
| ^^^^^^^^^^^^^^^^^
|
||||
|
||||
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
|
||||
|
||||
error: aborting due to previous error
|
||||
|
Loading…
x
Reference in New Issue
Block a user