Merge pull request #14077 from milseman/arc_bridge

milseman · web-flow · commit f3c691f0190d · 2018-01-23T09:40:29.000-08:00
[string] Hack around more ARC.
diff --git a/stdlib/public/core/StringBridge.swift b/stdlib/public/core/StringBridge.swift
@@ -163,9 +163,12 @@ func _makeCocoaStringGuts(_ cocoaString: _CocoaString) -> _StringGuts {
   }
 
   let (start, isUTF16) = _getCocoaStringPointer(immutableCopy)
+
+  let length = _StringGuts.getCocoaLength(
+    _unsafeBitPattern: Builtin.reinterpretCast(immutableCopy))
   return _StringGuts(
     _nonTaggedCocoaObject: immutableCopy,
-    count: _stdlib_binary_CFStringGetLength(immutableCopy),
+    count: length,
     isSingleByte: !isUTF16,
     start: start)
 }
diff --git a/stdlib/public/core/StringGuts.swift b/stdlib/public/core/StringGuts.swift
@@ -255,7 +255,6 @@ extension _StringGuts {
     return _UnmanagedString(start: start, count: _cocoaCount)
   }
 
-  @inline(never)
   @_versioned
   internal
   init(

Original file line number	Diff line number	Diff line change
`@@ -163,9 +163,12 @@ func _makeCocoaStringGuts(_ cocoaString: _CocoaString) -> _StringGuts {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`let (start, isUTF16) = _getCocoaStringPointer(immutableCopy)`
	`166`	`+`
	`167`	`+ let length = _StringGuts.getCocoaLength(`
	`168`	`+ _unsafeBitPattern: Builtin.reinterpretCast(immutableCopy))`
`166`	`169`	`return _StringGuts(`
`167`	`170`	`_nonTaggedCocoaObject: immutableCopy,`
`168`		`- count: _stdlib_binary_CFStringGetLength(immutableCopy),`
	`171`	`+ count: length,`
`169`	`172`	`isSingleByte: !isUTF16,`
`170`	`173`	`start: start)`
`171`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,6 @@ extension _StringGuts {`
`255`	`255`	`return _UnmanagedString(start: start, count: _cocoaCount)`
`256`	`256`	`}`
`257`	`257`
`258`		`- @inline(never)`
`259`	`258`	`@_versioned`
`260`	`259`	`internal`
`261`	`260`	`init(`