Bridged Strings should have some different/additional overrides for performance

Author: Catfish-Man

stdlib/public/SwiftShims/CoreFoundationShims.h

@@ -104,12 +104,28 @@ _swift_shims_CFStringRef _Nonnull _swift_stdlib_CFStringCreateWithBytes(
 SWIFT_RUNTIME_STDLIB_API
 const char *_Nullable _swift_stdlib_CFStringGetCStringPtr(
     _swift_shims_CFStringRef _Nonnull theString,
-
     _swift_shims_CFStringEncoding encoding);
 
 SWIFT_RUNTIME_STDLIB_API
 _swift_shims_CFStringRef _Nonnull _swift_stdlib_objcDebugDescription(
     id _Nonnull nsObject);
+  
+SWIFT_RUNTIME_STDLIB_API
+_swift_shims_CFComparisonResult _swift_stdlib_CFStringCompare(
+    _swift_shims_CFStringRef _Nonnull string,
+    _swift_shims_CFStringRef _Nonnull string2);
+  
+SWIFT_RUNTIME_STDLIB_API
+__swift_uint8_t _swift_stdlib_isNSString(id _Nonnull obj);
+
+SWIFT_RUNTIME_STDLIB_API
+_swift_shims_CFHashCode _swift_stdlib_CFStringHashNSString(id _Nonnull obj);
+
+SWIFT_RUNTIME_STDLIB_API
+_swift_shims_CFHashCode
+_swift_stdlib_CFStringHashCString(const _swift_shims_UInt8 * _Nonnull bytes,
+                                  _swift_shims_CFIndex length);
+  
 #endif // __OBJC2__
 
 #ifdef __cplusplus

stdlib/public/core/StringBridge.swift

@@ -69,6 +69,30 @@ internal func _cocoaStringSubscript(
   return _swift_stdlib_CFStringGetCharacterAtIndex(cfSelf, position)
 }
 
+@_effects(readonly)
+internal func _cocoaStringCompare(
+  _ string: _CocoaString, _ other: _CocoaString
+) -> Int {
+  let cfSelf: _swift_shims_CFStringRef = string
+  let cfOther: _swift_shims_CFStringRef = other
+  return _swift_stdlib_CFStringCompare(cfSelf, cfOther)
+}
+
+@_effects(readonly)
+internal func _cocoaHashString(
+  _ string: _CocoaString
+  ) -> UInt {
+  return _swift_stdlib_CFStringHashNSString(string)
+}
+
+@_effects(readonly)
+internal func _cocoaHashASCIIBytes(
+  _ bytes: UnsafePointer<UInt8>,
+  length: Int
+  ) -> UInt {
+  return _swift_stdlib_CFStringHashCString(bytes, length)
+}
+
 //
 // Conversion from NSString to Swift's native representation
 //
@@ -225,36 +249,6 @@ public class __SwiftNativeNSString {
   deinit {}
 }
 
-/// A shadow for the "core operations" of NSString.
-///
-/// Covers a set of operations everyone needs to implement in order to
-/// be a useful `NSString` subclass.
-@objc
-public protocol _NSStringCore : _NSCopying /* _NSFastEnumeration */ {
-
-  // The following methods should be overridden when implementing an
-  // NSString subclass.
-
-  @objc(length)
-  var length: Int { get }
-
-  @objc(characterAtIndex:)
-  func character(at index: Int) -> UInt16
-
- // We also override the following methods for efficiency.
-
-  @objc(getCharacters:range:)
-  func getCharacters(
-   _ buffer: UnsafeMutablePointer<UInt16>,
-   range aRange: _SwiftNSRange)
-
-  @objc(_fastCharacterContents)
-  func _fastCharacterContents() -> UnsafePointer<UInt16>?
-
-  @objc(_fastCStringContents)
-  func _fastCStringContents() -> UnsafePointer<CChar>?
-}
-
 // Called by the SwiftObject implementation to get the description of a value
 // as an NSString.
 @_silgen_name("swift_stdlib_getDescription")
@@ -264,15 +258,11 @@ public func _getDescription<T>(_ x: T) -> AnyObject {
 
 #else // !_runtime(_ObjC)
 
-@_fixed_layout // FIXME(sil-serialize-all)
-public class __SwiftNativeNSString {
-  @usableFromInline // FIXME(sil-serialize-all)
+internal class __SwiftNativeNSString {
   internal init() {}
   deinit {}
 }
 
-public protocol _NSStringCore: class {}
-
 #endif
 
 // Special-case Index <-> Offset converters for bridging and use in accelerating

stdlib/public/core/StringGuts.swift

@@ -55,7 +55,7 @@ extension _StringGuts {
     self.init(_StringObject(immortal: bufPtr, isASCII: isASCII))
   }
 
-  @inlinable @inline(__always)
+  @inline(__always)
   internal init(_ storage: _StringStorage) {
     self.init(_StringObject(storage))
   }

stdlib/public/core/StringObject.swift

@@ -81,7 +81,7 @@ internal struct _StringObject {
   @usableFromInline @_frozen
   internal enum Variant {
     case immortal(UInt)
-    case native(_AbstractStringStorage)
+    case native(AnyObject)
     case bridged(_CocoaString)
 
     @inlinable @inline(__always)
@@ -1029,7 +1029,6 @@ extension _StringObject {
     }
   }
 
-  @inlinable
   internal var nativeStorage: _StringStorage {
     @inline(__always) get {
 #if arch(i386) || arch(arm)
@@ -1187,7 +1186,7 @@ extension _StringObject {
 #endif
   }
 
-  @inlinable @inline(__always)
+  @inline(__always)
   internal init(_ storage: _StringStorage) {
 #if arch(i386) || arch(arm)
     self.init(