Skip to content

Retag as FnEntry on drop_in_place #103957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 22, 2022
Merged

Retag as FnEntry on drop_in_place #103957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
102040c
Retag as FnEntry on `drop_in_place`
JakobDegen Nov 4, 2022
c359ab0
Retag argument to `drop_in_place` unconditionally
JakobDegen Dec 6, 2022
37e0016
Bless tests
JakobDegen Dec 10, 2022
0229281
Don't run `Drop` terminators on types that do not have drop glue in c…
JakobDegen Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bless tests
  • Loading branch information
@JakobDegen
JakobDegen committed Dec 21, 2022
commit 37e00165e408c0e0bca0072f282b790888254bc2
2 changes: 1 addition & 1 deletion src/tools/miri/tests/fail/stacked_borrows/drop_in_place_protector.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ LL | core::ptr::drop_in_place(x);
= note: inside `<HasDrop as std::ops::Drop>::drop` at $DIR/drop_in_place_protector.rs:LL:CC
= note: inside `std::ptr::drop_in_place::<HasDrop> - shim(Some(HasDrop))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
= note: inside `std::ptr::drop_in_place::<(HasDrop, u8)> - shim(Some((HasDrop, u8)))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
note: inside `main` at $DIR/drop_in_place_protector.rs:LL:CC
note: inside `main`
--> $DIR/drop_in_place_protector.rs:LL:CC
|
LL | core::ptr::drop_in_place(x);
Expand Down
4 changes: 2 additions & 2 deletions src/tools/miri/tests/fail/stacked_borrows/drop_in_place_retag.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LL | pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
| trying to retag from <TAG> for Unique permission at ALLOC[0x0], but that tag only grants SharedReadOnly permission for this location
| this error occurs as part of FnEntry retag at ALLOC[0x0..0x1]
| this error occurs as part of retag at ALLOC[0x0..0x1]
|
= 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
Expand All @@ -16,7 +16,7 @@ LL | let x = core::ptr::addr_of!(x);
| ^^^^^^^^^^^^^^^^^^^^^^
= note: BACKTRACE:
= note: inside `std::ptr::drop_in_place::<u8> - shim(None)` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
note: inside `main` at $DIR/drop_in_place_retag.rs:LL:CC
note: inside `main`
--> $DIR/drop_in_place_retag.rs:LL:CC
|
LL | core::ptr::drop_in_place(x.cast_mut());
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/tests/fail/unaligned_pointers/drop_in_place.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
= note: BACKTRACE:
= note: inside `std::ptr::drop_in_place::<PartialDrop> - shim(Some(PartialDrop))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
note: inside `main` at $DIR/drop_in_place.rs:LL:CC
note: inside `main`
--> $DIR/drop_in_place.rs:LL:CC
|
LL | core::ptr::drop_in_place(p);
Expand Down