[ClangImporter] Don't transform NSObject<...> when there's no NSObject protocol #27409
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
jrose-apple
reviewed
Sep 27, 2019
| // Skip if there is no NSObject protocol. | ||
| auto nsObjectProtoType = | ||
| Impl.getNSObjectProtocolType(); | ||
| if (nsObjectProtoType) { |
There was a problem hiding this comment.
What happens in the else case?
There was a problem hiding this comment.
It will be treated like the other non NSObject<...> types, except if it hits another special case it is imported as a protocol composition of the class and the protocols.
There was a problem hiding this comment.
Oh, right, so far we've just tested that "we have protocols" and "the class is NSObject". Okay.
xymus
force-pushed
the
fix-no-nsobject
branch
from
6d619d3 to
d6264a7
Compare
|
@swift-ci Please smoke test |
jrose-apple
approved these changes
Sep 27, 2019
xymus
force-pushed
the
fix-no-nsobject
branch
from
d6264a7 to
d84e2e8
Compare
|
@swift-ci Please smoke test |
jrose-apple
reviewed
Sep 28, 2019
|
|
||
| // RUN: %target-swift-frontend -typecheck %s -import-objc-header %S/Inputs/no-nsobject-protocol.h | ||
|
|
||
| // REQUIRES: objc_interop |
There was a problem hiding this comment.
I think since there are no external dependencies you can use -enable-objc-interop instead.
… protocol If there is no NSObject protocol, skip a special case when importing types like `NSObject <NSCopying>` that converts them to `id <NSObject, NSCopying>`. Fix rdar://problem/34597302
xymus
force-pushed
the
fix-no-nsobject
branch
from
d84e2e8 to
cf526b4
Compare
|
@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.
If there is no NSObject protocol skip a special case when importing types like
NSObject <NSCopying>that converts them toid <NSObject, NSCopying>.Fix rdar://problem/34597302