🍒[cxx-interop] Pull changes from swift-6 compat mode into swift-5.9
#73223
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
… generics are disabled C++ pointer type `T*` is generally imported as `Unsafe(Mutable)Pointer<T>`. However, if `T` is non-copyable in Swift (e.g. it has a deleted C++ copy constructor), using `UnsafePointer<T>` type requires noncopyable generics to be enabled. This was causing assertion failures when building SwiftCompilerSources in #72912. (cherry picked from commit 78eee32)
…T` when adding base member accessors (cherry picked from commit 6140ba1)
This gives projects using C++ interop compat mode 5.9 access to the new features such as virtual methods and move-only types. rdar://126485814 (cherry picked from commit b330376)
|
@swift-ci please test |
DougGregor
approved these changes
Apr 24, 2024
|
@swift-ci please test macOS |
|
@swift-ci please test Linux |
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: This gives projects using C++ interop compat mode 5.9 access to the new features, such as virtual methods, move-only types, and default arguments. This also fixes a bug where
T*was being imported asUnsafeMutablePointer<T>when compiling with non-copyable generics disabled, triggering assertions in the compiler, which were blocking the enablement of move-only types.Scope: ClangImporter logic was changed to accommodate for the versioning change.
Risk: Low, most of the changes are guarded by C++ interop being enabled.
Testing: Added/changed compiler tests.
Issue: rdar://126485814
Reviewer: @DougGregor
Original PRs: #73055 and #72912