Skip to content

Miri engine: entirely skip interning of ZST, and improve some comments #78179

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 2 commits into from
Oct 25, 2020
Merged

Miri engine: entirely skip interning of ZST, and improve some comments #78179

merged 2 commits into from
Oct 25, 2020

Conversation

RalfJung
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 21, 2020
@RalfJung RalfJung mentioned this pull request Oct 21, 2020
Merged
@oli-obk
Copy link
Contributor

oli-obk commented Oct 21, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 21, 2020

📌 Commit fcaf233 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 Oct 21, 2020
wesleywiser
wesleywiser reviewed Oct 21, 2020
View reviewed changes
compiler/rustc_mir/src/interpret/intern.rs
Comment on lines +192 to +193
// ZSTs cannot contain pointers, so we can skip them.
if mplace.layout.is_zst() {
Copy link
Member

Choose a reason for hiding this comment

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

Thanks @RalfJung! I was about to make this change tonight.

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 22, 2020
@Dylan-DPC
Rollup merge of rust-lang#78179 - RalfJung:miri-comments, r=oli-obk
03a4fcb 
Miri engine: entirely skip interning of ZST, and improve some comments

r? @oli-obk
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Oct 22, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 25, 2020
@Dylan-DPC
Rollup merge of rust-lang#78179 - RalfJung:miri-comments, r=oli-obk
423d164 
Miri engine: entirely skip interning of ZST, and improve some comments

r? `@oli-obk`
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Oct 25, 2020
Closed
@bors
Copy link
Collaborator

bors commented Oct 25, 2020

⌛ Testing commit fcaf233 with merge 4760b8f...

@bors
Copy link
Collaborator

bors commented Oct 25, 2020

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 4760b8f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2020
@bors bors merged commit 4760b8f into rust-lang:master Oct 25, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 25, 2020
This was referenced Oct 25, 2020
Merged
Closed
@RalfJung RalfJung deleted the miri-comments branch October 26, 2020 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wesleywiser wesleywiser wesleywiser left review comments

Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.
6 participants
@RalfJung @oli-obk @bors @wesleywiser @rust-highfive @rustbot