PrintAsObjC: Handle new upper bounds of Array/Dictionary/Set correctly. #3918
Conversation
This file contains 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 |
| else if (swiftNominal == ctx.getDictionaryDecl() && | ||
| isNSObjectOrAnyHashable(ctx, typeArgs[0])) { | ||
| if (Module *M = ctx.getLoadedModule(ctx.Id_Foundation)) { | ||
| UnqualifiedLookup lookup(ctx.getIdentifier("NSCopying"), M, nullptr); |
There was a problem hiding this comment.
lookupQualified is probably more appropriate here. Also, the if (!NSCopyingType) should guard this whole section.
There was a problem hiding this comment.
I was following the example of what ASTContext::getNSErrorType does. Should that be changed too?
There was a problem hiding this comment.
Probably. I guess it's not immediately important. (The guard being inverted is, though.)
We would crash because 'Any' doesn't have a corresponding bridged type through the normal bridging mechanism. Handle this correctly, and correctly recognize 'AnyHashable' and 'Any' as the upper bounds of Dictionary, Set, and Array so we present the unqualified NS types in the generated header.
jckarter
force-pushed
the
printasobjc-crash
branch
from
9d31d61
to
cfcb6ea
Compare
|
@swift-ci Please smoke test and merge |
1 similar comment
|
@swift-ci Please smoke test and merge |
|
Thanks @shahmishal ! |
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.
We would crash because 'Any' doesn't have a corresponding bridged type through the normal bridging mechanism. Handle this correctly, and correctly recognize 'AnyHashable' and 'Any' as the upper bounds of Dictionary, Set, and Array so we present the unqualified NS types in the generated header.