[cxx-interop] Add fix for corner case where NS_OPTIONS typedef has to be desugared #66619
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
plotfi
force-pushed
the
plotfi-cxx-interop-uicontrolstate-mangling
branch
2 times, most recently
from
b241346 to
21a3c89
Compare
|
@egorzhdan Can I get a quick review and test run? |
zoecarver
reviewed
Jun 14, 2023
zoecarver
reviewed
Jun 14, 2023
zoecarver
reviewed
Jun 14, 2023
zoecarver
reviewed
Jun 14, 2023
zoecarver
approved these changes
Jun 14, 2023
|
@plotfi do you not have commit access? |
|
@swift-ci please test |
I do but I don’t think I have CI access. |
|
Can you ping @shahmishal? |
|
@plotfi you should have access let me know if you can't start it. |
Thanks @shahmishal for confirming! |
plotfi
force-pushed
the
plotfi-cxx-interop-uicontrolstate-mangling
branch
from
21a3c89 to
82fe5e3
Compare
… be desugared This patch is an add-on to swiftlang#64043. Essentially when encountering NS_OPTIONS enums, in C++-Interop mode if they are not specially handled then they can mangle differently than they do without C++-Interop. This patch adds logic to handle when a typedef and enum have additional clang::ElaboratedType sugar, but otherwise it does the same as the existing 64043 patch. The test case provided was encountered in a real app build. The problem came from when two modules are each compiled one with and one without C++-Interop. For the test case code provided the mangling of the protocol conformance is not consistent and the code in SILGenLazyConformance.cpp crashes on an invalid conformance with reason "Invalid conformance in type-checked AST".
plotfi
force-pushed
the
plotfi-cxx-interop-uicontrolstate-mangling
branch
from
82fe5e3 to
fe6ccd7
Compare
|
@swift-ci please 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.
@NuriAmari added code to do consistent mangling for NS_OPTIONS types in the context of C++-Interop, but I think with UIControlState we have a corner case where the typedef has surgar in the form of a clang::ElaboratedType.
Still trying to get the specifics right on this one and will add test cases soon. This does fix the mangling for the case in #66602
Commit Message: