[ClangImporter] Skip importing values for CGFloat typedefs on top of CGFloats direct #83238
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
kubamracek
requested review from
DougGregor,
Xazax-hun,
egorzhdan,
fahadnayyar,
ian-twilightcoder,
j-hui,
susmonteiro,
tshortli and
zoecarver
as code owners
artemcm
approved these changes
Jul 22, 2025
nkcsgexi
approved these changes
Jul 22, 2025
j-hui
approved these changes
Jul 22, 2025
Contributor
j-hui
left a comment
j-hui
left a comment
There was a problem hiding this comment.
LGTM, other than a nit about code organization
Contributor
Author
|
@swift-ci please test |
Xazax-hun
reviewed
Jul 23, 2025
Comment on lines
+4679
to
+4680
| bool isCGFloat = (type && type->isCGFloat()) || | ||
| (type && synthesizer.isCGFloat(type)); |
Contributor
There was a problem hiding this comment.
Suggested change
| bool isCGFloat = (type && type->isCGFloat()) || | |
| (type && synthesizer.isCGFloat(type)); | |
| bool isCGFloat = type && (type->isCGFloat()) || | |
| synthesizer.isCGFloat(type)); |
Contributor
Author
There was a problem hiding this comment.
oops, missed that :) I'll leave it if you don't mind
Contributor
There was a problem hiding this comment.
Yup, no worries, this was just a minor nit :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This solves a compiler crasher, for which a reproducer is in the attached lit test. The existing logic tries to skip CGFloat from getting their constant values imported -- this is because importing CGFloats is special cased and needs more work to work correctly. However, we were failing to skip importing a CGFloat if it was used under a typedef with a different name. In this case, the code in
VisitVarDeclattempted to recognize a CGFloat throughtype->isCGFloat()which is not enough (the type is not a CGFloat directly, it's a typedef instead). Let's instead ask the SwiftDeclSynthesizer directly if it's going to import the type as a CGFloat.I have also added a frontend flag to disable value importing, this might be useful to quickly workaround situations like this in the future.
Also see #80749 for reference.
rdar://155657342