[Constraint system] Clean up constraints associated with patterns. #30258
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
Wherever we have constraints that involve pattern matching, use the PatternMatch locator element. Additionally, don't use the TupleElement locator element for tuple patterns, because it violates assumptions used for diagnostics. The new test was crashing; now it has a terrible diagnostic for which I need to think harder about a fix.
|
@swift-ci please smoke test |
xedin
reviewed
Mar 6, 2020
| // Remove an optional from the object type. | ||
| if (externalPatternType) { | ||
| Type objVar = CS.createTypeVariable( | ||
| CS.getConstraintLocator(locator), TVO_CanBindToNoEscape); |
There was a problem hiding this comment.
I think in this case we should have locator with points to pattern and ends with OptionalPayload.
| locator.withPathElement(LocatorPathElt::PatternMatch(pattern))); | ||
|
|
||
| Type subPatternType = | ||
| getTypeForPattern(isPattern->getSubPattern(), locator, castType, |
There was a problem hiding this comment.
I think subPattern should have locator point to a sub-pattern used by a cast?
| parentType = CS.openUnboundGenericType(parentType, locator); | ||
| parentType = CS.openUnboundGenericType( | ||
| parentType, | ||
| locator.withPathElement(LocatorPathElt::PatternMatch(pattern))); |
There was a problem hiding this comment.
I think we could use ParentType locator element for this transformation.
There was a problem hiding this comment.
Later one where we add a member constraint I think it should either end on regular Member locator or a new one specific for patterns...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Wherever we have constraints that involve pattern matching, use the
PatternMatch locator element. Additionally, don't use the TupleElement
locator element for tuple patterns, because it violates assumptions used
for diagnostics.
The new test was crashing; now it has a terrible diagnostic for which I
need to think harder about a fix.