[cxx-interop] Move swift/bridging header to clang resource dir#12861
Open
j-hui wants to merge 1 commit intoswiftlang:stable/21.xfrom
Open
[cxx-interop] Move swift/bridging header to clang resource dir#12861j-hui wants to merge 1 commit intoswiftlang:stable/21.xfrom
j-hui wants to merge 1 commit intoswiftlang:stable/21.xfrom
Conversation
The swift/bridging header provides annotation macros (e.g., SWIFT_SHARED_REFERENCE, SWIFT_COMPUTED_PROPERTY) for C++ code that interoperate with Swift. Previously, this header was shipped in the Swift toolchain's usr/include, which is not part of Clang's default search paths in the OSS toolchain, which forced users to manually pass -I flags to find the header. By placing it in Clang's resource directory, the header is automatically discoverable by both clang and swift (via its embedded Clang instance), since both already search <clang-resource-dir>/include by default. rdar://136716355
Author
|
@swift-ci please smoke test |
Author
Windows failure does not seem to be related. |
Author
|
@swift-ci please smoke test windows platform |
Author
|
@swift-ci please smoke test macos platform |
Author
|
@swift-ci please smoke test linux platform |
Author
|
@swift-ci please smoke test |
egorzhdan
approved these changes
May 5, 2026
Member
|
@finagolfin Do you know how this would affect C++ interop on Android? |
Member
|
Not something I've looked at much, but may not make a difference on Android, since we don't use the Swift-forked clang resource directory, but the one from the NDK. Are there C++ Interop tests that make sure this works? |
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
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.
The swift/bridging header provides annotation macros (e.g., SWIFT_SHARED_REFERENCE, SWIFT_COMPUTED_PROPERTY) for C++ code that interoperate with Swift. Previously, this header was shipped in the Swift toolchain's usr/include, which is not part of Clang's default search paths in the OSS toolchain, which forced users to manually pass -I flags to find the header.
By placing it in Clang's resource directory, the header is automatically discoverable by both clang and swift (via its embedded Clang instance), since both already search /include by default.
rdar://136716355