[6.2 🍒][cxx-interop] Fix assertion failure from unavailable typedef + enum pattern #81699
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
…nction
Also renames it to findOptionSetEnum() to make it a bit clearer at face
value that the returned ImportedType will contain a Swift enum.
Also refactors some nearby instances of
if (auto e = dyn_cast<ElaboratedType>(t))
t = e->desugar();
into a helper function, desugarIfElaborated().
(cherry picked from commit c7070e7)
…EnumInfo.cpp It's at home there alongside other ObjC enum-specific logic, rather than in the middle of ImportDecl.cpp (since it isn't directly or exclusively related to importing decls). (cherry picked from commit 5aa5bcf)
(cherry picked from commit 2c7d01f)
The NS_OPTIONS macro sometimes uses a pattern where it loosely associates a typedef with an anonymous enum via a shared underlying integer type (emphasis on "loosely"). The typedef is marked as unavailable in Swift so as to not cause name ambiguity when we associate the anonymous enum with said typedef. We use unavailability as a heuristic during the import process, but that conflates NS_OPTIONS with NS_ENUMs that can be marked as unavailable for entirely unrelated reasons. That in and of itself is fine, because the import logic is general enough to handle both cases, but we have an assertion that seems to be unaware of this scenario, and trips on unavailable NS_ENUMs. (In those cases, the typedef points to the enum rather than the underlying integer type.) This patch fixes the assertion to be resilient against such cases by looking through the enum a typedef refers to. rdar://150399978 (cherry picked from commit 80db054)
|
@swift-ci please test |
DougGregor
approved these changes
May 22, 2025
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.
Explanation: ClangImporter currently uses some pretty fragile heuristics to determine whether a typedef is involved in the definition of a
{CF,NS}_OPTIONStype. Those heuristics lead it to mistakenly recognize unavailable{CF,NS}_ENUMs as{CF,NS}_OPTIONS. The resulting import logic turns out to work out all fine, except for the fact that there is an assertion that does not account for this possibility. This patch broadens that assertion slightly to also allow{CF,NS}_ENUMs along this code path.Risk: Low, this patch set consists of some refactoring (to minimize the actual functional change) and then slightly broadens the scope of an assertion. This fixes an assertion failure that happens in internal CI.
Problem: rdar://150399978
Reviewed By: @egorzhdan
Original PR: #81625