Check that all hidden types are the same and then deduplicate them.#95731
Merged
bors merged 1 commit intorust-lang:masterfrom Apr 6, 2022
Merged
Check that all hidden types are the same and then deduplicate them.#95731bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
compiler-errors
approved these changes
Apr 6, 2022
Contributor
compiler-errors
left a comment
There was a problem hiding this comment.
r=me with or without comment addressed
| // once we convert the generic parameters to those of the opaque type. | ||
| if let Some(prev) = result.get_mut(&opaque_type_key) { | ||
| if prev.ty != ty { | ||
| let mut err = infcx.tcx.sess.struct_span_err( |
Contributor
There was a problem hiding this comment.
Is this an error that we can trigger from code? If so, could you add a unit test (if it's easy to reproduce)?
Otherwise, maybe we can bug (or delay a bug) here instead if it should never happen.
Contributor
Author
There was a problem hiding this comment.
It should with type-alias-impl-trait, but due to a funky bug it never happens in practice. I'll prep a second PR that we won't backport that does this.
Until then, I'll leave in this error just so in case I'm wrong, we get an error instead of an ICE on beta.
Contributor
Author
|
@bors r=compiler-errors |
Collaborator
|
📌 Commit 27dc503 has been approved by |
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 6, 2022
…piler-errors Check that all hidden types are the same and then deduplicate them. fixes rust-lang#95538 This used to trigger a sanity check. Now we accept that there may be multiple places where a hidden type is constrained and we merge all of these at the end. Ideally we'd merge eagerly, but that is a larger refactoring that I don't want to put into a backport
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 6, 2022
Rollup of 6 pull requests Successful merges: - rust-lang#95342 (Ignore "format the world" commit in git blame) - rust-lang#95353 ([bootstrap] Give a hard error when filtering tests for a file that does not exist) - rust-lang#95649 (New mir-opt deref_separator) - rust-lang#95721 (Fix typo in bootstrap/setup.rs) - rust-lang#95730 (Rename RWLock to RwLock in std::sys.) - rust-lang#95731 (Check that all hidden types are the same and then deduplicate them.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Contributor
|
Beta backport decision postponed to next week, this patch was merged just a few hours ago, so there are not yet perf results to look at. |
Contributor
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 25, 2022
…ulacrum [beta] backports rollup * Remove NodeIdHashingMode. rust-lang#95656 * Check that all hidden types are the same and then deduplicate them. rust-lang#95731 r? `@Mark-Simulacrum`
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
fixes #95538
This used to trigger a sanity check. Now we accept that there may be multiple places where a hidden type is constrained and we merge all of these at the end.
Ideally we'd merge eagerly, but that is a larger refactoring that I don't want to put into a backport