[Android] Use the new overlay and Bionic module from Swift 6 #2777
Conversation
This file contains 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
The new overlay was merged into Swift 6 in swiftlang/swift#74758.
compnerd
approved these changes
Aug 6, 2024
| @@ -137,7 +139,7 @@ private func _loadLibrary(_ path: String) throws -> UnsafeMutableRawPointer { | |||
| #else | |||
| private func _loadLibrary(_ path: String) throws -> UnsafeMutableRawPointer { | |||
| guard let dlHandle = dlopen(path, RTLD_LAZY | RTLD_LOCAL) else { | |||
| throw LibraryPluginError(message: "loader error: \(String(cString: dlerror()))") | |||
| throw LibraryPluginError(message: "loader error: \(String(cString: dlerror()!))") | |||
There was a problem hiding this comment.
Does this work with glibc? I thought that it was annotated with non null in some cases (at least I ran into one with foundation)
There was a problem hiding this comment.
Yep, worked fine in Fedora 40 x86_64, where I tested it before submitting, which uses a recent glibc 2.39-17 from earlier this year. Bionic simply added the _Nullable annotation to the output in the last year, so it has to be unwrapped for Android here, but unless glibc somehow can guarantee this is _Nonnull, this force unwrap should work for both.
|
@swift-ci please test |
|
@ahoppen, ready for merge. |
|
Thanks for the quick review, @compnerd. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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 new overlay was merged into Swift 6 in swiftlang/swift#74758.
This supercedes the earlier #2707 with more complete support.
@hyp and @bnbarham, please review.