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.

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

Normalize generator-local types with unevaluated constants #92636

Merged
merged 1 commit into from
Jan 10, 2022
Merged

Normalize generator-local types with unevaluated constants #92636

merged 1 commit into from
Jan 10, 2022

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Jan 7, 2022 •
edited
Loading

Normalize generator-interior types in addition to (i.e. instead of just) erasing regions, since sometimes we collect types with unevaluated const exprs.

Fixes #84737
Fixes #88171
Fixes #92091
Fixes #92634
Probably also fixes #73114, but that one has no code I could test. It looks like it's the same issue, though.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 7, 2022
@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 Jan 7, 2022
@compiler-errors
Copy link
Member Author

compiler-errors commented Jan 7, 2022 •
edited
Loading

r? @oli-obk
since you originally added the code that normalizes these types at all

cc @rust-lang/project-const-generics
(idk how to cc project groups actually, or if this actually works) (edit: that didn't work lol)

@oli-obk
Copy link
Contributor

oli-obk commented Jan 8, 2022

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 8, 2022
@bors
Copy link
Contributor

bors commented Jan 8, 2022

⌛ Trying commit d35b23e with merge 4c6ea369702de2baa030f0feb5cc1a40d2cfb8c9...

@bors
Copy link
Contributor

bors commented Jan 8, 2022

☀️ Try build successful - checks-actions
Build commit: 4c6ea369702de2baa030f0feb5cc1a40d2cfb8c9 (4c6ea369702de2baa030f0feb5cc1a40d2cfb8c9)

@rust-timer
Copy link
Collaborator

Queued 4c6ea369702de2baa030f0feb5cc1a40d2cfb8c9 with parent 488acf8, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4c6ea369702de2baa030f0feb5cc1a40d2cfb8c9): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 9, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jan 9, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 9, 2022

📌 Commit d35b23e 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 Jan 9, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 9, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 9, 2022
@matthiaskrgr
Rollup merge of rust-lang#92636 - compiler-errors:normalize-generator…
a8edbfe 
…-const-expr, r=oli-obk

Normalize generator-local types with unevaluated constants

Normalize generator-interior types in addition to (i.e. instead of just) erasing regions, since sometimes we collect types with unevaluated const exprs.

Fixes rust-lang#84737
Fixes rust-lang#88171
Fixes rust-lang#92091
Fixes rust-lang#92634
Probably also fixes rust-lang#73114, but that one has no code I could test. It looks like it's the same issue, though.
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 10, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 10, 2022
@bors
Auto merge of rust-lang#92719 - matthiaskrgr:rollup-tc7oqys, r=matthi…
89b9f7b 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#92248 (Normalize struct tail type when checking Pointee trait)
 - rust-lang#92357 (Fix invalid removal of newlines from doc comments)
 - rust-lang#92602 (Make source links look cleaner)
 - rust-lang#92636 (Normalize generator-local types with unevaluated constants)
 - rust-lang#92693 (Release notes: add `Result::unwrap_{,err_}unchecked`)
 - rust-lang#92702 (Clean up lang_items::extract)
 - rust-lang#92717 (update miri)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ca9fc28 into rust-lang:master Jan 10, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 10, 2022
@compiler-errors compiler-errors deleted the normalize-generator-const-expr branch April 7, 2022 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

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.60.0
7 participants
@compiler-errors @rust-highfive @oli-obk @rust-timer @bors @matthewjasper @rustbot