Skip to content

Generalize adjust_from_tcx for Allocation #124492

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

Jump to bottom
Merged
merged 3 commits into from
May 3, 2024
Merged

Generalize adjust_from_tcx for Allocation #124492

merged 3 commits into from
May 3, 2024

Conversation

@Strophox
Copy link
Contributor

@Strophox Strophox commented Apr 28, 2024

Previously, adjust_from_tcx would take an Allocation and "adjust allocation from the ones in tcx to a custom Machine instance [...]".
This PR generalizes this so the Machine instance can also determine the Bytes type of the output Allocation.

r? @RalfJung

@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @RalfJung (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2024

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:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits:

@RalfJung
Copy link
Member

RalfJung commented Apr 29, 2024 via email

oli-obk
oli-obk reviewed Apr 29, 2024
View reviewed changes
@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2024

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:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits (since this message was last posted):

@RalfJung RalfJung mentioned this pull request Apr 30, 2024
Merged
@oli-obk oli-obk removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2024
@Strophox Strophox force-pushed the adjust-allocbytes branch from d9104cb to 235770c Compare May 3, 2024 12:25
@rustbot rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 3, 2024
@RalfJung
Copy link
Member

RalfJung commented May 3, 2024

Looks good, thanks!
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 3, 2024

📌 Commit 235770c has been approved by RalfJung

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 3, 2024
@RalfJung
Copy link
Member

RalfJung commented May 3, 2024

@bors r-
we had one more change planned before this should land

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 3, 2024
@RalfJung
Copy link
Member

RalfJung commented May 3, 2024

Thanks!
@bors r+

@bors
Copy link
Collaborator

bors commented May 3, 2024

📌 Commit 7acd51e has been approved by RalfJung

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 3, 2024
@RalfJung
Copy link
Member

RalfJung commented May 3, 2024

Ah no this will need formatting.

@RalfJung
Copy link
Member

RalfJung commented May 3, 2024

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 3, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Strophox Strophox force-pushed the adjust-allocbytes branch from 7acd51e to 38181cb Compare May 3, 2024 13:04
@RalfJung
Copy link
Member

RalfJung commented May 3, 2024

Now it should be good to go. :)
@bors r+

@bors
Copy link
Collaborator

bors commented May 3, 2024

📌 Commit 38181cb has been approved by RalfJung

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 3, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request May 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 3, 2024
@bors
Auto merge of rust-lang#124660 - matthiaskrgr:rollup-j8bfzfn, r=matth…
d6d3b34 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#124461 (handle the targets that are missing in stage0)
 - rust-lang#124492 (Generalize `adjust_from_tcx` for `Allocation`)
 - rust-lang#124588 (Use `ObligationCtxt` in favor of `TraitEngine` in many more places)
 - rust-lang#124612 (Add support for inputing via stdin with run-make-support)
 - rust-lang#124613 (Allow fmt to run on rmake.rs test files)
 - rust-lang#124649 (Fix HorizonOS build broken by rust-lang#124210)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit eaca729 into rust-lang:master May 3, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 3, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 3, 2024
@rust-timer
Unrolled build for rust-lang#124492
d85a9e2 
Rollup merge of rust-lang#124492 - Strophox:adjust-allocbytes, r=RalfJung

Generalize `adjust_from_tcx` for `Allocation`

Previously, `adjust_from_tcx` would take an `Allocation` and "adjust allocation from the ones in `tcx` to a custom Machine instance [...]".
This PR generalizes this so the Machine instance can also determine the `Bytes` type of the output `Allocation`.

r? `@RalfJung`
bors added a commit to rust-lang/miri that referenced this pull request May 17, 2024
@bors
Auto merge of #3526 - Strophox:miri-memory, r=RalfJung
fef1043 
Adjust Allocation Bytes used by Miri to custom MiriAllocBytes

Previously, the `MiriMachine` used `type Bytes = Box<[u8]>` for its allocations.
This PR swaps this out for a custom `MiriAllocBytes` type implemented in `alloc_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: Align` argument).

Needs rust-lang/rust#124492
RalfJung pushed a commit to RalfJung/rust that referenced this pull request May 19, 2024
@bors
Auto merge of rust-lang#3526 - Strophox:miri-memory, r=RalfJung
fffc8e9 
Adjust Allocation Bytes used by Miri to custom MiriAllocBytes

Previously, the `MiriMachine` used `type Bytes = Box<[u8]>` for its allocations.
This PR swaps this out for a custom `MiriAllocBytes` type implemented in `alloc_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: Align` argument).

Needs rust-lang#124492
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung left review comments

@oli-obk oli-obk oli-obk left review comments

Assignees

@RalfJung RalfJung

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.80.0

Development

Successfully merging this pull request may close these issues.

6 participants

@Strophox @rustbot @RalfJung @bors @rust-log-analyzer @oli-obk