[stdlib][nfc] Prefer to put the _pointerBitWidth(_64) case first, as that is far more common

Author: lorentey

stdlib/public/core/AtomicInt.swift.gyb

@@ -65,12 +65,12 @@ internal func _swift_stdlib_atomicCompareExchangeStrongInt(
   object target: UnsafeMutablePointer<Int>,
   expected: UnsafeMutablePointer<Int>,
   desired: Int) -> Bool {
-#if _pointerBitWidth(_32)
-  let (oldValue, won) = Builtin.cmpxchg_seqcst_seqcst_Int32(
-    target._rawValue, expected.pointee._value, desired._value)
-#elseif _pointerBitWidth(_64)
+#if _pointerBitWidth(_64)
   let (oldValue, won) = Builtin.cmpxchg_seqcst_seqcst_Int64(
     target._rawValue, expected.pointee._value, desired._value)
+#elseif _pointerBitWidth(_32)
+  let (oldValue, won) = Builtin.cmpxchg_seqcst_seqcst_Int32(
+    target._rawValue, expected.pointee._value, desired._value)
 #else
 #error("Unknown platform")
 #endif
@@ -84,12 +84,12 @@ internal func _swift_stdlib_atomicCompareExchangeStrongInt(
 public // Existing uses outside stdlib
 func _swift_stdlib_atomicLoadInt(
   object target: UnsafeMutablePointer<Int>) -> Int {
-#if _pointerBitWidth(_32)
-  let value = Builtin.atomicload_seqcst_Int32(target._rawValue)
-  return Int(value)
-#elseif _pointerBitWidth(_64)
+#if _pointerBitWidth(_64)
   let value = Builtin.atomicload_seqcst_Int64(target._rawValue)
   return Int(value)
+#elseif _pointerBitWidth(_32)
+  let value = Builtin.atomicload_seqcst_Int32(target._rawValue)
+  return Int(value)
 #else
 #error("Unknown platform")
 #endif
@@ -99,10 +99,10 @@ func _swift_stdlib_atomicLoadInt(
 internal func _swift_stdlib_atomicStoreInt(
   object target: UnsafeMutablePointer<Int>,
   desired: Int) {
-#if _pointerBitWidth(_32)
-  Builtin.atomicstore_seqcst_Int32(target._rawValue, desired._value)
-#elseif _pointerBitWidth(_64)
+#if _pointerBitWidth(_64)
   Builtin.atomicstore_seqcst_Int64(target._rawValue, desired._value)
+#elseif _pointerBitWidth(_32)
+  Builtin.atomicstore_seqcst_Int32(target._rawValue, desired._value)
 #else
 #error("Unknown platform")
 #endif
@@ -117,14 +117,14 @@ func _swift_stdlib_atomicFetch${operation}Int(
   object target: UnsafeMutablePointer<Int>,
   operand: Int) -> Int {
   let rawTarget = UnsafeMutableRawPointer(target)
-#if _pointerBitWidth(_32)
-  let value = _swift_stdlib_atomicFetch${operation}Int32(
-    object: rawTarget.assumingMemoryBound(to: Int32.self),
-    operand: Int32(operand))
-#elseif _pointerBitWidth(_64)
+#if _pointerBitWidth(_64)
   let value = _swift_stdlib_atomicFetch${operation}Int64(
     object: rawTarget.assumingMemoryBound(to: Int64.self),
     operand: Int64(operand))
+#elseif _pointerBitWidth(_32)
+  let value = _swift_stdlib_atomicFetch${operation}Int32(
+    object: rawTarget.assumingMemoryBound(to: Int32.self),
+    operand: Int32(operand))
 #else
 #error("Unknown platform")
 #endif

stdlib/public/core/Builtin.swift

@@ -406,19 +406,18 @@ internal var _objectPointerLowSpareBitShift: UInt {
     }
 }
 
-#if _pointerBitWidth(_32)
 @inlinable
 internal var _objectPointerIsObjCBit: UInt {
-    @inline(__always) get { return 0x0000_0002 }
-}
-#elseif _pointerBitWidth(_64)
-@inlinable
-internal var _objectPointerIsObjCBit: UInt {
-  @inline(__always) get { return 0x4000_0000_0000_0000 }
-}
+  @inline(__always) get {
+#if _pointerBitWidth(_64)
+    return 0x4000_0000_0000_0000
+#elseif _pointerBitWidth(_32)
+    return 0x0000_0002
 #else
 #error("Unknown platform")
 #endif
+  }
+}
 
 /// Extract the raw bits of `x`.
 @inlinable

stdlib/public/core/DictionaryVariant.swift

@@ -46,10 +46,10 @@ extension Dictionary {
     @inlinable
     @inline(__always)
     init(dummy: Void) {
-#if _pointerBitWidth(_32)
-      self.init(native: _NativeDictionary())
-#elseif _pointerBitWidth(_64)
+#if _pointerBitWidth(_64)
       self.object = _BridgeStorage(taggedPayload: 0)
+#elseif _pointerBitWidth(_32)
+      self.init(native: _NativeDictionary())
 #else
 #error("Unknown platform")
 #endif

stdlib/public/core/Hasher.swift

@@ -160,10 +160,10 @@ extension Hasher {
 
     @inline(__always)
     internal mutating func combine(_ value: UInt) {
-#if _pointerBitWidth(_32)
-      combine(UInt32(truncatingIfNeeded: value))
-#elseif _pointerBitWidth(_64)
+#if _pointerBitWidth(_64)
       combine(UInt64(truncatingIfNeeded: value))
+#elseif _pointerBitWidth(_32)
+      combine(UInt32(truncatingIfNeeded: value))
 #else
 #error("Unknown platform")
 #endif
@@ -425,15 +425,15 @@ public struct Hasher {
   @usableFromInline
   internal static func _hash(seed: Int, _ value: UInt) -> Int {
     var state = _State(seed: seed)
-#if _pointerBitWidth(_32)
+#if _pointerBitWidth(_64)
+    _internalInvariant(UInt.bitWidth == UInt64.bitWidth)
+    state.compress(UInt64(truncatingIfNeeded: value))
+    let tbc = _TailBuffer(tail: 0, byteCount: 8)
+#elseif _pointerBitWidth(_32)
     _internalInvariant(UInt.bitWidth < UInt64.bitWidth)
     let tbc = _TailBuffer(
       tail: UInt64(truncatingIfNeeded: value),
       byteCount: UInt.bitWidth &>> 3)
-#elseif _pointerBitWidth(_64)
-    _internalInvariant(UInt.bitWidth == UInt64.bitWidth)
-    state.compress(UInt64(truncatingIfNeeded: value))
-    let tbc = _TailBuffer(tail: 0, byteCount: 8)
 #else
 #error("Unknown platform")
 #endif

stdlib/public/core/SetVariant.swift

@@ -36,10 +36,10 @@ extension Set {
     @inlinable
     @inline(__always)
     init(dummy: ()) {
-#if _pointerBitWidth(_32)
-      self.init(native: _NativeSet())
-#elseif _pointerBitWidth(_64)
+#if _pointerBitWidth(_64)
       self.object = _BridgeStorage(taggedPayload: 0)
+#elseif _pointerBitWidth(_32)
+      self.init(native: _NativeSet())
 #else
 #error("Unknown platform")
 #endif

stdlib/public/core/StringGuts.swift

@@ -179,13 +179,13 @@ extension _StringGuts {
   #else
   @usableFromInline @inline(never) @_effects(releasenone)
   internal func _invariantCheck() {
-    #if _pointerBitWidth(_32)
-    _internalInvariant(MemoryLayout<String>.size == 12, """
+    #if _pointerBitWidth(_64)
+    _internalInvariant(MemoryLayout<String>.size == 16, """
     the runtime is depending on this, update Reflection.mm and \
     this if you change it
     """)
-    #elseif _pointerBitWidth(_64)
-    _internalInvariant(MemoryLayout<String>.size == 16, """
+    #elseif _pointerBitWidth(_32)
+    _internalInvariant(MemoryLayout<String>.size == 12, """
     the runtime is depending on this, update Reflection.mm and \
     this if you change it
     """)