🍒 [6.4] [swift/cxx-interop] Move swift/bridging header to clang resource dir#13297
Open
j-hui wants to merge 1 commit into
Open
🍒 [6.4] [swift/cxx-interop] Move swift/bridging header to clang resource dir#13297j-hui wants to merge 1 commit into
j-hui wants to merge 1 commit into
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 (cherry picked from commit c19415a)
Author
|
@swift-ci please test |
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
1 participant
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: Place the swift/bridging header in Clang's resource directory, so that it is automatically
#include-able by both clang and swift. This file is already#include-able on Apple's Xcode toolchains (which as different search pathes), but NOT OSS toolchains; this cherry-pick brings the two into alignment for the 6.4 release.Scope: header files that
#include <swift/bridging>, i.e., those written for Swift/C[++] interopRisk: the fact that OSS toolchains behave differently than Apple toolchains means that some projects may have workarounds that conflict with this change. I will leave it to the discretion of the branch managers + reviewers whether this is an acceptable risk.
Testing: CI testing
Original PR: #12861 swiftlang/swift#88748 swiftlang/swift-installer-scripts#532
Reviewed by: @egorzhdan @etcwilde @compnerd @Xazax-hun @finagolfin
Issues: rdar://136716355
Details:
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.
(cherry picked from commit c19415a)
Paired with swiftlang/swift#90358