Fix another subtle SE-0110-related break. #10847
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
slavapestov
approved these changes
Jul 10, 2017
DougGregor
approved these changes
Jul 10, 2017
…ostics related to rdar://problem/33067102" This reverts commit 70deaa8. My next commit already added the same test case, but this reverted commit added it in a way that the test will fail with my fix in place.
The change to roll back a part of SE-0110 to allow multi-argument functions to be passed in places where functions taking a tuple are expected resulted in a regression in some cases where the fix would strip off the last ParenType from single-argument functions. Instead of stripping off parens from both function types we're trying to match when they both have them, strip off none. This ensures that we don't get summarily rejected in the nested matchTypes call by other SE-0110-related code that bails if the two types do not have the same "parenness". Fixes rdar://problem/33043106 / SR-5387.
|
I had to re-push to revert the just-merged 70deaa8, because it added a test in a way that it would break when my change went in. It turns out my commit had a test case that is identical to the one in that change, so reverting rather than fixing up the test makes sense. |
|
@swift-ci Please smoke test and merge |
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
1 similar comment
|
@swift-ci Please test source compatibility |
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.
The change to roll back a part of SE-0110 to allow multi-argument
functions to be passed in places where functions taking a tuple are
expected resulted in a regression in some cases where the fix would
strip off the last ParenType from single-argument functions.
Instead of stripping off parens from both function types we're trying to
match when they both have them, strip off none. This ensures that we
don't get summarily rejected in the nested matchTypes call by other
SE-0110-related code that bails if the two types do not have the same
"parenness".
Fixes rdar://problem/33043106 / SR-5387.