[4.0] [GSB] Record unresolved potential archetypes as delayed requirements. #10410
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
DelayedRequirements were using the general RequirementKind, which was at best an approximation (we smoothed over the difference between Superclass and Conformance requirements). Split out the Kind into its own type, so we can extend it with GSB-specific kinds. (cherry picked from commit aac0574)
Whenever we form a potential archetype that is unresolved (because it names a member wasn't known at the time the potential archetype was formed), create a corresponding delayed requirement to resolve the potential archetype. This ensures that all potential archetypes get a chance to be resolve, fixing the nested type should have matched associated type assertion in rdar://problem/31401161 (and others). (cherry picked from commit 4860607)
Rather than performing typo correction at the very end of finalize(), do it as part of delayed requirement handling when we cannot otherwise make progress. This is a cleaner way to cope with typo correction that gives us a better chance of getting to a sane result. Fixes rdar://problem/31048352 by eliminating the need for tracking the number of unresolved potential archetypes altogether. Fixes rdar://problem/32077627. (cherry picked from commit fe7ba8b)
(cherry picked from commit 9f0f71d)
|
@swift-ci please test |
|
LGTM! |
huonw
reviewed
Jun 20, 2017
| /*AllowReplacements=*/true, | ||
| maxScore); | ||
| assert(dist > 0 && "nested type should have matched associated type"); | ||
| if (bestEditDistance == 0 || dist == bestEditDistance) { |
There was a problem hiding this comment.
(Couldn't this special case be removed by starting with unsigned bestEditDistance = maxScore + 2; or something similar?)
There was a problem hiding this comment.
Yeah, I could probably clean this up. It didn't touch it in this particular PR; just moved it earlier so I could make use of it.
Merged
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.
Explanation: Whenever we form a potential archetype that is unresolved, use the delayed-requirements mechanism to ensure that every such potential archetype gets resolved
Scope: We've seen several different compiler crashers from this, several of which (but not all) involving typo correction within generic signatures.
Radar: rdar://problem/31401161, rdar://problem/31048352, rdar://problem/32077627.
Risk: Relatively low; uses existing mechanisms and is effectively a no-op where it wasn't needed.
Testing: Compiler regression testing.