Merge pull request #26548 from Catfish-Man/bring-out-your-dead

Remove dead shim code

Author: Catfish-Man

stdlib/public/SwiftShims/CoreFoundationShims.h

@@ -29,30 +29,19 @@ namespace swift { extern "C" {
 #ifdef __OBJC2__
 #if __LLP64__
 typedef unsigned long long _swift_shims_CFTypeID;
-typedef unsigned long long _swift_shims_CFOptionFlags;
 typedef unsigned long long _swift_shims_CFHashCode;
 typedef signed long long _swift_shims_CFIndex;
 #else
 typedef unsigned long _swift_shims_CFTypeID;
-typedef unsigned long _swift_shims_CFOptionFlags;
 typedef unsigned long _swift_shims_CFHashCode;
 typedef signed long _swift_shims_CFIndex;
 #endif
 
-typedef struct {
-  _swift_shims_CFIndex location;
-  _swift_shims_CFIndex length;
-} _swift_shims_CFRange;
-
 typedef id _swift_shims_CFStringRef;
-typedef const struct _swift_shims_CFAllocator *_swift_shims_CFAllocatorRef;
 typedef __swift_uint32_t _swift_shims_CFStringEncoding;
-typedef _swift_shims_CFOptionFlags _swift_shims_CFStringCompareFlags;
-typedef _swift_shims_CFIndex _swift_shims_CFComparisonResult;
 
 // Consider creating SwiftMacTypes.h for these
 typedef unsigned char _swift_shims_Boolean;
-typedef __swift_uint16_t _swift_shims_UniChar;
 typedef __swift_uint8_t _swift_shims_UInt8;
 
 SWIFT_RUNTIME_STDLIB_API
@@ -63,15 +52,6 @@ _swift_shims_CFStringRef _Nonnull _swift_stdlib_CFStringCreateWithBytes(
     _swift_shims_CFStringEncoding encoding,
     _swift_shims_Boolean isExternalRepresentation);
 
-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_uint8_t _swift_stdlib_isNSString(id _Nonnull obj);
 

stdlib/public/stubs/FoundationHelpers.mm

@@ -30,13 +30,8 @@
 #define BRIDGE_TYPE(FROM, TO) \
 template <> struct DestType<FROM> { using type = TO; }
 
-BRIDGE_TYPE(_swift_shims_CFAllocatorRef, CFAllocatorRef);
 BRIDGE_TYPE(_swift_shims_CFStringRef, CFStringRef);
-BRIDGE_TYPE(_swift_shims_UniChar *, UniChar *);
 BRIDGE_TYPE(_swift_shims_CFStringEncoding, CFStringEncoding);
-BRIDGE_TYPE(_swift_shims_CFStringCompareFlags, CFStringCompareFlags);
-BRIDGE_TYPE(_swift_shims_CFRange *, CFRange *);
-BRIDGE_TYPE(CFComparisonResult, _swift_shims_CFComparisonResult);
 BRIDGE_TYPE(CFStringRef, _swift_shims_CFStringRef);
 
 template <class FromTy>
@@ -62,11 +57,6 @@
                                       isExternalRepresentation));
 }
 
-_swift_shims_CFStringRef
-swift::_swift_stdlib_objcDebugDescription(id _Nonnull nsObject) {
-  return [nsObject debugDescription];
-}
-
 extern "C" CFHashCode CFStringHashCString(const uint8_t *bytes, CFIndex len);
 extern "C" CFHashCode CFStringHashNSString(id str);