[StringGuts] Support for 32-bit platforms

Add 32-bit support to the new StringGuts.

Author: lorentey

stdlib/public/SDK/Foundation/NSString.swift

@@ -23,8 +23,8 @@ public class NSSimpleCString {}
 public class NSConstantString {}
 
 // Called by the SwiftObject implementation.
-public func _convertStringToNSString(_ string: String) -> NSString {
-  return string._bridgeToObjectiveC()
+public func _getDescription<T>(_ x: T) -> NSString {
+  return String(reflecting: x)._bridgeToObjectiveC()
 }
 
 extension NSString : ExpressibleByStringLiteral {

stdlib/public/core/Arrays.swift.gyb

@@ -1232,7 +1232,8 @@ extension ${Self} : RangeReplaceableCollection, ArrayProtocol {
   /// element. Otherwise, `nil`.
   @_inlineable
   public var _baseAddressIfContiguous: UnsafeMutablePointer<Element>? {
-    return _buffer.firstElementAddressIfContiguous
+    @inline(__always) // FIXME(TODO: JIRA): Hack around test failure
+    get { return _buffer.firstElementAddressIfContiguous }
   }
 
 %if Self != 'Array': # // Array does not necessarily have contiguous storage

stdlib/public/core/ReflectionLegacy.swift

@@ -66,16 +66,6 @@ public protocol _Mirror {
   var disposition: _MirrorDisposition { get }
 }
 
-/// An entry point that can be called from C++ code to get the summary string
-/// for an arbitrary object. The memory pointed to by "out" is initialized with
-/// the summary string.
-@_inlineable // FIXME(sil-serialize-all)
-@_silgen_name("swift_getSummary")
-public // COMPILER_INTRINSIC
-func _getSummary<T>(_ out: UnsafeMutablePointer<String>, x: T) {
-  out.initialize(to: String(reflecting: x))
-}
-
 /// Produce a mirror for any value.  The runtime produces a mirror that
 /// structurally reflects values of any type.
 @_inlineable // FIXME(sil-serialize-all)

stdlib/public/core/StringComparable.swift

@@ -80,33 +80,25 @@ extension _StringGuts {
   @effects(readonly)
   public
   static func _compareDeterministicUnicodeCollation(
-    _leftUnsafeStringGutsBitPattern leftBits: (UInt, UInt),
-    _rightUnsafeStringGutsBitPattern rightBits: (UInt, UInt)
+    _leftUnsafeStringGutsBitPattern leftBits: _RawBitPattern,
+    _rightUnsafeStringGutsBitPattern rightBits: _RawBitPattern
   ) -> Int {
-    let left = _StringGuts(
-      object: _StringObject(rawBits: leftBits.0),
-      otherBits: leftBits.1)
-    let right = _StringGuts(
-      object: _StringObject(rawBits: rightBits.0),
-      otherBits: rightBits.1)
+    let left = _StringGuts(rawBits: leftBits)
+    let right = _StringGuts(rawBits: rightBits)
     return _compareDeterministicUnicodeCollation(
       left, 0..<left.count, to: right, 0..<right.count)
   }
   @inline(never)
   @effects(readonly)
   public
   static func _compareDeterministicUnicodeCollation(
-    _leftUnsafeStringGutsBitPattern leftBits: (UInt, UInt),
+    _leftUnsafeStringGutsBitPattern leftBits: _RawBitPattern,
     _ leftRange: Range<Int>,
-    _rightUnsafeStringGutsBitPattern rightBits: (UInt, UInt),
+    _rightUnsafeStringGutsBitPattern rightBits: _RawBitPattern,
     _ rightRange: Range<Int>
   ) -> Int {
-    let left = _StringGuts(
-      object: _StringObject(rawBits: leftBits.0),
-      otherBits: leftBits.1)
-    let right = _StringGuts(
-      object: _StringObject(rawBits: rightBits.0),
-      otherBits: rightBits.1)
+    let left = _StringGuts(rawBits: leftBits)
+    let right = _StringGuts(rawBits: rightBits)
     return _compareDeterministicUnicodeCollation(
       left, leftRange, to: right, rightRange)
   }
@@ -165,8 +157,7 @@ extension _StringGuts {
   @inline(__always)
   @_inlineable
   public func _bitwiseEqualTo(_ other: _StringGuts) -> Bool {
-    return self._object.rawBits == other._object.rawBits
-      && self._otherBits == other._otherBits
+    return self.rawBits == other.rawBits
   }
 
   @_inlineable
@@ -232,11 +223,9 @@ extension _StringGuts {
       return result
     }
 #endif
-    let leftBits = (left._object.rawBits, left._otherBits)
-    let rightBits = (right._object.rawBits, right._otherBits)
     return _compareDeterministicUnicodeCollation(
-      _leftUnsafeStringGutsBitPattern: leftBits, leftRange,
-      _rightUnsafeStringGutsBitPattern: rightBits, rightRange)
+      _leftUnsafeStringGutsBitPattern: left.rawBits, leftRange,
+      _rightUnsafeStringGutsBitPattern: right.rawBits, rightRange)
   }
 
   @_inlineable
@@ -259,11 +248,9 @@ extension _StringGuts {
       return result
     }
 #endif
-    let leftBits = (left._object.rawBits, left._otherBits)
-    let rightBits = (right._object.rawBits, right._otherBits)
     return _compareDeterministicUnicodeCollation(
-      _leftUnsafeStringGutsBitPattern: leftBits,
-      _rightUnsafeStringGutsBitPattern: rightBits)
+      _leftUnsafeStringGutsBitPattern: left.rawBits,
+      _rightUnsafeStringGutsBitPattern: right.rawBits)
   }
 }