[StringGuts] Clean-up in preparation for merge.

Clean up a lot of the scattered utility functions, FIXMEs, etc in
preparation for the merge to master.

Author: milseman

stdlib/public/SwiftShims/LibcShims.h

@@ -204,12 +204,6 @@ SWIFT_RUNTIME_STDLIB_INTERNAL
 int _stdlib_thread_setspecific(__swift_thread_key_t key,
                                const void * _Nullable value);
 
-
-// FIXME remove
-SWIFT_RUNTIME_STDLIB_INTERFACE
-void _swift_stdlib_print_hex(__swift_uintptr_t value, int newline);
-
-
 // TODO: Remove horrible workaround when importer does Float80 <-> long double.
 #if (defined __i386__ || defined __x86_64__) && !defined _MSC_VER
 static inline SWIFT_ALWAYS_INLINE

stdlib/public/core/Builtin.swift

@@ -460,14 +460,10 @@ func _getNonTagBits(_ x: Builtin.BridgeObject) -> UInt {
     >> _objectPointerLowSpareBitShift
 }
 
-// TODO (StringGuts): remove
-public typealias _BuiltinBridgeObject = Builtin.BridgeObject
-public typealias _BuiltinNativeObject = Builtin.NativeObject
-
 // Values -> BridgeObject
 @inline(__always)
 @_inlineable
-public func _bridgeObject(fromNative x: AnyObject) -> _BuiltinBridgeObject {
+public func _bridgeObject(fromNative x: AnyObject) -> Builtin.BridgeObject {
   _sanityCheck(!_isObjCTaggedPointer(x))
   let object = Builtin.castToBridgeObject(x, 0._builtinWordValue)
   _sanityCheck(_isNativePointer(object))
@@ -478,7 +474,7 @@ public func _bridgeObject(fromNative x: AnyObject) -> _BuiltinBridgeObject {
 @_inlineable
 public func _bridgeObject(
   fromNonTaggedObjC x: AnyObject
-) -> _BuiltinBridgeObject {
+) -> Builtin.BridgeObject {
   _sanityCheck(!_isObjCTaggedPointer(x))
   let object = _makeObjCBridgeObject(x)
   _sanityCheck(_isNonTaggedObjCPointer(object))
@@ -487,16 +483,16 @@ public func _bridgeObject(
 
 @inline(__always)
 @_inlineable
-public func _bridgeObject(fromTagged x: UInt) -> _BuiltinBridgeObject {
+public func _bridgeObject(fromTagged x: UInt) -> Builtin.BridgeObject {
   _sanityCheck(x & _objCTaggedPointerBits != 0)
-  let object: _BuiltinBridgeObject = Builtin.reinterpretCast(x)
+  let object: Builtin.BridgeObject = Builtin.reinterpretCast(x)
   _sanityCheck(_isTaggedObject(object))
   return object
 }
 
 @inline(__always)
 @_inlineable
-public func _bridgeObject(taggingPayload x: UInt) -> _BuiltinBridgeObject {
+public func _bridgeObject(taggingPayload x: UInt) -> Builtin.BridgeObject {
   let shifted = x &<< _objectPointerLowSpareBitShift
   _sanityCheck(x == (shifted &>> _objectPointerLowSpareBitShift),
     "out-of-range: limited bit range requires some zero top bits")
@@ -508,39 +504,39 @@ public func _bridgeObject(taggingPayload x: UInt) -> _BuiltinBridgeObject {
 // BridgeObject -> Values
 @inline(__always)
 @_inlineable
-public func _bridgeObject(toNative x: _BuiltinBridgeObject) -> AnyObject {
+public func _bridgeObject(toNative x: Builtin.BridgeObject) -> AnyObject {
   _sanityCheck(_isNativePointer(x))
   return Builtin.castReferenceFromBridgeObject(x)
 }
 
 @inline(__always)
 @_inlineable
 public func _bridgeObject(
-  toNonTaggedObjC x: _BuiltinBridgeObject
+  toNonTaggedObjC x: Builtin.BridgeObject
 ) -> AnyObject {
   _sanityCheck(_isNonTaggedObjCPointer(x))
   return Builtin.castReferenceFromBridgeObject(x)
 }
 
 @inline(__always)
 @_inlineable
-public func _bridgeObject(toTagged x: _BuiltinBridgeObject) -> UInt {
+public func _bridgeObject(toTagged x: Builtin.BridgeObject) -> UInt {
   _sanityCheck(_isTaggedObject(x))
   let bits = _bitPattern(x)
   _sanityCheck(bits & _objCTaggedPointerBits != 0)
   return bits
 }
 @inline(__always)
 @_inlineable
-public func _bridgeObject(toTagPayload x: _BuiltinBridgeObject) -> UInt {
+public func _bridgeObject(toTagPayload x: Builtin.BridgeObject) -> UInt {
   return _getNonTagBits(x)
 }
 
 @inline(__always)
 @_inlineable
 public func _bridgeObject(
-  fromNativeObject x: _BuiltinNativeObject
-) -> _BuiltinBridgeObject {
+  fromNativeObject x: Builtin.NativeObject
+) -> Builtin.BridgeObject {
   return _bridgeObject(fromNative: _nativeObject(toNative: x))
 }
 
@@ -550,7 +546,7 @@ public func _bridgeObject(
 
 @inline(__always)
 @_inlineable
-public func _nativeObject(fromNative x: AnyObject) -> _BuiltinNativeObject {
+public func _nativeObject(fromNative x: AnyObject) -> Builtin.NativeObject {
   _sanityCheck(!_isObjCTaggedPointer(x))
   let native = Builtin.unsafeCastToNativeObject(x)
   // _sanityCheck(native == Builtin.castToNativeObject(x))
@@ -559,14 +555,14 @@ public func _nativeObject(fromNative x: AnyObject) -> _BuiltinNativeObject {
 @inline(__always)
 @_inlineable
 public func _nativeObject(
-  fromBridge x: _BuiltinBridgeObject
-) -> _BuiltinNativeObject {
+  fromBridge x: Builtin.BridgeObject
+) -> Builtin.NativeObject {
   return _nativeObject(fromNative: _bridgeObject(toNative: x))
 }
 
 @inline(__always)
 @_inlineable
-public func _nativeObject(toNative x: _BuiltinNativeObject) -> AnyObject {
+public func _nativeObject(toNative x: Builtin.NativeObject) -> AnyObject {
   return Builtin.castFromNativeObject(x)
 }
 
@@ -575,7 +571,7 @@ extension ManagedBufferPointer {
   // FIXME: String Guts
   @inline(__always)
   @_inlineable
-  public init(_nativeObject buffer: _BuiltinNativeObject) {
+  public init(_nativeObject buffer: Builtin.NativeObject) {
     self._nativeBuffer = buffer
   }
 }

stdlib/public/core/CString.swift

@@ -195,14 +195,9 @@ internal func _decodeCString<Encoding : _UnicodeEncoding>(
 -> (result: String, repairsMade: Bool)? {
 
   let buffer = UnsafeBufferPointer<Encoding.CodeUnit>(
-    start: cString,
-    count: length)
+    start: cString, count: length)
 
   let (guts, hadError) = _StringGuts.fromCodeUnits(
-    buffer,
-    encoding: encoding,
-    repairIllFormedSequences: isRepairing)
-  return guts.map {
-    (result: String($0), repairsMade: hadError)
-  }
+    buffer, encoding: encoding, repairIllFormedSequences: isRepairing)
+  return guts.map { (result: String($0), repairsMade: hadError) }
 }

stdlib/public/core/StringBridge.swift

@@ -369,10 +369,8 @@ extension String {
 
 @_fixed_layout // FIXME(sil-serialize-all)
 public class _SwiftNativeNSString {
-  @_inlineable // FIXME(sil-serialize-all)
   @_versioned // FIXME(sil-serialize-all)
   internal init() {}
-  @_inlineable // FIXME(sil-serialize-all)
   deinit {}
 }
 

stdlib/public/core/StringComparable.swift

@@ -74,7 +74,7 @@ extension _UnmanagedString where CodeUnit == UInt8 {
 extension _StringGuts {
 
   //
-  // HACK HACK HACK: Work around for ARC :-(
+  // FIXME(TODO: JIRA): HACK HACK HACK: Work around for ARC :-(
   //
   @inline(never)
   @effects(readonly)

stdlib/public/core/StringGuts.swift

@@ -210,8 +210,8 @@ extension _StringGuts {
 #if _runtime(_ObjC)
 extension _StringGuts {
   //
-  // HACK HACK HACK: Work around for ARC :-(
-  //  @inline(never) // Hide CF dependency
+  // FIXME(TODO: JIRA): HACK HACK HACK: Work around for ARC :-(
+  //
   @_versioned
   @effects(readonly)
   internal static func getCocoaLength(_unsafeBitPattern: UInt) -> Int {
@@ -568,69 +568,30 @@ extension _StringGuts {
   }
 }
 
-// Internal hex dumping function. Useful because `print` is implemented in the
-// stdlib through a series of very high level String calls, resulting in
-// infinite recursion.
-@_versioned
-internal func internalDumpHexImpl(_ x: UInt, newline: Bool) {
-  _swift_stdlib_print_hex(x, newline ? 1 : 0)
-}
-@_versioned
-internal func internalDumpHex(_ x: _BuiltinNativeObject, newline: Bool) {
-  internalDumpHexImpl(Builtin.reinterpretCast(x), newline: newline)
-}
-@_versioned
-internal func internalDumpHex(_ x: UInt, newline: Bool = true) {
-  internalDumpHexImpl(x, newline: newline)
-}
-@_versioned
-internal func internalDumpHex(_ x: UInt64, newline: Bool = true) {
-#if arch(i386) || arch(arm)
-  internalDumpHexImpl(UInt(truncatingIfNeeded: x >> 32), newline: false)
-  internalDumpHexImpl(UInt(truncatingIfNeeded: x), newline: newline)
-#else
-  internalDumpHexImpl(UInt(x), newline: newline)
-#endif
-}
-@_versioned
-internal func internalDumpHex(_ x: AnyObject, newline: Bool = true) {
-  internalDumpHexImpl(Builtin.reinterpretCast(x), newline: newline)
-}
-@_versioned
-internal func internalDumpHex(_ x: UnsafeRawPointer?, newline: Bool = true) {
-  internalDumpHexImpl(Builtin.reinterpretCast(x), newline: newline)
-}
-@_versioned
-internal func internalDumpHex(_ x: Bool, newline: Bool = true) {
-  internalDumpHexImpl(x ? 1 : 0, newline: newline)
-}
-
 extension _StringGuts {
   // FIXME: Remove
   public func _dump() {
-    print("_StringGuts(", terminator: "")
-    internalDumpHex(rawBits.0, newline: false)
-    print(" ", terminator: "")
-    internalDumpHex(rawBits.1, newline: false)
-    print(": ", terminator: "")
-    _dumpContents()
-    if isASCII {
-      print(" <ascii>", terminator: "")
+    func printHex(_ uint: UInt, newline: Bool = true) {
+      print(String(uint, radix: 16), terminator: newline ? "\n" : "")
     }
-    else {
-      print(" <utf16>", terminator: "")
+    func fromAny(_ x: AnyObject) -> UInt {
+      return Builtin.reinterpretCast(x)
+    }
+    func fromPtr(_ x: UnsafeMutableRawPointer) -> UInt {
+      return Builtin.reinterpretCast(x)
     }
-    print(")")
-  }
 
-  // FIXME: Remove
-  internal func _dumpContents() {
+    print("_StringGuts(", terminator: "")
+    printHex(UInt(rawBits.0), newline: false)
+    print(" ", terminator: "")
+    printHex(UInt(rawBits.1), newline: false)
+    print(": ", terminator: "")
     if _object.isNative {
       let storage = _object.nativeRawStorage
       print("native ", terminator: "")
-      internalDumpHex(storage, newline: false)
+      printHex(Builtin.reinterpretCast(storage), newline: false)
       print(" start: ", terminator: "")
-      internalDumpHex(storage.rawStart, newline: false)
+      printHex(Builtin.reinterpretCast(storage.rawStart), newline: false)
       print(" count: ", terminator: "")
       print(storage.count, terminator: "")
       print("/", terminator: "")
@@ -640,10 +601,10 @@ extension _StringGuts {
 #if _runtime(_ObjC)
     if _object.isCocoa {
       print("cocoa ", terminator: "")
-      internalDumpHex(_object.asCocoaObject, newline: false)
+      printHex(Builtin.reinterpretCast(_object.asCocoaObject), newline: false)
       print(" start: ", terminator: "")
       if _object.isContiguous {
-        internalDumpHex(_cocoaRawStart, newline: false)
+        printHex(Builtin.reinterpretCast(_cocoaRawStart), newline: false)
       } else {
         print("<opaque>", terminator: "")
       }
@@ -654,29 +615,36 @@ extension _StringGuts {
 #else
     if _object.isOpaque {
       print("opaque ", terminator: "")
-      internalDumpHex(_object.asOpaqueObject, newline: false)
+      printHex(Builtin.reinterpretCast(_object.asOpaqueObject), newline: false)
       print(" count: ", terminator: "")
       print(_opaqueCount, terminator: "")
       return
     }
 #endif
     if _object.isUnmanaged {
       print("unmanaged ", terminator: "")
-      internalDumpHex(_unmanagedRawStart, newline: false)
+      printHex(Builtin.reinterpretCast(_unmanagedRawStart), newline: false)
       print(" count: ", terminator: "")
       print(_unmanagedCount, terminator: "")
       return
     }
 #if _runtime(_ObjC)
     if _object.isSmall {
       print("small cocoa ", terminator: "")
-      internalDumpHex(_taggedCocoaObject, newline: false)
+      printHex(Builtin.reinterpretCast(_taggedCocoaObject), newline: false)
       print(" count: ", terminator: "")
       print(_taggedCocoaCount, terminator: "")
       return
     }
 #endif
     print("error", terminator: "")
+    if isASCII {
+      print(" <ascii>", terminator: "")
+    }
+    else {
+      print(" <utf16>", terminator: "")
+    }
+    print(")")
   }
 }
 

stdlib/public/core/StringObject.swift

@@ -48,7 +48,7 @@ struct _StringObject {
   // provides us the runtime functionality we want.
   @_versioned
   internal
-  var _object: _BuiltinBridgeObject
+  var _object: Builtin.BridgeObject
 #endif
 
 #if arch(i386) || arch(arm)
@@ -66,7 +66,7 @@ struct _StringObject {
   @_inlineable
   @inline(__always)
   internal
-  init(_ object: _BuiltinBridgeObject) {
+  init(_ object: Builtin.BridgeObject) {
     self._object = object
     _invariantCheck()
   }

stdlib/public/stubs/LibcShims.cpp

@@ -329,17 +329,3 @@ swift::_stdlib_cxx11_mt19937_uniform(__swift_uint32_t upper_bound) {
   std::uniform_int_distribution<__swift_uint32_t> RandomUniform(0, upper_bound);
   return RandomUniform(getGlobalMT19937());
 }
-
-// FIXME remove
-SWIFT_RUNTIME_STDLIB_INTERFACE
-void swift::_swift_stdlib_print_hex(__swift_uintptr_t value, int newline) {
-  if (sizeof(value) == 4) {
-    printf("%08tX", value);
-  } else {
-    printf("%016tX", value);
-  }
-  if (newline) {
-    printf("\n");
-  }
-}
-