Revert "Revert "[cxx-interop] Import custom NS_OPTIONS correctly""
#68546
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,
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci please smoke test |
egorzhdan
force-pushed
the
egorzhdan/reland-nsoptions
branch
from
0e32341 to
829b578
Compare
|
@swift-ci please smoke test |
zoecarver
approved these changes
Sep 15, 2023
There was a problem hiding this comment.
I think @DougGregor should look over this. But this LGTM. Moving getTypeDefForCXXCFOptionsDefinition into ASTContext is the fix we all discussed.
DougGregor
requested changes
Sep 18, 2023
lib/AST/ASTContext.cpp
Outdated
| @@ -5732,6 +5732,48 @@ ASTContext::getClangTypeForIRGen(Type ty) { | |||
| return getClangTypeConverter().convert(ty).getTypePtrOrNull(); | |||
| } | |||
|
|
|||
| const clang::TypedefType *ASTContext::getTypedefForCXXCFOptionsDefinition( | |||
There was a problem hiding this comment.
I'd prefer not to have Clang-specific APIs on ASTContext. Can we keep this within the ClangImporter, e.g., by making it a static method there?
There was a problem hiding this comment.
Sounds good, I made it a static method of ClangImporter
…ailable This makes sure that we can emit a pch from a C++ header that uses `CF_OPTIONS`. rdar://112225263
egorzhdan
force-pushed
the
egorzhdan/reland-nsoptions
branch
from
829b578 to
6a2f10a
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test macOS |
|
@swift-ci please smoke test Linux |
DougGregor
approved these changes
Sep 19, 2023
This was referenced Sep 19, 2023
This was referenced Sep 29, 2023
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.
This re-lands #67865 after it got reverted in #68435 due to a regression when emitting a pch file.
rdar://112225263