don't ICE when normalizing closure input tys #99818
Merged
+150
−58
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
T-compiler
|
r? @estebank (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
aliemjay
force-pushed
the
fix-closure-normalize
branch
from
6c48927 to
8b185f9
Compare
This comment has been minimized.
This comment has been minimized.
aliemjay
force-pushed
the
fix-closure-normalize
branch
2 times, most recently
from
26cccca to
4eae7a1
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Sep 2, 2022
…stebank don't ICE when normalizing closure input tys We were ICEing while rendering diagnostics because `universe_causes` is expected to track every universe created in the typeck's infcx. `normalize_and_add_constraints` doesn't update `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to better track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes. Fixes rust-lang#99665
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Sep 2, 2022
…stebank don't ICE when normalizing closure input tys We were ICEing while rendering diagnostics because `universe_causes` is expected to track every universe created in the typeck's infcx. `normalize_and_add_constraints` doesn't update `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to better track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes. Fixes rust-lang#99665
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Sep 2, 2022
…stebank don't ICE when normalizing closure input tys We were ICEing while rendering diagnostics because `universe_causes` is expected to track every universe created in the typeck's infcx. `normalize_and_add_constraints` doesn't update `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to better track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes. Fixes rust-lang#99665
bors
added
S-waiting-on-author
|
Triage: #101708 fixed the issue, maybe we could close this PR? |
|
Closing based on the above comment. @aliemjay apologies for this not landing this faster, and thank you for taking the time to try and fix this in the first place! In the future, feel free to ping me if I'm assigned as reviewer and take a long time to get to it ^_^ |
aliemjay
force-pushed
the
fix-closure-normalize
branch
from
4eae7a1 to
2522a20
Compare
|
Why are there some tests removed? |
estebank
approved these changes
Sep 27, 2022
The tests were covered in #101708, so I thought they're unnecessary. |
|
@aliemjay I'm confused because the test introduced in that PR is |
aliemjay
force-pushed
the
fix-closure-normalize
branch
from
2522a20 to
31d807e
Compare
This comment has been minimized.
This comment has been minimized.
`normalize_and_add_constraints` doesn't add entries in `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes.
aliemjay
force-pushed
the
fix-closure-normalize
branch
from
31d807e to
fc3d7eb
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 8, 2022
…ackh726 don't ICE when normalizing closure input tys We were ICEing while rendering diagnostics because `universe_causes` is expected to track every universe created in the typeck's infcx. `normalize_and_add_constraints` doesn't update `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to better track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes. Fixes rust-lang#102800 ~Fixess rust-lang#99665~ (UPDATE: no longer true; the issue has a different failure path than when this PR was created and should be fixed by rust-lang#101708, but the changes in this PR are still correct and should prevent potential future ICEs)
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 8, 2022
…ackh726 don't ICE when normalizing closure input tys We were ICEing while rendering diagnostics because `universe_causes` is expected to track every universe created in the typeck's infcx. `normalize_and_add_constraints` doesn't update `universe_causes` when creating new universes, causing an ICE. Remove it! Add spans to better track normalization constraints. Fix couple places where `universe_causes` is not updated correctly to track newly added universes. Fixes rust-lang#102800 ~Fixess rust-lang#99665~ (UPDATE: no longer true; the issue has a different failure path than when this PR was created and should be fixed by rust-lang#101708, but the changes in this PR are still correct and should prevent potential future ICEs)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 9, 2022
Rollup of 8 pull requests Successful merges: - rust-lang#99818 (don't ICE when normalizing closure input tys) - rust-lang#102514 (Don't repeat lifetime names from outer binder in print) - rust-lang#102661 (rustdoc: Document effect of fundamental types) - rust-lang#102782 (Add regression test for rust-lang#102124) - rust-lang#102790 (Fix llvm-tblgen for cross compiling) - rust-lang#102807 (Document `rust-docs-json` component) - rust-lang#102812 (Remove empty core::lazy and std::lazy) - rust-lang#102818 (Clean up rustdoc highlight.rs imports a bit) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We were ICEing while rendering diagnostics because
universe_causesis expected to track every universe created in the typeck's infcx.normalize_and_add_constraintsdoesn't updateuniverse_causeswhen creating new universes, causing an ICE. Remove it!
Add spans to better track normalization constraints.
Fix couple places where
universe_causesis not updated correctly totrack newly added universes.
Fixes #102800
Fixess #99665(UPDATE: no longer true; the issue has a different failure path than when this PR was created and should be fixed by #101708, but the changes in this PR are still correct and should prevent potential future ICEs)