From 10454e05cc8ede244cef5bf2c8c74a58b9e973bb Mon Sep 17 00:00:00 2001
From: David Smith <david_smith@apple.com>
Date: Tue, 2 Sep 2025 19:52:16 -0700
Subject: [PATCH] Don't grow smol Strings to 16 characters when bridging out if
 tagged pointer formation fails

---
 stdlib/public/core/StringBridge.swift | 31 ++++++++++++---------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/stdlib/public/core/StringBridge.swift b/stdlib/public/core/StringBridge.swift
index c79334fa5bc42..d28fb1139d127 100644
--- a/stdlib/public/core/StringBridge.swift
+++ b/stdlib/public/core/StringBridge.swift
@@ -623,31 +623,28 @@ extension String {
 
     _connectOrphanedFoundationSubclassesIfNeeded()
 
-    // Smol ASCII a) may bridge to tagged pointers, b) can't contain a BOM
-    if _guts.isSmallASCII {
-      let maybeTagged = _guts.asSmall.withUTF8 { bufPtr in
-        return unsafe _createCFString(
+    if _guts.isSmall {
+      return unsafe _guts.asSmall.withUTF8 { bufPtr in
+        // Smol ASCII a) may bridge to tagged pointers, b) can't contain a BOM
+        if _guts.isSmallASCII, let result = unsafe _createCFString(
           bufPtr.baseAddress._unsafelyUnwrappedUnchecked,
           bufPtr.count,
           kCFStringEncodingUTF8
-        )
-      }
-      if let tagged = maybeTagged { return tagged }
-    }
-
-    if _guts.isSmall {
-        // We can't form a tagged pointer String, so grow to a non-small String,
+        ) {
+          return result
+        }
+        // We can't form a tagged pointer String, so make a non-small String,
         // and bridge that instead. Also avoids CF deleting any BOM that may be
         // present
-        var copy = self
-        // TODO: small capacity minimum is lifted, just need to make native
-        copy._guts.grow(_SmallString.capacity + 1)
-        _internalInvariant(!copy._guts.isSmall)
-        return copy._bridgeToObjectiveCImpl()
+        return unsafe __StringStorage.create(
+          initializingFrom: bufPtr,
+          codeUnitCapacity: bufPtr.count,
+          isASCII: _guts.isSmallASCII)
+      }
     }
     if _guts._object.isImmortal && !_guts._object.largeFastIsConstantCocoa {
       if _guts.isASCII && _guts._object.isFastZeroTerminated {
-        let ptr = unsafe _guts._object.fastUTF8.baseAddress!
+        let ptr = unsafe _guts._object.fastUTF8.baseAddress._unsafelyUnwrappedUnchecked
         let count = _guts.count
         if let indirect = unsafe _stdlib_binary_createIndirectTaggedPointerNSString(
           ptr: ptr, count: count