Skip to content
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.

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

interpret/memory: simplify check_and_deref_ptr #95221

Merged
merged 2 commits into from
Mar 24, 2022

Conversation

RalfJung
Copy link
Member

Finally I saw a way to make this code simpler. The odd preprocessing in let ptr_or_addr = has bothered me since forever, but it actually became unnecessary in the last provenance refactoring. :)

This also leads to slightly more explicit error messages as a nice side-effect. 🎉

r? @oli-obk

@rust-highfive
Copy link
Collaborator

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 22, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 22, 2022
@rust-log-analyzer

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Mar 23, 2022

@bors r+

I wondered for a sec "how does this work" and then remembered the recent refactorings, and then read your PR comment. Yea... should've probably done these steps in reverse :D

@oli-obk
Copy link
Contributor

oli-obk commented Mar 23, 2022

@bors rollup

@bors
Copy link
Contributor

bors commented Mar 23, 2022

📌 Commit a76e5b1 has been approved by oli-obk

@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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 23, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2022
…askrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#94249 (Better errors when a Copy impl on a Struct is not self-consistent)
 - rust-lang#95069 (Fix auto traits in rustdoc)
 - rust-lang#95221 (interpret/memory: simplify check_and_deref_ptr)
 - rust-lang#95225 (remove `[async output]` from `impl Future` pretty-printing)
 - rust-lang#95238 (Stop emitting E0026 for struct enums with underscores)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 23ef234 into rust-lang:master Mar 24, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 24, 2022
@RalfJung RalfJung deleted the check_and_deref_ptr branch March 26, 2022 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

6 participants