diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2023-03-18 16:11:48 +0000 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2023-04-21 21:34:59 +0000 |
| commit | 2870d269f5eb26e77ccf7718080afc62edaca8da (patch) | |
| tree | a90661423986bc752943a3817b4e9dcfacbfd7f6 /src/tools | |
| parent | ddfa2463e205a1bcae51aeb2698f09b4b8288e3d (diff) | |
| download | rust-2870d269f5eb26e77ccf7718080afc62edaca8da.tar.gz rust-2870d269f5eb26e77ccf7718080afc62edaca8da.zip | |
Actually keep `PlaceMention` if requested.
Diffstat (limited to 'src/tools')
3 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index f67a718ba73..fc938080a0e 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -130,6 +130,7 @@ pub const MIRI_DEFAULT_ARGS: &[&str] = &[ "-Zalways-encode-mir", "-Zextra-const-ub-checks", "-Zmir-emit-retag", + "-Zmir-keep-place-mention", "-Zmir-opt-level=0", "-Zmir-enable-passes=-CheckAlignment", ]; diff --git a/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.rs b/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.rs index 3b2aba67a68..7c5f440b774 100644 --- a/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.rs +++ b/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.rs @@ -6,6 +6,8 @@ fn main() { let b = Box::new(42); &*b as *const i32 }; - let _ = unsafe { *p }; //~ ERROR: dereferenced after this allocation got freed + unsafe { + let _ = *p; //~ ERROR: dereferenced after this allocation got freed + } panic!("this should never print"); } diff --git a/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.stderr b/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.stderr index e047c3287b5..7b76389c753 100644 --- a/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.stderr +++ b/src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_deref_underscore.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: pointer to ALLOC was dereferenced after this allocation got freed --> $DIR/dangling_pointer_deref_underscore.rs:LL:CC | -LL | let _ = unsafe { *p }; - | ^^ pointer to ALLOC was dereferenced after this allocation got freed +LL | let _ = *p; + | ^^ pointer to ALLOC was dereferenced after this allocation got freed | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information |