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

Erase regions before calculating layout for packed field capture #92242

Merged
merged 1 commit into from
Feb 11, 2022

Conversation

compiler-errors
Copy link
Member

Self-explanatory. We just erase region inferencing because we don't need that for layout computation... Q: layouts are always equal modulo regions, right?

Fixes #92240

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 24, 2021
@rust-highfive
Copy link
Collaborator

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 24, 2021
@compiler-errors
Copy link
Member Author

compiler-errors commented Dec 24, 2021

cc: @arora-aman who wrote #82878, and @nikomatsakis who approved it. Assume y'all know this code best.

@compiler-errors
Copy link
Member Author

Should I add a test for this? Is there a test flag for the existing packed-struct-drop-aligned.rs (re #92240) that can test it with incremental as well?

@arora-aman
Copy link
Member

I think this change is fine. We erase regions in any information we carry forward in writeback anyway.

That said Niko or Mattew probably understand the possible edge cases way better than I do.

@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 23, 2022
@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Feb 10, 2022

📌 Commit 1458687 has been approved by matthewjasper

@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 Feb 10, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2022
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#92242 (Erase regions before calculating layout for packed field capture)
 - rust-lang#93443 (Add comment on stable_hash_impl for OwnerNodes)
 - rust-lang#93742 (Drop rustc-docs from complete profile)
 - rust-lang#93852 (rustdoc: remove support for multi-query search)
 - rust-lang#93853 (Make all `hir::Map` methods consistently by-value)
 - rust-lang#93861 (Fix ICE if no trait assoc const eq)
 - rust-lang#93862 (Split x86_64-apple builder into two)
 - rust-lang#93864 (Remove ArchiveBuilder::update_symbols)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 664255b into rust-lang:master Feb 11, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 11, 2022
@compiler-errors compiler-errors deleted the layout-modulo-regions branch April 7, 2022 04:37
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.

incremental ICE: StableHasher: unexpected region '_#44 compiler/rustc_middle/src/ty/impls_ty.rs:97:17
7 participants