---

yaml
---
r: 202131
b: refs/heads/tensorflow
c: 5807bb9
h: refs/heads/master
i:
  202129: 61ee416
  202127: 2af0161

Author: allevato

[refs]

@@ -821,7 +821,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: fb9f7ecca13fa0fc5257ab9dbf065f9b7d1399ad
+refs/heads/tensorflow: 5807bb9436258a10c4b68b0fbf0614c2376654ac
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/stdlib/public/core/UnicodeScalarProperties.swift

@@ -1004,28 +1004,40 @@ extension Unicode.Scalar.Properties {
   internal func _scalarName(
     _ choice: __swift_stdlib_UCharNameChoice
   ) -> String? {
-    let initialCapacity = 256
-
-    var storage = _SwiftStringStorage<UTF8.CodeUnit>.create(
-      capacity: initialCapacity,
-      count: 0)
+    // Attempt to fit it into a small UTF-8 string first. Code points names are
+    // guaranteed by the standard to be ASCII only.
+    var smallString = _SmallUTF8String()
     var err = __swift_stdlib_U_ZERO_ERROR
+    let correctSizeRaw = smallString._withMutableExcessCapacityBytes { ptr in
+      return __swift_stdlib_u_charName(
+        _value,
+        choice,
+        ptr.baseAddress._unsafelyUnwrappedUnchecked.assumingMemoryBound(
+          to: Int8.self),
+        Int32(ptr.count),
+        &err)
+    }
 
-    let correctSize = _expandingStorageIfNeeded(&storage) { storage in
-      return storage.start.withMemoryRebound(
-        to: Int8.self,
-        capacity: storage.capacity
-      ) { storagePtr in
-        err = __swift_stdlib_U_ZERO_ERROR
-        return __swift_stdlib_u_charName(
-          _value, choice, storagePtr, Int32(storage.capacity), &err)
-      }
+    let correctSize = Int(correctSizeRaw)
+    if err.isSuccess {
+      if correctSize == 0 { return nil }
+      smallString.count = correctSize
+      return String(_StringGuts(smallString))
+    }
+    // If the call wasn't successful, the only error we expect to see is buffer
+    // overflow; anything else is a severe error.
+    guard err == __swift_stdlib_U_BUFFER_OVERFLOW_ERROR else {
+      fatalError("u_charName: Unexpected error retrieving scalar name.")
     }
 
-    guard err.isSuccess && correctSize > 0 else {
-      return nil
+    // If it didn't fit, we need to allocate the necessary amount of memory and
+    // make a regular ASCII string.
+    var (asciiArray, ptr) = [UInt8]._allocateUninitialized(correctSize)
+    _ = ptr.withMemoryRebound(to: Int8.self, capacity: correctSize) { int8Ptr in
+      err = __swift_stdlib_U_ZERO_ERROR
+      __swift_stdlib_u_charName(_value, choice, int8Ptr, correctSizeRaw, &err)
     }
-    return String(_storage: storage)
+    return String._fromASCII(asciiArray)
   }
 
   /// The published name of the scalar.