[6.0] Android: add better nullability checks for nullability annotations added in NDK 26 #5010
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
This was referenced Jul 17, 2024
|
We mentioned this in #4850 - but we will be merging that work here, so we'll only need one patch for this in the end. |
compnerd
reviewed
Jul 18, 2024
Comment on lines
+582
to
+583
| if let pwd = getpwuid(s.st_uid), let pwd_name = pwd.pointee.pw_name { | ||
| let name = String(cString: pwd_name) |
There was a problem hiding this comment.
Suggested change
| if let pwd = getpwuid(s.st_uid), let pwd_name = pwd.pointee.pw_name { | |
| let name = String(cString: pwd_name) | |
| if let pwd = getpwuid(s.st_uid), let pw_name = pwd.pointee.pw_name { | |
| let name = String(cString: pw_name) |
There was a problem hiding this comment.
Change is fine by me, but as mentioned in #4889, I will get this working with the swift-foundation re-core by next week and re-submit for trunk then.
There was a problem hiding this comment.
#5011 is the PR to track merging main to release/6.0.
Comment on lines
+587
to
+588
| if let grd = getgrgid(s.st_gid), let grd_name = grd.pointee.gr_name { | ||
| let name = String(cString: grd_name) |
There was a problem hiding this comment.
Suggested change
| if let grd = getgrgid(s.st_gid), let grd_name = grd.pointee.gr_name { | |
| let name = String(cString: grd_name) | |
| if let grd = getgrgid(s.st_gid), let gr_name = grd.pointee.gr_name { | |
| let name = String(cString: gr_name) |
|
@swift-ci please test |
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 is needed because Bionic recently added a bunch of these annotations.
Scope: Additional nullability checks and force unwraps only
Issue: None
Original PR: This is a cut-down #4850, which will have to be reworked for the
swift-foundationmerge.Risk: Low
Testing: I made sure this pull doesn't break anything by testing it with the previous NDK 25c also. I used this patch with others to build the Swift toolchain for my Android CI, finagolfin/swift-android-sdk#122, and the Termux app for Android, which now uses NDK 26b.
Reviewer: @compnerd