Correctly print swift Int property as NSUInteger when it overrides an NSUInteger objc property.
#66011
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
Re-enable PrintAsObjC/availability-real-sdk and PrintAsObjC/override, they are now passing.
|
@swift-ci please test |
|
@eeckstein You originally disabled these tests in 2862950. Does this seem reasonable to you? (We should also get this into 5.9.) |
egorzhdan
approved these changes
May 22, 2023
There was a problem hiding this comment.
LGTM! Seems that I missed this in my patch for elaborated types (#62190) during the last rebranch.
Thanks @thunderseethe!
tbkka
pushed a commit
that referenced
this pull request
Jun 2, 2023
Correctly print swift `Int` property as `NSUInteger` when it overrides an `NSUInteger` objc property.
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.
Noticed odd behavior around objc generated headers, a swift property of type
Intwas being printed asNSIntegereven though it overrides an ObjC property of typeNSUInteger. Tracked it down to a change in clang where it looks like clang is now providingElaboratedTypeinstead of an unwrappedTypedefTypeas theQualTypeofObjCPropertyDecl.isNSUInteger tries to cast
ElaboratedTypetoTypedefType, this fails as they are different classes and returns false. UpdatedisNSUIntegerto check ifclangTyis anElaboratedTypeand desugar it first, before checking ifclangTyis aTypedefType.With this change we can re-enable the two disabled tests in PrintAsObjC as they are now passing again: