Merge pull request #1572 from millenomi/LinuxAsBridging-4.2

[4.2] Adopt ‘as’ bridging on Linux

Author: millenomi

Foundation/AffineTransform.swift

@@ -476,7 +476,7 @@ open class NSAffineTransform : NSObject, NSCopying, NSSecureCoding {
     }
 }
 
-extension AffineTransform : _ObjectTypeBridgeable {
+extension AffineTransform : _ObjectiveCBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {
         return true
     }

Foundation/Array.swift

@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-extension Array : _ObjectTypeBridgeable {
+extension Array : _ObjectiveCBridgeable {
 
     public typealias _ObjectType = NSArray
     public func _bridgeToObjectiveC() -> _ObjectType {

Foundation/Bridging.swift

@@ -12,29 +12,10 @@
 
 import CoreFoundation
 
-// Support protocols for casting
-public protocol _ObjectBridgeable {
-    func _bridgeToAnyObject() -> AnyObject
-}
-
 public protocol _StructBridgeable {
     func _bridgeToAny() -> Any
 }
 
-/// - Note: This is a similar interface to the _ObjectiveCBridgeable protocol
-public protocol _ObjectTypeBridgeable : _ObjectBridgeable {
-    associatedtype _ObjectType : AnyObject
-    
-    func _bridgeToObjectiveC() -> _ObjectType
-    
-    static func _forceBridgeFromObjectiveC(_ source: _ObjectType, result: inout Self?)
-    
-    @discardableResult
-    static func _conditionallyBridgeFromObjectiveC(_ source: _ObjectType, result: inout Self?) -> Bool
-    
-    static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectType?) -> Self
-}
-
 /// - Note: This does not exist currently on Darwin but it is the inverse correlation to the bridge types such that a 
 /// reference type can be converted via a callout to a conversion method.
 public protocol _StructTypeBridgeable : _StructBridgeable {
@@ -44,7 +25,7 @@ public protocol _StructTypeBridgeable : _StructBridgeable {
 }
 
 // Default adoption of the type specific variants to the Any variant
-extension _ObjectTypeBridgeable {
+extension _ObjectiveCBridgeable {
     public func _bridgeToAnyObject() -> AnyObject {
         return _bridgeToObjectiveC()
     }
@@ -74,8 +55,8 @@ internal protocol _NSBridgeable {
 
 
 /// - Note: This is an internal boxing value for containing abstract structures
-internal final class _SwiftValue : NSObject, NSCopying {
-    internal private(set) var value: Any
+internal final class _SwiftValue : NSObject, NSCopying, _NSSwiftValue {
+    public private(set) var value: Any
 
     static func fetch(_ object: AnyObject?) -> Any? {
         if let obj = object {
@@ -108,10 +89,8 @@ internal final class _SwiftValue : NSObject, NSCopying {
     static func store(_ value: Any) -> NSObject {
         if let val = value as? NSObject {
             return val
-        } else if let val = value as? _ObjectBridgeable {
-            return val._bridgeToAnyObject() as! NSObject
         } else {
-            return _SwiftValue(value)
+            return (value as AnyObject) as! NSObject
         }
     }
 
@@ -144,4 +123,6 @@ internal final class _SwiftValue : NSObject, NSCopying {
     public func copy(with zone: NSZone?) -> Any {
         return _SwiftValue(value)
     }
+    
+    public static let null: AnyObject = NSNull()
 }

Foundation/Calendar.swift

@@ -1163,7 +1163,7 @@ extension Calendar : CustomDebugStringConvertible, CustomStringConvertible, Cust
     }
 }
 
-extension Calendar: _ObjectTypeBridgeable {
+extension Calendar: _ObjectiveCBridgeable {
     public typealias _ObjectType = NSCalendar
 
     @_semantics("convertToObjectiveC")

Foundation/CharacterSet.swift

@@ -481,7 +481,7 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
 
 
 // MARK: Objective-C Bridging
-extension CharacterSet : _ObjectTypeBridgeable {
+extension CharacterSet : _ObjectiveCBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {
         return true
     }

Foundation/Data.swift

@@ -1893,13 +1893,7 @@ extension Data {
 
 /// Provides bridging functionality for struct Data to class NSData and vice-versa.
 
-#if DEPLOYMENT_RUNTIME_SWIFT
-internal typealias DataBridgeType = _ObjectTypeBridgeable
-#else
-internal typealias DataBridgeType = _ObjectiveCBridgeable
-#endif
-
-extension Data : DataBridgeType {
+extension Data : _ObjectiveCBridgeable {
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSData {
         return _backing.bridgedReference(_sliceRange)

Foundation/Date.swift

@@ -230,7 +230,7 @@ extension Date : CustomDebugStringConvertible, CustomStringConvertible, CustomRe
     }
 }
 
-extension Date : _ObjectTypeBridgeable {
+extension Date : _ObjectiveCBridgeable {
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSDate {
         return NSDate(timeIntervalSinceReferenceDate: _time)

Foundation/DateComponents.swift

@@ -352,7 +352,7 @@ extension DateComponents : CustomStringConvertible, CustomDebugStringConvertible
 
 // MARK: - Bridging
 
-extension DateComponents : _ObjectTypeBridgeable {
+extension DateComponents : _ObjectiveCBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {
         return true
     }

Foundation/DateInterval.swift

@@ -187,7 +187,7 @@ extension DateInterval : CustomStringConvertible, CustomDebugStringConvertible,
     }
 }
 
-extension DateInterval : _ObjectTypeBridgeable {
+extension DateInterval : _ObjectiveCBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {
         return true
     }

Foundation/Dictionary.swift

@@ -9,7 +9,7 @@
 
 import CoreFoundation
 
-extension Dictionary : _ObjectTypeBridgeable {
+extension Dictionary : _ObjectiveCBridgeable {
 
     public typealias _ObjectType = NSDictionary
     public func _bridgeToObjectiveC() -> _ObjectType {