Improve type join for function types. #15365
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
|
@swift-ci Please smoke test |
slavapestov
reviewed
Mar 20, 2018
|
|
||
| if (First->getKind() != second->getKind()) { | ||
| if (secondFnTy->getExtInfo().isNoEscape()) { | ||
| return Nonexistent; |
There was a problem hiding this comment.
Why not just return CanType()?
There was a problem hiding this comment.
As the comment for this member calls out, this makes it clear why the value is being returned.
slavapestov
reviewed
Mar 20, 2018
| @@ -714,6 +715,8 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E, | |||
| return; | |||
| } else if (isa<MakeTemporarilyEscapableExpr>(parent)) { | |||
| return; | |||
| } else if (isa<DynamicTypeExpr>(parent)) { | |||
There was a problem hiding this comment.
Test case for this change?
There was a problem hiding this comment.
Almost all of the new tests hit this.
It is still not completely general, but this moves things along a little bit.
|
@swift-ci Please smoke test |
1 similar comment
|
@swift-ci Please smoke test |
|
@rudkx I think this broke the source compatibility test suite: |
|
As you mentioned elsewhere this didn't cause the break (we already had missing cases). I addressed the issue here: #15448 |
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.
No description provided.