Adjust Allocation Bytes used by Miri to custom MiriAllocBytes #3526
Conversation
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
RalfJung
reviewed
Apr 30, 2024
RalfJung
reviewed
May 3, 2024
This comment was marked as outdated.
This comment was marked as outdated.
Merged
bors
added a commit
that referenced
this pull request
May 3, 2024
Preparing for merge from rustc Unblocks #3526.
|
If you rebase over the latest Miri master, you should get the updated rustc that includes your PR, so that this one can finally build. :) |
RalfJung
pushed a commit
to RalfJung/rust
that referenced
this pull request
May 4, 2024
Preparing for merge from rustc Unblocks rust-lang/miri#3526.
RalfJung
pushed a commit
to RalfJung/rust
that referenced
this pull request
May 4, 2024
Preparing for merge from rustc Unblocks rust-lang/miri#3526.
RalfJung
added
the
S-waiting-on-author
|
There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged. You can start a rebase with the following commands: The following commits are merge commits: |
RalfJung
reviewed
May 16, 2024
|
Looks good, thanks! Please squash this into a single commit. |
attempt changing Bytes in MiriMachine to MiriAllocBytes rename miri_alloc_bytes to alloc_bytes generalize impl VisitProvenance for Allocation for any Bytes: AllocBytes mend MiriAllocBytes -> Self::Bytes fix Invariant documentation and bugs (drop), impl Clone Update MiriAllocBytes description Co-authored-by: Ralf Jung <post@ralfj.de> Rephrase MiriAllocBytes ptr invariant Co-authored-by: Ralf Jung <post@ralfj.de> Update MiriAllocBytes ptr documentation Co-authored-by: Ralf Jung <post@ralfj.de> fix safety comment in MiriAllocBytes::clone fix safety comment in MiriAllocBytes::from_bytes try implementing clone without unsafe remove derive(PartialEq,Eq,Hash), fix fmt move ptr.is_null() check inside only necessary branch use std::ptr::without_provenance_mut, requiring feature(strict_provenance) align.bytes_usize() instead of align.bytes().try_into().unwrap() Update src/provenance_gc.rs Co-authored-by: Ralf Jung <post@ralfj.de> fix clippy error on deref
|
Thanks! Force-pushes do not always trigger a notification on github, so you have to let the reviewer know that the PR is ready again. In Rust we have the @bors r+ |
|
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
May 24, 2024
Bugfix `MiriAllocBytes` to guarantee different addresses Fix in `alloc_bytes.rs` following #3526 Currently when an allocation of `size == 0` is requested we return a `std::ptr::without_provenance_mut(align)`, but this means returned `ptr`s may overlap, which breaks things.
RalfJung
pushed a commit
to RalfJung/rust
that referenced
this pull request
May 26, 2024
Bugfix `MiriAllocBytes` to guarantee different addresses Fix in `alloc_bytes.rs` following rust-lang/miri#3526 Currently when an allocation of `size == 0` is requested we return a `std::ptr::without_provenance_mut(align)`, but this means returned `ptr`s may overlap, which breaks things.
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
Jun 28, 2024
Bugfix `MiriAllocBytes` to guarantee different addresses Fix in `alloc_bytes.rs` following rust-lang/miri#3526 Currently when an allocation of `size == 0` is requested we return a `std::ptr::without_provenance_mut(align)`, but this means returned `ptr`s may overlap, which breaks things.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the
MiriMachineusedtype Bytes = Box<[u8]>for its allocations.This PR swaps this out for a custom
MiriAllocBytestype implemented inalloc_bytes.rs.This is in anticipation of an extension to Miri's FFI, which will require its allocations to take care of alignment (the methods in
impl AllocBytes for Box<[u8]>ignore this_align: Alignargument).Needs rust-lang/rust#124492