[Constraint Solver] Don't perform a join when we've adjusted an IUO to an optional #5373
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
…o optional. Fixes rdar://problem/28621624, an intentional source-breaking change from Swift 3.
|
@swift-ci please smoke test and merge |
|
@rudkx please review! |
rudkx
approved these changes
Oct 19, 2016
| @@ -1000,7 +1002,7 @@ static PotentialBindings getPotentialBindings(ConstraintSystem &cs, | |||
| } | |||
|
|
|||
| if (exactTypes.insert(type->getCanonicalType()).second) | |||
| addPotentialBinding({type, kind, None}); | |||
| addPotentialBinding({type, kind, None}, /*allowJoinMeet=*/!adjustedIUO); | |||
There was a problem hiding this comment.
This is equivalent to !alternateType. Either works for me (with the current code having perhaps slightly more clarity given the naming), but I thought I would mention it.
There was a problem hiding this comment.
Yeah, I felt like I wanted this to be super-IUO-specific. This goes away when we take IUOs out of the type system.
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.
This fixes an unintentional source-breaking change since Swift 3.0.
Resolves rdar://problem/28621624.