Merge pull request #38970 from Catfish-Man/ask-only-for-what-you-need

Catfish-Man · web-flow · commit 5f268cceab6a · 2021-08-20T11:10:14.000-07:00
Avoid an unnecessary call to CFStringGetCharactersPtr in bridging
diff --git a/stdlib/public/core/StringBridge.swift b/stdlib/public/core/StringBridge.swift
@@ -409,9 +409,8 @@ private func _getCocoaStringPointer(
   if let ascii = stableCocoaASCIIPointer(cfImmutableValue) {
     return .ascii(ascii)
   }
-  if let utf16Ptr = _stdlib_binary_CFStringGetCharactersPtr(cfImmutableValue) {
-    return .utf16(utf16Ptr)
-  }
+  // We could ask for UTF16 here via _stdlib_binary_CFStringGetCharactersPtr,
+  // but we currently have no use for it
   return .none
 }
 

Original file line number	Diff line number	Diff line change
`@@ -409,9 +409,8 @@ private func _getCocoaStringPointer(`
`409`	`409`	`if let ascii = stableCocoaASCIIPointer(cfImmutableValue) {`
`410`	`410`	`return .ascii(ascii)`
`411`	`411`	`}`
`412`		`- if let utf16Ptr = _stdlib_binary_CFStringGetCharactersPtr(cfImmutableValue) {`
`413`		`- return .utf16(utf16Ptr)`
`414`		`- }`
	`412`	`+ // We could ask for UTF16 here via _stdlib_binary_CFStringGetCharactersPtr,`
	`413`	`+ // but we currently have no use for it`
`415`	`414`	`return .none`
`416`	`415`	`}`
`417`	`416`