---

yaml
---
r: 202134
b: refs/heads/tensorflow
c: 47deadc
h: refs/heads/master

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: 5a7d7d392922a2bb949bf4960debaa669e784fb8
+refs/heads/tensorflow: 47deadc2fb3526b1720bbb99afd5636430238088
 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

@@ -24,18 +24,9 @@ extension Unicode.Scalar {
       // We convert the value to the underlying UChar32 type here and store it
       // in that form to make calling the ICU APIs cleaner below.
       self._value = __swift_stdlib_UChar32(bitPattern: _scalar._value)
-
-      // Likewise, we cache the UTF-16 encoding of the scalar for a few of the
-      // properties that require treating it like a string (e.g., case
-      // mappings).
-      let utf16 = _scalar.utf16
-      self._utf16Length = utf16.count
-      self._utf16 = (utf16[0], _utf16Length > 1 ? utf16[1] : 0)
     }
 
     internal var _value: __swift_stdlib_UChar32
-    internal var _utf16: (UTF16.CodeUnit, UTF16.CodeUnit)
-    internal var _utf16Length: Int
   }
 
   /// A value that provides access to properties of the Unicode scalar that are
@@ -1036,6 +1027,15 @@ extension Unicode.Scalar.Properties {
 
 extension Unicode.Scalar.Properties {
 
+  /// The UTF-16 encoding of the scalar, represented as a tuple of 2 elements.
+  ///
+  /// If the scalar only encodes to one code unit, the second element is zero.
+  @_transparent
+  internal var _utf16CodeUnits: (UTF16.CodeUnit, UTF16.CodeUnit) {
+    let utf16 = UnicodeScalar(UInt32(_value))!.utf16
+    return (utf16[0], utf16.count > 1 ? utf16[1] : 0)
+  }
+
   // The type of ICU case conversion functions.
   internal typealias _U_StrToX = (
     /* dest */ UnsafeMutablePointer<__swift_stdlib_UChar>,
@@ -1053,16 +1053,17 @@ extension Unicode.Scalar.Properties {
   /// all current case mappings. In the event more space is needed, it will be
   /// allocated on the heap.
   internal func _applyMapping(_ u_strTo: _U_StrToX) -> String {
+    let utf16Length = UnicodeScalar(UInt32(_value))!.utf16.count
+    var utf16 = _utf16CodeUnits
     var scratchBuffer = _Normalization._SegmentOutputBuffer(allZeros: ())
     let count = scratchBuffer.withUnsafeMutableBufferPointer { bufPtr -> Int in
-      var utf16 = _utf16
       return withUnsafePointer(to: &utf16.0) { utf16Pointer in
         var err = __swift_stdlib_U_ZERO_ERROR
         let correctSize = u_strTo(
           bufPtr.baseAddress._unsafelyUnwrappedUnchecked,
           Int32(bufPtr.count),
           utf16Pointer,
-          Int32(_utf16Length),
+          Int32(utf16Length),
           "",
           &err)
         guard err.isSuccess ||
@@ -1078,14 +1079,13 @@ extension Unicode.Scalar.Properties {
     }
     var array = Array<UInt16>(repeating: 0, count: count)
     array.withUnsafeMutableBufferPointer { bufPtr in
-      var utf16 = _utf16
       withUnsafePointer(to: &utf16.0) { utf16Pointer in
         var err = __swift_stdlib_U_ZERO_ERROR
         let correctSize = u_strTo(
           bufPtr.baseAddress._unsafelyUnwrappedUnchecked,
           Int32(bufPtr.count),
           utf16Pointer,
-          Int32(_utf16Length),
+          Int32(utf16Length),
           "",
           &err)
         guard err.isSuccess else {