Skip to content

Commit 29a4b8a

Browse files
authored
Merge pull request #75622 from glessard/rdar132941798-aEIC-private-consternation
2 parents 30ce1b0 + dd854fa commit 29a4b8a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

stdlib/public/core/CString.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ extension String {
7777
}
7878

7979
@_alwaysEmitIntoClient
80-
private init(_checkingCString bytes: UnsafeBufferPointer<UInt8>) {
80+
internal init(_checkingCString bytes: UnsafeBufferPointer<UInt8>) {
8181
guard let length = bytes.firstIndex(of: 0) else {
8282
_preconditionFailure(
8383
"input of String.init(cString:) must be null-terminated"

stdlib/public/core/String.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,14 @@ extension String {
420420
// check in String(decoding:as:).
421421
@_alwaysEmitIntoClient
422422
@inline(never) // slow-path
423-
private static func _fromNonContiguousUnsafeBitcastUTF8Repairing<
423+
internal static func _fromNonContiguousUnsafeBitcastUTF8Repairing<
424424
C: Collection
425425
>(_ input: C) -> (result: String, repairsMade: Bool) {
426426
_internalInvariant(C.Element.self == UInt8.self)
427427
return Array(input).withUnsafeBufferPointer {
428-
let raw = UnsafeRawBufferPointer($0)
429-
return String._fromUTF8Repairing(raw.bindMemory(to: UInt8.self))
428+
UnsafeRawBufferPointer($0).withMemoryRebound(to: UInt8.self) {
429+
String._fromUTF8Repairing($0)
430+
}
430431
}
431432
}
432433

0 commit comments

Comments
 (0)