[FixCode] Add @escaping when overriding mismatch is because of it. #4273
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 |
|
@milseman @jrose-apple Could you please review this? |
| // Fix-it needs position to apply. | ||
| if (typeRange.isInvalid()) | ||
| return false; | ||
| auto overrideFnTy = overrideTy->getCanonicalType()->getAs<FunctionType>(); |
There was a problem hiding this comment.
I think the lesson from the other patch was that we should not attempt to match types or ext-info; if we have no better reason why the override failed then being two AnyFunctionTypes mismatching in @escaping is a good enough reason for the diagnostic.
There was a problem hiding this comment.
But overriding match is strict. I'd like to have the fixit addresses the error for sure.
There was a problem hiding this comment.
Overriding isn't this strict. This doesn't catch
- covariant return types / contravariant parameters
- optionality changes for class types
- anything involving generics
(Also, the getCanonicalType isn't necessary; getAs looks through things.)
|
@swift-ci Please smoke test |
1 similar comment
|
@swift-ci Please smoke test |
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.
[FixCode] Add @escaping when overriding mismatch is because of it. rdar://27814862
Resolved bug number: (SR-)
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
A smoke test on macOS does the following:
device standard libraries are not built.
version of these tests are not run.
A smoke test on Linux does the following:
tests are not run.
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.
…ar://27814862
With the change of default escaping behavior, users' existing code overriding
objc functions may need to add @escaping to make the overriding match as before. This
patch checks if an overriding mismatch is due to the lacking of @escaping and add
it as a fixit.