[stdlib] Update stdlib to 4.0 and reorganize compatibility shims (#17580)

* Update stdlib to 4.0 and move all compatibility shims into a dedicated source file

Author: airspeedswift

cmake/modules/SwiftSource.cmake

@@ -257,9 +257,9 @@ function(_compile_swift_files
                             "-Xfrontend" "${GROUP_INFO_JSON_FILE}")
   endif()
 
-  # Force swift 3 compatibility mode for Standard Library.
+  # Force swift 4 compatibility mode for Standard Library.
   if (SWIFTFILE_IS_STDLIB)
-    list(APPEND swift_flags "-swift-version" "3")
+    list(APPEND swift_flags "-swift-version" "4")
   endif()
 
   # Force swift 4 compatibility mode for overlays.

stdlib/private/StdlibUnittest/MinimalTypes.swift

@@ -220,7 +220,7 @@ public var GenericMinimalHashableValue_equalImpl =
     fatalError("GenericMinimalHashableValue_equalImpl is not set yet")
   })
 public var GenericMinimalHashableValue_hashIntoImpl =
-  ResettableValue<(Any, inout Hasher) -> Void>({ _ in
+  ResettableValue<(Any, inout Hasher) -> Void>({ (_,_) in
     fatalError("GenericMinimalHashableValue_hashIntoImpl is not set yet")
   })
 
@@ -276,7 +276,7 @@ public var GenericMinimalHashableClass_equalImpl =
     fatalError("GenericMinimalHashableClass_equalImpl is not set yet")
   })
 public var GenericMinimalHashableClass_hashIntoImpl =
-  ResettableValue<(Any, inout Hasher) -> Void>({ _ in
+  ResettableValue<(Any, inout Hasher) -> Void>({ (_,_) in
     fatalError("GenericMinimalHashableClass_hashIntoImpl is not set yet")
   })
 

stdlib/private/StdlibUnittest/StdlibUnittest.swift

@@ -1775,15 +1775,15 @@ public func _parseDottedVersionTriple(_ s: String) -> (Int, Int, Int) {
 }
 
 func _getOSVersion() -> OSVersion {
-#if os(iOS) && (arch(i386) || arch(x86_64))
+#if os(iOS) && targetEnvironment(simulator)
   // On simulator, the plist file that we try to read turns out to be host's
   // plist file, which indicates OS X.
   //
   // FIXME: how to get the simulator version *without* UIKit?
   return .iOSSimulator
-#elseif os(tvOS) && (arch(i386) || arch(x86_64))
+#elseif os(tvOS) && targetEnvironment(simulator)
   return .tvOSSimulator
-#elseif os(watchOS) && (arch(i386) || arch(x86_64))
+#elseif os(watchOS) && targetEnvironment(simulator)
   return .watchOSSimulator
 #elseif os(Linux)
   return .linux

stdlib/public/SDK/AppKit/AppKit.swift

@@ -13,7 +13,7 @@
 import Foundation
 @_exported import AppKit
 
-extension NSCursor : _DefaultCustomPlaygroundQuickLookable {
+extension NSCursor : __DefaultCustomPlaygroundQuickLookable {
   @available(*, deprecated, message: "NSCursor._defaultCustomPlaygroundQuickLook will be removed in a future Swift version")
   public var _defaultCustomPlaygroundQuickLook: PlaygroundQuickLook {
     return .image(image)
@@ -24,7 +24,7 @@ internal struct _NSViewQuickLookState {
   static var views = Set<NSView>()
 }
 
-extension NSView : _DefaultCustomPlaygroundQuickLookable {
+extension NSView : __DefaultCustomPlaygroundQuickLookable {
   @available(*, deprecated, message: "NSView._defaultCustomPlaygroundQuickLook will be removed in a future Swift version")
   public var _defaultCustomPlaygroundQuickLook: PlaygroundQuickLook {
     // if you set NSView.needsDisplay, you can get yourself in a recursive scenario where the same view

stdlib/public/SDK/CoreGraphics/CoreGraphics.swift

@@ -228,11 +228,13 @@ public extension CGPoint {
   }
 }
 
-extension CGPoint : CustomReflectable, CustomPlaygroundQuickLookable {
+extension CGPoint : CustomReflectable {
   public var customMirror: Mirror {
     return Mirror(self, children: ["x": x, "y": y], displayStyle: .`struct`)
   }
+}
 
+extension CGPoint : _CustomPlaygroundQuickLookable {
   @available(*, deprecated, message: "CGPoint.customPlaygroundQuickLook will be removed in a future Swift version")
   public var customPlaygroundQuickLook: PlaygroundQuickLook {
     return .point(Double(x), Double(y))
@@ -293,14 +295,16 @@ public extension CGSize {
   }
 }
 
-extension CGSize : CustomReflectable, CustomPlaygroundQuickLookable {
+extension CGSize : CustomReflectable {
   public var customMirror: Mirror {
     return Mirror(
       self,
       children: ["width": width, "height": height],
       displayStyle: .`struct`)
   }
+}
 
+extension CGSize : _CustomPlaygroundQuickLookable {
   @available(*, deprecated, message: "CGSize.customPlaygroundQuickLook will be removed in a future Swift version")
   public var customPlaygroundQuickLook: PlaygroundQuickLook {
     return .size(Double(width), Double(height))
@@ -431,14 +435,16 @@ public extension CGRect {
   public var y: CGFloat { return minY }
 }
 
-extension CGRect : CustomReflectable, CustomPlaygroundQuickLookable {
+extension CGRect : CustomReflectable {
   public var customMirror: Mirror {
     return Mirror(
       self,
       children: ["origin": origin, "size": size],
       displayStyle: .`struct`)
   }
+}
 
+extension CGRect : _CustomPlaygroundQuickLookable {
   @available(*, deprecated, message: "CGRect.customPlaygroundQuickLook will be removed in a future Swift version")
   public var customPlaygroundQuickLook: PlaygroundQuickLook {
     return .rectangle(

stdlib/public/SDK/Foundation/Date.swift

@@ -272,7 +272,7 @@ extension NSDate : _HasCustomAnyHashableRepresentation {
     }
 }
 
-extension Date : CustomPlaygroundQuickLookable {
+extension Date : _CustomPlaygroundQuickLookable {
     var summary: String {
         let df = DateFormatter()
         df.dateStyle = .medium

stdlib/public/SDK/Foundation/NSCoder.swift

@@ -172,7 +172,7 @@ extension NSKeyedUnarchiver {
   @available(macOS 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *)
   public static func unarchivedObject<DecodedObjectType>(ofClass cls: DecodedObjectType.Type, from data: Data) throws -> DecodedObjectType? where DecodedObjectType : NSCoding, DecodedObjectType : NSObject {
     var error: NSError?
-    let result = __NSKeyedUnarchiverSecureUnarchiveObjectOfClass(cls as! AnyClass, data, &error)
+    let result = __NSKeyedUnarchiverSecureUnarchiveObjectOfClass(cls as AnyClass, data, &error)
     try resolveError(error)
     return result as? DecodedObjectType
   }

stdlib/public/SDK/Foundation/NSDate.swift

@@ -12,7 +12,7 @@
 
 @_exported import Foundation // Clang module
 
-extension NSDate : CustomPlaygroundQuickLookable {
+extension NSDate : _CustomPlaygroundQuickLookable {
   @nonobjc
   var summary: String {
     let df = DateFormatter()

stdlib/public/SDK/Foundation/NSRange.swift

@@ -197,7 +197,7 @@ extension NSRange : CustomReflectable {
     }
 }
 
-extension NSRange : CustomPlaygroundQuickLookable {
+extension NSRange : _CustomPlaygroundQuickLookable {
     @available(*, deprecated, message: "NSRange.customPlaygroundQuickLook will be removed in a future Swift version")
     public var customPlaygroundQuickLook: PlaygroundQuickLook {
         return .range(Int64(location), Int64(length))

stdlib/public/SDK/Foundation/NSString.swift

@@ -107,7 +107,7 @@ extension NSString {
   }
 }
 
-extension NSString : CustomPlaygroundQuickLookable {
+extension NSString : _CustomPlaygroundQuickLookable {
   @available(*, deprecated, message: "NSString.customPlaygroundQuickLook will be removed in a future Swift version")
   public var customPlaygroundQuickLook: PlaygroundQuickLook {
     return .text(self as String)