[android] fix the LP32 armv7/i686 android build #846
Conversation
|
cc @compnerd |
|
@swift-ci please test |
|
CC @jmschonfeld |
| @@ -52,7 +52,7 @@ internal struct BuiltInUnicodeScalarSet { | |||
|
|
|||
| // CFUniCharIsMemberOf | |||
| func contains(_ scalar: Unicode.Scalar) -> Bool { | |||
| let planeNo = Int((scalar.value >> 16) & 0xFF) | |||
| let planeNo = Int((scalar.value >> 16) & UInt32(0xFF)) | |||
There was a problem hiding this comment.
Does Unicode.Scalar.value have a different type on Android than on other platforms?
There was a problem hiding this comment.
No, it's just that the new operator conflicts during overload resolution, with this specific instance of using & on a constant that is not typed.
There was a problem hiding this comment.
Hmm, based on that it seems like the new operator has the possibility of a widespread affect across the project, and I worry that changes like this which appear arbitrary to someone not knowledgeable of the android build are likely to cause the android build to be broken quite frequently. Is there anything we can do to target that operator to just the uses we want? How unruly would it be to perform that at each bitwise-and with a mode_t rather than using a global operator?
There was a problem hiding this comment.
that should work too, let me see how invasive such change would be.
Co-authored-by: Jeremy Schonfeld <1004103+jmschonfeld@users.noreply.github.com>
|
@swift-ci please test |
|
@swift-ci please test |
|
@jmschonfeld I dropped the operator & overload, how does it look now? |
|
@jmschonfeld could you take another look please 🙏 , we would like to get this in to make further build progress |
|
Thanks! |
* [android] fix the LP32 armv7/i686 android build * Update Sources/FoundationEssentials/Android+Extensions.swift Co-authored-by: Jeremy Schonfeld <1004103+jmschonfeld@users.noreply.github.com> * drop the android Lp32 specific operator & --------- Co-authored-by: Jeremy Schonfeld <1004103+jmschonfeld@users.noreply.github.com>
This fixes the errors related to the st_mode structure being operated on with mode_t values, and the use of
pw_gecoserror.