Skip to content

interpret: remove MemoryExtra in favor of giving access to the Machine - #95620

Merged
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:memory-no-extras
Apr 5, 2022
Merged

interpret: remove MemoryExtra in favor of giving access to the Machine#95620
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:memory-no-extras

Conversation

@RalfJung

Copy link
Copy Markdown
Member

The Miri PR for this is upcoming.

r? @oli-obk

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 3, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 3, 2022

@oli-obkoli-obk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these changes make it very clear that this is the right way forward imo.

I still want to look over the miri changes though I don't expect anything deal breaking

Comment threadcompiler/rustc_const_eval/src/interpret/machine.rs Outdated
@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 4, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 84a343d has been approved by oli-obk

@borsbors 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 4, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 4, 2022
interpret: remove MemoryExtra in favor of giving access to the Machine
The Miri PR for this is upcoming.
r? `@oli-obk`
@Dylan-DPCDylan-DPC mentioned this pull request Apr 4, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Apr 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2022
Rollup of 7 pull requests
Successful merges:
- rust-lang#91873 (Mention implementers of unsatisfied trait)
- rust-lang#95588 (explicitly distinguish pointer::addr and pointer::expose_addr)
- rust-lang#95603 (Fix late-bound ICE in `dyn` return type suggestion)
- rust-lang#95620 (interpret: remove MemoryExtra in favor of giving access to the Machine)
- rust-lang#95630 (Update `NonNull` pointer provenance methods' documentation)
- rust-lang#95631 (Refactor: remove unnecessary nested blocks)
- rust-lang#95642 (`CandidateSource::XCandidate` -> `CandidateSource::X`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 78f81f0 into rust-lang:masterApr 5, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 5, 2022
bors added a commit to rust-lang/miri that referenced this pull request Apr 5, 2022
adjust for MemoryExtra being merged into Machine
The Miri side of rust-lang/rust#95620
@RalfJung
RalfJung deleted the memory-no-extras branch April 5, 2022 15:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@RalfJung@rust-highfive@oli-obk@bors@rustbot