Start using _pointerBitWidth in 5.9+

Author: lorentey

Sources/Atomics/autogenerated/IntegerConformances.swift

@@ -2092,7 +2092,7 @@ extension UInt.AtomicRepresentation: AtomicIntegerStorage {
 
 
 
-#if arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)
+#if (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)))
 extension DoubleWord: AtomicValue {
   @frozen
   public struct AtomicRepresentation {
@@ -2229,7 +2229,7 @@ extension DoubleWord.AtomicRepresentation: AtomicStorage {
 
 
 
-#else /* arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32) */
+#else /* (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32))) */
 extension DoubleWord: AtomicValue {
   @frozen
   public struct AtomicRepresentation {
@@ -2363,5 +2363,5 @@ extension DoubleWord.AtomicRepresentation: AtomicStorage {
   }
 }
 
-#endif /* arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32) */
+#endif /* (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32))) */
 

Sources/Atomics/autogenerated/Primitives.native.swift

@@ -21,7 +21,7 @@
 #if ATOMICS_NATIVE_BUILTINS
 import Builtin
 
-#if arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)
+#if (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)))
 @frozen
 @_alignment(8)
 public struct DoubleWord {
@@ -2150,7 +2150,7 @@ extension UnsafeMutablePointer where Pointee == Int64 {
   }
 }
 
-#if arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)
+#if (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)))
 extension UnsafeMutablePointer where Pointee == Int {
   /// Atomically loads a word starting at this address with the specified
   /// memory ordering.
@@ -2663,7 +2663,7 @@ extension UnsafeMutablePointer where Pointee == Int {
   }
 }
 
-#else /* arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32) */
+#else /* (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32))) */
 extension UnsafeMutablePointer where Pointee == Int {
   /// Atomically loads a word starting at this address with the specified
   /// memory ordering.
@@ -3175,8 +3175,8 @@ extension UnsafeMutablePointer where Pointee == Int {
     }
   }
 }
-#endif /* arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32) */
-#if arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)
+#endif /* (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32))) */
+#if (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)))
 extension UnsafeMutablePointer where Pointee == DoubleWord {
   /// Atomically loads a word starting at this address with the specified
   /// memory ordering.
@@ -3493,7 +3493,7 @@ extension UnsafeMutablePointer where Pointee == DoubleWord {
 
 }
 
-#else /* arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32) */
+#else /* (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32))) */
 extension UnsafeMutablePointer where Pointee == DoubleWord {
   /// Atomically loads a word starting at this address with the specified
   /// memory ordering.
@@ -3809,5 +3809,5 @@ extension UnsafeMutablePointer where Pointee == DoubleWord {
   }
 
 }
-#endif /* arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32) */
+#endif /* (compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32))) */
 #endif // ATOMICS_NATIVE_BUILTINS

Utilities/gyb_utils.py

@@ -129,7 +129,7 @@ def lowerFirst(str):
 def argLabel(label):
   return label + ": " if label != "_" else ""
 
-ptrBitWidth32 = "arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)"
+ptrBitWidth32 = "(compiler(>=5.9) && _pointerBitWidth(_32)) || (compiler(<5.9) && (arch(i386) || arch(arm) || arch(arm64_32) || arch(wasm32)))"
 
 def bitwidth_variants(value64, value32):
   if value64 == value32: