[Foundation] Remove @_silgen thunks and replace them with shims instead

This avoids indirection by making calls directly to the C implementations which prevents potentials of mismatched intent or changes of calling convention of @_silgen. The added benefit is that all of the shims in this case are no longer visible symbols (anyone using them was not authorized out side of the Foundation overlay). Also the callout methods in the headers now all share similar naming shcemes for easier refactoring and searching in the style of __NS<class><action> style. The previous compiled C/Objective-C source files were built with MRR the new headers MUST be ARC by Swift import rules.

The one caveat is that certain functions MUST avoid the bridge case (since they are part of the bridging code-paths and that would incur a recursive potential) which have the types erased up to NSObject * via the macro NS_NON_BRIDGED.

The remaining @_silgen declarations are either swift functions exposed externally to the rest of Swift’s runtime or are included in NSNumber.gyb which the Foundation team has other plans for removing those @_silgen functions at a later date and Data.swift has one external function left with @_silgen which is blocked by a bug in the compiler which seems to improperly import that particular method as an inline c function.

Author: phausler

stdlib/public/SDK/Foundation/CMakeLists.txt

@@ -11,13 +11,9 @@ add_swift_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SD
   Decimal.swift
   ExtraStringAPIs.swift
   FileManager.swift
-  FileManagerThunks.m
   Foundation.swift
-  Hashing.m
-  Hashing.swift
   IndexPath.swift
   IndexSet.swift
-  IndexSetThunks.m
   Locale.swift
   Measurement.swift
   Notification.swift
@@ -44,7 +40,6 @@ add_swift_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SD
   PersonNameComponents.swift
   ReferenceConvertible.swift
   String.swift
-  Thunks.mm
   TimeZone.swift
   TypePreservingNSNumber.mm
   URL.swift

stdlib/public/SDK/Foundation/Calendar.swift

@@ -11,18 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @_exported import Foundation // Clang module
-
-@_silgen_name("__NSCalendarIsAutoupdating")
-internal func __NSCalendarIsAutoupdating(_ calendar: NSCalendar) -> Bool
-
-@_silgen_name("__NSCalendarAutoupdating")
-internal func __NSCalendarAutoupdating() -> NSCalendar
-
-@_silgen_name("__NSCalendarCurrent")
-internal func __NSCalendarCurrent() -> NSCalendar
-
-@_silgen_name("__NSCalendarInit")
-internal func __NSCalendarInit(_ identifier : NSString) -> NSCalendar?
+import _SwiftFoundationOverlayShims
 
 /**
  `Calendar` encapsulates information about systems of reckoning time in which the beginning, length, and divisions of a year are defined. It provides information about the calendar and support for calendrical computations such as determining the range of a given calendrical unit and adding units to a given absolute time.
@@ -90,7 +79,7 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
     ///
     /// This calendar does not track changes that the user makes to their preferences.
     public static var current : Calendar {
-        return Calendar(adoptingReference: __NSCalendarCurrent(), autoupdating: false)
+        return Calendar(adoptingReference: __NSCalendarCurrent() as! NSCalendar, autoupdating: false)
     }
 
     /// A Calendar that tracks changes to user's preferred calendar.
@@ -99,7 +88,7 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
     ///
     /// - note: The autoupdating Calendar will only compare equal to another autoupdating Calendar.
     public static var autoupdatingCurrent : Calendar {
-        return Calendar(adoptingReference: __NSCalendarAutoupdating(), autoupdating: true)
+        return Calendar(adoptingReference: __NSCalendarAutoupdating() as! NSCalendar, autoupdating: true)
     }
 
     // MARK: -
@@ -109,8 +98,8 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
     ///
     /// - parameter identifier: The kind of calendar to use.
     public init(identifier: Identifier) {
-        let result = __NSCalendarInit(Calendar._toNSCalendarIdentifier(identifier).rawValue as NSString)!
-        _handle = _MutableHandle(adoptingReference: result)
+        let result = __NSCalendarCreate(Calendar._toNSCalendarIdentifier(identifier))
+        _handle = _MutableHandle(adoptingReference: result as! NSCalendar)
         _autoupdating = false
     }
 

stdlib/public/SDK/Foundation/Data.swift

@@ -31,18 +31,11 @@ internal func __NSDataInvokeDeallocatorFree(_ mem: UnsafeMutableRawPointer, _ le
 #else
 
 @_exported import Foundation // Clang module
+import _SwiftFoundationOverlayShims
+import _SwiftCoreFoundationOverlayShims
 
-@_silgen_name("__NSDataInvokeDeallocatorVM")
-internal func __NSDataInvokeDeallocatorVM(_ mem: UnsafeMutableRawPointer, _ length: Int)
-
-@_silgen_name("__NSDataInvokeDeallocatorUnmap")
-internal func __NSDataInvokeDeallocatorUnmap(_ mem: UnsafeMutableRawPointer, _ length: Int)
-
-@_silgen_name("__NSDataInvokeDeallocatorFree")
-internal func __NSDataInvokeDeallocatorFree(_ mem: UnsafeMutableRawPointer, _ length: Int)
-
-@_silgen_name("_NSWriteDataToFile_Swift")
-internal func _NSWriteDataToFile_Swift(url: NSURL, data: NSData, options: UInt, error: NSErrorPointer) -> Bool
+@_silgen_name("__NSDataWriteToURL")
+internal func __NSDataWriteToURL(_ data: NSData, _ url: NSURL, _ options: UInt, _ error: NSErrorPointer) -> Bool
 
 #endif
 
@@ -882,11 +875,11 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
 #else
             switch self {
             case .virtualMemory:
-                return { __NSDataInvokeDeallocatorVM($0, $1) }
+                return { NSDataDeallocatorVM($0, UInt($1)) }
             case .unmap:
-                return { __NSDataInvokeDeallocatorUnmap($0, $1) }
+                return { NSDataDeallocatorUnmap($0, UInt($1)) }
             case .free:
-                return { __NSDataInvokeDeallocatorFree($0, $1) }
+                return { NSDataDeallocatorFree($0, UInt($1)) }
             case .none:
                 return { _, _ in }
             case .custom(let b):
@@ -1206,10 +1199,8 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
             try $0.write(to: url, options: WritingOptions(rawValue: options.rawValue))
 #else
             if _shouldUseNonAtomicWriteReimplementation(options: options) {
-                var error : NSError?
-                if !_NSWriteDataToFile_Swift(url: url._bridgeToObjectiveC(), data: $0, options: options.rawValue, error: &error) {
-                    throw error!
-                }
+                var error: NSError? = nil
+                guard __NSDataWriteToURL($0, url as NSURL, options.rawValue, &error) else { throw error! }
             } else {
                 try $0.write(to: url, options: WritingOptions(rawValue: options.rawValue))
             }

stdlib/public/SDK/Foundation/DataThunks.m

@@ -15,28 +15,6 @@
 
 #include "swift/Runtime/Config.h"
 
-typedef void (^NSDataDeallocator)(void *, NSUInteger);
-extern const NSDataDeallocator NSDataDeallocatorVM;
-extern const NSDataDeallocator NSDataDeallocatorUnmap;
-extern const NSDataDeallocator NSDataDeallocatorFree;
-extern const NSDataDeallocator NSDataDeallocatorNone;
-
-SWIFT_CC(swift)
-void __NSDataInvokeDeallocatorVM(void *mem, NSUInteger length) {
-  NSDataDeallocatorVM(mem, length);
-}
-
-SWIFT_CC(swift)
-void __NSDataInvokeDeallocatorUnmap(void *mem, NSUInteger length) {
-  NSDataDeallocatorUnmap(mem, length);
-}
-
-SWIFT_CC(swift)
-void __NSDataInvokeDeallocatorFree(void *mem, NSUInteger length) {
-  NSDataDeallocatorFree(mem, length);
-}
-
-
 #if TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
 static int __NSFileProtectionClassForOptions(NSUInteger options) {
     int result;
@@ -94,11 +72,47 @@ static NSInteger _NSWriteToFileDescriptor(int32_t fd, const void *buffer, NSUInt
     return length - numBytesRemaining;
 }
 
-extern NSError *_NSErrorWithFilePath(NSInteger code, id pathOrURL);
-extern NSError *_NSErrorWithFilePathAndErrno(NSInteger posixErrno, id pathOrURL, BOOL reading);
+static NSError *_NSErrorWithFilePath(NSInteger code, id pathOrURL) {
+    NSString *key = [pathOrURL isKindOfClass:[NSURL self]] ? NSURLErrorKey : NSFilePathErrorKey;
+    return [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:[NSDictionary dictionaryWithObjectsAndKeys:pathOrURL, key, nil]];
+}
+
+static NSError *_NSErrorWithFilePathAndErrno(NSInteger posixErrno, id pathOrURL, BOOL reading) {
+    NSInteger code;
+    if (reading) {
+        switch (posixErrno) {
+            case EFBIG:          code = NSFileReadTooLargeError; break;
+            case ENOENT:         code = NSFileReadNoSuchFileError; break;
+            case EPERM:          // fallthrough
+            case EACCES:         code = NSFileReadNoPermissionError; break;
+            case ENAMETOOLONG:   code = NSFileReadInvalidFileNameError; break;
+            default:             code = NSFileReadUnknownError; break;
+        }
+    } else {
+        switch (posixErrno) {
+            case ENOENT:         code = NSFileNoSuchFileError; break;
+            case EPERM:          // fallthrough
+            case EACCES:         code = NSFileWriteNoPermissionError; break;
+            case ENAMETOOLONG:   code = NSFileWriteInvalidFileNameError; break;
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
+            case EDQUOT:
+#endif
+            case ENOSPC:         code = NSFileWriteOutOfSpaceError; break;
+            case EROFS:          code = NSFileWriteVolumeReadOnlyError; break;
+            case EEXIST:         code = NSFileWriteFileExistsError; break;
+            default:             code = NSFileWriteUnknownError; break;
+        }
+    }
+    
+    NSString *key = [pathOrURL isKindOfClass:[NSURL self]] ? NSURLErrorKey : NSFilePathErrorKey;
+    NSDictionary *userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:pathOrURL, key, [NSError errorWithDomain:NSPOSIXErrorDomain code:posixErrno userInfo:nil], NSUnderlyingErrorKey, nil];
+    NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:userInfo];
+    [userInfo release];
+    return error;
+}
 
 SWIFT_CC(swift)
-BOOL _NSWriteDataToFile_Swift(NSURL * NS_RELEASES_ARGUMENT url, NSData * NS_RELEASES_ARGUMENT data, NSDataWritingOptions writingOptions, NSError **errorPtr) {
+BOOL __NSDataWriteToURL(NSData *NS_RELEASES_ARGUMENT data, NSURL *NS_RELEASES_ARGUMENT url, NSDataWritingOptions writingOptions, NSError **_Nullable errorPtr) {
     assert((writingOptions & NSDataWritingAtomic) == 0);
 
     NSString *path = url.path;

stdlib/public/SDK/Foundation/Date.swift

@@ -12,6 +12,7 @@
 
 @_exported import Foundation // Clang module
 import CoreFoundation
+import _SwiftCoreFoundationOverlayShims
 
 /**
  `Date` represents a single point in time.

stdlib/public/SDK/Foundation/DateInterval.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @_exported import Foundation // Clang module
+import _SwiftCoreFoundationOverlayShims
 
 /// DateInterval represents a closed date interval in the form of [startDate, endDate].  It is possible for the start and end dates to be the same with a duration of 0.  DateInterval does not support reverse intervals i.e. intervals where the duration is less than 0 and the end date occurs earlier in time than the start date.
 @available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)

stdlib/public/SDK/Foundation/Decimal.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @_exported import Foundation // Clang module
+import _SwiftCoreFoundationOverlayShims
 
 extension Decimal {
     public typealias RoundingMode = NSDecimalNumber.RoundingMode

stdlib/public/SDK/Foundation/FileManager.swift

@@ -11,23 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @_exported import Foundation // Clang module
-
-@_silgen_name("NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options")
-internal func NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(
-    _ self_: AnyObject,
-    _ originalItemURL: AnyObject,
-    _ newItemURL: AnyObject,
-    _ backupItemName: NSString?,
-    _ options: FileManager.ItemReplacementOptions,
-    _ error: NSErrorPointer) -> NSURL?
-
-@_silgen_name("NS_Swift_NSFileManager_enumeratorAt_includingPropertiesForKeys_options_errorHandler")
-internal func NS_Swift_NSFileManager_enumeratorAt_includingPropertiesForKeys_options_errorHandler(
-    _ self_ : AnyObject,
-    _ url: AnyObject,
-    _ keys: NSArray?,
-    _ options: FileManager.DirectoryEnumerationOptions,
-    _ errorHandler: @escaping @convention(block) (NSURL, NSError) -> Bool) -> FileManager.DirectoryEnumerator?
+import _SwiftFoundationOverlayShims
 
 extension FileManager {
     /*
@@ -37,31 +21,35 @@ extension FileManager {
 
     @available(*, deprecated, renamed:"replaceItemAt(_:withItemAt:backupItemName:options:)")
     public func replaceItemAtURL(originalItemURL: NSURL, withItemAtURL newItemURL: NSURL, backupItemName: String? = nil, options: FileManager.ItemReplacementOptions = []) throws -> NSURL? {
-        var error: NSError?
-        if let result = NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(self, originalItemURL, newItemURL, backupItemName as NSString?, options, &error) {
-            return result
-        }
-        throw error!
+        var error: NSError? = nil
+        guard let result = __NSFileManagerReplaceItemAtURL(self, originalItemURL as URL, newItemURL as URL, backupItemName, options, &error) else { throw error! }
+        return result as NSURL
     }
 
+    @available(swift, obsoleted: 4)
     @available(OSX 10.6, iOS 4.0, *)
     public func replaceItemAt(_ originalItemURL: URL, withItemAt newItemURL: URL, backupItemName: String? = nil, options: FileManager.ItemReplacementOptions = []) throws -> NSURL? {
         var error: NSError?
-        if let result = NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(self, originalItemURL as NSURL, newItemURL as NSURL, backupItemName as NSString?, options, &error) {
-            return result
-        }
-        throw error!
+        guard let result = __NSFileManagerReplaceItemAtURL(self, originalItemURL, newItemURL , backupItemName, options, &error) else { throw error! }
+        return result as NSURL
     }
 
+    @available(swift, introduced: 4)
+    @available(OSX 10.6, iOS 4.0, *)
+    public func replaceItemAt(_ originalItemURL: URL, withItemAt newItemURL: URL, backupItemName: String? = nil, options: FileManager.ItemReplacementOptions = []) throws -> URL? {
+        var error: NSError?
+        guard let result = __NSFileManagerReplaceItemAtURL(self, originalItemURL, newItemURL , backupItemName, options, &error) else { throw error! }
+        return result
+    }
+
     @available(OSX 10.6, iOS 4.0, *)
     public func enumerator(at url: URL, includingPropertiesForKeys keys: [URLResourceKey]?, options mask: FileManager.DirectoryEnumerationOptions = [], errorHandler handler: ((URL, Error) -> Bool)? = nil) -> FileManager.DirectoryEnumerator? {
-        return NS_Swift_NSFileManager_enumeratorAt_includingPropertiesForKeys_options_errorHandler(self, url as NSURL, keys as NSArray?, mask, { (url, error) in
+        return __NSFileManagerEnumeratorAtURL(self, url, keys, mask, { (url, error) in
             var errorResult = true
             if let h = handler {
                 errorResult = h(url as URL, error)
             }
             return errorResult
         })
     }
-
 }