---

yaml
---
r: 202135
b: refs/heads/tensorflow
c: 56d04be
h: refs/heads/master
i:
  202133: 4dbef3a
  202131: 299f663
  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: 47deadc2fb3526b1720bbb99afd5636430238088
+refs/heads/tensorflow: 56d04befd1b64de1c5517d3138d65251907b4553
 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

@@ -962,40 +962,40 @@ extension Unicode.Scalar.Properties {
   internal func _scalarName(
     _ choice: __swift_stdlib_UCharNameChoice
   ) -> String? {
-    // 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(
+    // ICU writes a trailing nul. We allow ICU to store up to and including
+    // `capacity` bytes. If ICU writes `capacity` bytes, then ICU will also
+    // write nul into the count, which we will overwrite after.
+    var smol = _SmallUTF8String()
+    let count = smol._withAllUnsafeMutableBytes { bufPtr -> Int in
+      var err = __swift_stdlib_U_ZERO_ERROR
+      let count32 = __swift_stdlib_u_charName(
+        _value, choice,
+        bufPtr.baseAddress._unsafelyUnwrappedUnchecked.assumingMemoryBound(
           to: Int8.self),
-        Int32(ptr.count),
-        &err)
+        Int32(bufPtr.count), &err)
+      return Int(count32)
     }
-
-    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 count > 0 else { return nil }
+    if count <= smol.capacity {
+      smol.count = count
+      return String(_StringGuts(smol))
     }
 
-    // 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)
+    // Save room for nul
+    var array = Array<UInt8>(repeating: 0, count: 1 + count)
+    array.withUnsafeMutableBufferPointer { bufPtr in
+      var err = __swift_stdlib_U_ZERO_ERROR
+      let correctSize = __swift_stdlib_u_charName(
+        _value, choice,
+        UnsafeMutableRawPointer(bufPtr.baseAddress._unsafelyUnwrappedUnchecked)
+          .assumingMemoryBound(to: Int8.self),
+        Int32(bufPtr.count), &err)
+      guard err.isSuccess else {
+        fatalError("Unexpected error case-converting Unicode scalar.")
+      }
+      _sanityCheck(count == correctSize, "inconsistent ICU behavior")
     }
-    return String._fromASCII(asciiArray)
+    return String._fromWellFormedUTF8CodeUnitSequence(array[..<count])
   }
 
   /// The published name of the scalar.