[cxx-interop] Remove workarounds for CF_OPTIONS default arguments
#79890
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
egorzhdan
requested review from
zoecarver,
hyp,
Xazax-hun,
j-hui,
fahadnayyar,
beccadax and
ian-twilightcoder
as code owners
|
@swift-ci please test |
|
@swift-ci please test Windows |
1 similar comment
|
@swift-ci please test Windows |
Xazax-hun
approved these changes
Mar 11, 2025
lib/ClangImporter/ImportEnumInfo.h
Outdated
| @@ -163,6 +163,11 @@ StringRef getCommonPluralPrefix(StringRef singular, StringRef plural); | |||
| /// Returns the underlying integer type of an enum. If clang treats the type as | |||
| /// an elaborated type, an unwrapped type is returned. | |||
| const clang::Type *getUnderlyingType(const clang::EnumDecl *decl); | |||
|
|
|||
| inline bool isCFOptionsMacro(StringRef macroName) { | |||
| return macroName == "CF_OPTIONS" || macroName == "NS_OPTIONS"; | |||
There was a problem hiding this comment.
Nit: could use LLVM's StringSwitch (https://llvm.org/doxygen/classllvm_1_1StringSwitch.html). But this is just two strings so maybe it does not make a difference.
ClangImporter has logic that infers default arguments of certain C/C++ types, such as the types declared via `CF_OPTIONS`/`NS_OPTIONS` macros. There were some workarounds in place which triggered for C++ interop mode specifically. The workarounds were applying a heuristic based on the name of the type, which tried to match the behavior to non-C++ interop mode for certain types from the OS SDK. That was not working well for user-defined types, causing source compatibility breakages when enabling C++ interop. This change replaces the name-based heuristic with a more robust criteria. See also 3791ccb. rdar://142961112
egorzhdan
force-pushed
the
egorzhdan/nsoptions-name-based
branch
from
249e3ee to
5b7c595
Compare
|
@swift-ci please smoke test |
This was referenced Apr 29, 2025
Closed
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.
ClangImporter has logic that infers default arguments of certain C/C++ types, such as the types declared via
CF_OPTIONS/NS_OPTIONSmacros.There were some workarounds in place which triggered for C++ interop mode specifically. The workarounds were applying a heuristic based on the name of the type, which tried to match the behavior to non-C++ interop mode for certain types from the OS SDK. That was not working well for user-defined types, causing source compatibility breakages when enabling C++ interop.
This change replaces the name-based heuristic with a more robust criteria.
See also 3791ccb.
rdar://142961112