GSB: Better handling of unresolved DependentMemberTypes in maybeResolveEquivalenceClass() #35907
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
|
@swift-ci Please smoke test |
slavapestov
force-pushed
the
gsb-unresolved-nested-type-of-concrete-type
branch
from
8400c32 to
52e4cf7
Compare
|
@swift-ci Please smoke test |
slavapestov
force-pushed
the
gsb-unresolved-nested-type-of-concrete-type
branch
from
52e4cf7 to
84c836b
Compare
|
Cool, the PR test failed because this also resolved an older crasher. |
|
@swift-ci Please smoke test |
DougGregor
approved these changes
Feb 11, 2021
| return ResolvedType::forUnresolved(nullptr); | ||
|
|
||
| auto bestConcreteTypeIter = | ||
| std::min_element(concreteDecls.begin(), concreteDecls.end(), |
There was a problem hiding this comment.
This rule is effectively arbitrary, because we don't have a way to handle ambiguity? I suppose that's no worse than what we have today.
There was a problem hiding this comment.
I copy and pasted the code from further down in the function. I should extract it out into a helper at some point.
…veEquivalenceClass() A DependentMemberType can either have a bound AssociatedTypeDecl, or it might be 'unresolved' and only store an identifier. In maybeResolveEquivalenceClass(), we did not handle the unresolved case when the base type of the DependentMemberType had itself been resolved to a concrete type. Fixes <rdar://problem/71162777>.
slavapestov
force-pushed
the
gsb-unresolved-nested-type-of-concrete-type
branch
from
84c836b to
5acd795
Compare
|
@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.
A DependentMemberType can either have a bound AssociatedTypeDecl,
or it might be 'unresolved' and only store an identifier.
In maybeResolveEquivalenceClass(), we did not handle the unresolved
case when the base type of the DependentMemberType had itself been
resolved to a concrete type.
Fixes rdar://problem/71162777.