Skip to content

Commit 2d50443

Browse files
committed
Auto merge of #2523 - saethlin:protector-test, r=RalfJung
Add a protector test that demonstrates the base tag diagnostic Per #2519 (comment), 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 rust-lang/rust#60076 (comment)
2 parents 8218248 + 3cfb991 commit 2d50443

File tree

3 files changed

+46
-1
lines changed

3 files changed

+46
-1
lines changed

src/stacked_borrows/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ impl<'span, 'history, 'ecx, 'mir, 'tcx> DiagnosticCx<'span, 'history, 'ecx, 'mir
332332
// this allocation.
333333
if self.history.base.0.tag() == tag {
334334
Some((
335-
format!("{:?} was created here, as a base tag for {:?}", tag, self.history.id),
335+
format!("{:?} was created here, as the base tag for {:?}", tag, self.history.id),
336336
self.history.base.1.data()
337337
))
338338
} else {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
use std::alloc::{alloc, Layout};
2+
3+
fn inner(x: *mut i32, _y: &i32) {
4+
// If `x` and `y` alias, retagging is fine with this... but we really
5+
// shouldn't be allowed to write to `x` at all because `y` was assumed to be
6+
// immutable for the duration of this call.
7+
unsafe { *x = 0 }; //~ ERROR: protect
8+
}
9+
10+
fn main() {
11+
unsafe {
12+
let ptr = alloc(Layout::for_value(&0i32)) as *mut i32;
13+
inner(ptr, &*ptr);
14+
};
15+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
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
2+
--> $DIR/invalidate_against_protector3.rs:LL:CC
3+
|
4+
LL | unsafe { *x = 0 };
5+
| ^^^^^^ not granting access to tag <TAG> because that would remove [SharedReadOnly for <TAG>] which is protected because it is an argument of call ID
6+
|
7+
= help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental
8+
= help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information
9+
help: <TAG> was created here, as the base tag for ALLOC
10+
--> $DIR/invalidate_against_protector3.rs:LL:CC
11+
|
12+
LL | let ptr = alloc(Layout::for_value(&0i32)) as *mut i32;
13+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14+
help: <TAG> is this argument
15+
--> $DIR/invalidate_against_protector3.rs:LL:CC
16+
|
17+
LL | fn inner(x: *mut i32, _y: &i32) {
18+
| ^^
19+
= note: BACKTRACE:
20+
= note: inside `inner` at $DIR/invalidate_against_protector3.rs:LL:CC
21+
note: inside `main` at $DIR/invalidate_against_protector3.rs:LL:CC
22+
--> $DIR/invalidate_against_protector3.rs:LL:CC
23+
|
24+
LL | inner(ptr, &*ptr);
25+
| ^^^^^^^^^^^^^^^^^
26+
27+
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
28+
29+
error: aborting due to previous error
30+

0 commit comments

Comments
 (0)