Miscellaneous RequirementMachine fixes #39157
Merged
Conversation
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
If resolving an overlap produces a pair where both sides are equal, we don't have to reduce both sides before throwing it out.
The left and right hand side of a merged associated type candidate rule have a common prefix except for the associated type symbol at the end. Instead of passing two MutableTerms, we can pass a single uniqued Term and a Symbol. Also, we can compute the merged symbol before pushing the candidate onto the vector. This avoids unnecessary work if the merged symbol is equal to the right hand side's symbol.
If you have a class with an (invalid) protocol nested inside:
class OuterGenericClass<T, U> {
protocol InnerProtocol : OuterGenericClass {}
}
The reference to 'OuterGenericClass' in the protocol's inheritance
clause is not "in context", and should not have inferred generic
arguments <T, U>, because the protocol does not inherit the generic
arguments of the outer scope.
Previously, this would trigger an assertion in the requirement
machine, because the generic parameter τ_0_1 is not a valid generic
parameter in the protocol's generic signature.
|
@swift-ci Please smoke test |
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.
No description provided.