Id to any (swiftlang#555)

* Migrate collection classes and assocated APIs from id to Any with a boxing storage.

Convert NSArray, NSDictionary, and NSSet for AnyObject to Any.
Remove the `.bridge()` function!
Re-work the tests to no longer need `.bridge()` calls. This is over 400 unique places where `.bridge()` was removed.
Bring in a number of NSString APIs for String since it helps avoid calls to `.bridge()`.

* Fix broken tests and correct a few missing value conversions

* remove _expensivePropertyListConversion since we now have a better tool for the job: _SwiftValue.fetch

* Move _SwiftValue into Bridging

* remove @convention(c) from closures that take Any since it invokes _ObjectiveCBridgeable

* Remove String AUMP reference

* Notification object is stored as Any

* compare the other box’s unboxed value to the unboxed value (not to the container)

* NSCFDictionary should store and fetch keys and values before sending to CF

* NSProcessInfo environment fetch needs to access keys and values as String not NSString

Author: phausler

Foundation.xcodeproj/project.pbxproj

@@ -220,7 +220,7 @@
 		5B7C8B021BEA830200C5B690 /* CFBurstTrie.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B5D89341BBDA76300234F36 /* CFBurstTrie.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		5B7C8B031BEA86A900C5B690 /* libCoreFoundation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B7C8A6E1BEA7F8F00C5B690 /* libCoreFoundation.a */; };
 		5B8BA1621D0B773A00938C27 /* IndexSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B8BA1611D0B773A00938C27 /* IndexSet.swift */; };
-		5B94E8821C430DE70055C035 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B94E8811C430DE70055C035 /* String.swift */; };
+		5B94E8821C430DE70055C035 /* NSStringAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B94E8811C430DE70055C035 /* NSStringAPI.swift */; };
 		5BA9BEA41CF380E8009DBD6C /* URLRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA9BEA31CF380E8009DBD6C /* URLRequest.swift */; };
 		5BA9BEA61CF3D747009DBD6C /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA9BEA51CF3D747009DBD6C /* Data.swift */; };
 		5BA9BEA81CF3E7E7009DBD6C /* CharacterSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA9BEA71CF3E7E7009DBD6C /* CharacterSet.swift */; };
@@ -230,6 +230,11 @@
 		5BC46D541D05D6D900005853 /* DateInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC46D531D05D6D900005853 /* DateInterval.swift */; };
 		5BCCA8D91CE6697F0059B963 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BCCA8D81CE6697F0059B963 /* URLComponents.swift */; };
 		5BCD03821D3EE35C00E3FF9B /* TimeZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BCD03811D3EE35C00E3FF9B /* TimeZone.swift */; };
+		5BD31D201D5CE8C400563814 /* Bridging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD31D1F1D5CE8C400563814 /* Bridging.swift */; };
+		5BD31D221D5CEBA800563814 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD31D211D5CEBA800563814 /* String.swift */; };
+		5BD31D241D5CECC400563814 /* Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD31D231D5CECC400563814 /* Array.swift */; };
+		5BD31D3F1D5D19D600563814 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD31D3E1D5D19D600563814 /* Dictionary.swift */; };
+		5BD31D411D5D1BC300563814 /* Set.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD31D401D5D1BC300563814 /* Set.swift */; };
 		5BD70FB21D3D4CDC003B9BF8 /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD70FB11D3D4CDC003B9BF8 /* Locale.swift */; };
 		5BD70FB41D3D4F8B003B9BF8 /* Calendar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD70FB31D3D4F8B003B9BF8 /* Calendar.swift */; };
 		5BDC3FCA1BCF176100ED97BB /* NSCFArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BDC3FC91BCF176100ED97BB /* NSCFArray.swift */; };
@@ -613,7 +618,7 @@
 		5B6F17961C48631C00935030 /* TestUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestUtils.swift; sourceTree = "<group>"; };
 		5B7C8A6E1BEA7F8F00C5B690 /* libCoreFoundation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCoreFoundation.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		5B8BA1611D0B773A00938C27 /* IndexSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndexSet.swift; sourceTree = "<group>"; };
-		5B94E8811C430DE70055C035 /* String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
+		5B94E8811C430DE70055C035 /* NSStringAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSStringAPI.swift; sourceTree = "<group>"; };
 		5BA9BEA31CF380E8009DBD6C /* URLRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLRequest.swift; sourceTree = "<group>"; };
 		5BA9BEA51CF3D747009DBD6C /* Data.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
 		5BA9BEA71CF3E7E7009DBD6C /* CharacterSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterSet.swift; sourceTree = "<group>"; };
@@ -623,6 +628,11 @@
 		5BC46D531D05D6D900005853 /* DateInterval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateInterval.swift; sourceTree = "<group>"; };
 		5BCCA8D81CE6697F0059B963 /* URLComponents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLComponents.swift; sourceTree = "<group>"; };
 		5BCD03811D3EE35C00E3FF9B /* TimeZone.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeZone.swift; sourceTree = "<group>"; };
+		5BD31D1F1D5CE8C400563814 /* Bridging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bridging.swift; sourceTree = "<group>"; };
+		5BD31D211D5CEBA800563814 /* String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
+		5BD31D231D5CECC400563814 /* Array.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Array.swift; sourceTree = "<group>"; };
+		5BD31D3E1D5D19D600563814 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = "<group>"; };
+		5BD31D401D5D1BC300563814 /* Set.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Set.swift; sourceTree = "<group>"; };
 		5BD70FB11D3D4CDC003B9BF8 /* Locale.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locale.swift; sourceTree = "<group>"; };
 		5BD70FB31D3D4F8B003B9BF8 /* Calendar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Calendar.swift; sourceTree = "<group>"; };
 		5BDC3F191BCC440100ED97BB /* CFICULogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFICULogging.h; sourceTree = "<group>"; };
@@ -1446,6 +1456,7 @@
 				5BDC3F3F1BCC5DCB00ED97BB /* NSObject.swift */,
 				5BDC3F461BCC5DCB00ED97BB /* NSSwiftRuntime.swift */,
 				5B23AB861CE62D17000DB898 /* Boxing.swift */,
+				5BD31D1F1D5CE8C400563814 /* Bridging.swift */,
 				5B23AB881CE62D4D000DB898 /* ReferenceConvertible.swift */,
 			);
 			name = Runtime;
@@ -1461,9 +1472,12 @@
 				EADE0B621BD15DFF00C49C64 /* NSIndexPath.swift */,
 				5B424C751D0B6E5B007B39C8 /* IndexPath.swift */,
 				5BDC3F2E1BCC5DCB00ED97BB /* NSArray.swift */,
+				5BD31D231D5CECC400563814 /* Array.swift */,
 				5BDC3F361BCC5DCB00ED97BB /* NSDictionary.swift */,
+				5BD31D3E1D5D19D600563814 /* Dictionary.swift */,
 				5BDC3FCD1BCF17D300ED97BB /* NSCFDictionary.swift */,
 				5BDC3F441BCC5DCB00ED97BB /* NSSet.swift */,
+				5BD31D401D5D1BC300563814 /* Set.swift */,
 				5BDC3FCF1BCF17E600ED97BB /* NSCFSet.swift */,
 				EADE0B541BD15DFF00C49C64 /* NSCache.swift */,
 				EADE0B781BD15DFF00C49C64 /* NSSortDescriptor.swift */,
@@ -1496,7 +1510,8 @@
 				5BDC3F451BCC5DCB00ED97BB /* NSString.swift */,
 				5B40920F1D1B304C0022B067 /* NSStringEncodings.swift */,
 				5BDC3FCB1BCF177E00ED97BB /* NSCFString.swift */,
-				5B94E8811C430DE70055C035 /* String.swift */,
+				5B94E8811C430DE70055C035 /* NSStringAPI.swift */,
+				5BD31D211D5CEBA800563814 /* String.swift */,
 				5B4092111D1B30B40022B067 /* ExtraStringAPIs.swift */,
 			);
 			name = String;
@@ -1910,6 +1925,7 @@
 				5B23AB891CE62D4D000DB898 /* ReferenceConvertible.swift in Sources */,
 				D3E8D6D11C367AB600295652 /* NSSpecialValue.swift in Sources */,
 				EAB57B721BD1C7A5004AC5C5 /* NSPortMessage.swift in Sources */,
+				5BD31D201D5CE8C400563814 /* Bridging.swift in Sources */,
 				EADE0BBB1BD15E0000C49C64 /* NSURLAuthenticationChallenge.swift in Sources */,
 				EADE0BA11BD15DFF00C49C64 /* NSIndexSet.swift in Sources */,
 				5BF7AEA91BCD51F9008F214A /* NSDate.swift in Sources */,
@@ -1922,6 +1938,8 @@
 				5BD70FB21D3D4CDC003B9BF8 /* Locale.swift in Sources */,
 				EADE0BB71BD15E0000C49C64 /* NSStream.swift in Sources */,
 				5BF7AEBF1BCD51F9008F214A /* NSURL.swift in Sources */,
+				5BD31D411D5D1BC300563814 /* Set.swift in Sources */,
+				5BD31D241D5CECC400563814 /* Array.swift in Sources */,
 				5BF7AEBC1BCD51F9008F214A /* NSThread.swift in Sources */,
 				D31302011C30CEA900295652 /* NSConcreteValue.swift in Sources */,
 				5BF7AEA81BCD51F9008F214A /* NSData.swift in Sources */,
@@ -1942,7 +1960,8 @@
 				5BF7AEA51BCD51F9008F214A /* NSCalendar.swift in Sources */,
 				EADE0BB81BD15E0000C49C64 /* NSTask.swift in Sources */,
 				5BF7AEB31BCD51F9008F214A /* NSObjCRuntime.swift in Sources */,
-				5B94E8821C430DE70055C035 /* String.swift in Sources */,
+				5BD31D3F1D5D19D600563814 /* Dictionary.swift in Sources */,
+				5B94E8821C430DE70055C035 /* NSStringAPI.swift in Sources */,
 				5B0163BB1D024EB7003CCD96 /* DateComponents.swift in Sources */,
 				5BF7AEAB1BCD51F9008F214A /* NSDictionary.swift in Sources */,
 				EADE0BAA1BD15E0000C49C64 /* NSNumberFormatter.swift in Sources */,
@@ -1957,6 +1976,7 @@
 				EA418C261D57257D005EAD0D /* NSKeyedArchiverHelpers.swift in Sources */,
 				EADE0B981BD15DFF00C49C64 /* NSDecimalNumber.swift in Sources */,
 				5BA9BEA61CF3D747009DBD6C /* Data.swift in Sources */,
+				5BD31D221D5CEBA800563814 /* String.swift in Sources */,
 				5BF7AEA71BCD51F9008F214A /* NSCoder.swift in Sources */,
 				D3BCEBA01C2F6DDB00295652 /* NSKeyedCoderOldStyleArray.swift in Sources */,
 				5B8BA1621D0B773A00938C27 /* IndexSet.swift in Sources */,

Foundation/Array.swift

@@ -0,0 +1,47 @@
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+
+extension Array : _ObjectTypeBridgeable {
+    
+    public typealias _ObjectType = NSArray
+    public func _bridgeToObjectiveC() -> _ObjectType {
+        return NSArray(array: map { (element: Element) -> AnyObject in
+            return _SwiftValue.store(element)
+        })
+    }
+    
+    static public func _forceBridgeFromObjectiveC(_ source: _ObjectType, result: inout Array?) {
+        result = _unconditionallyBridgeFromObjectiveC(source)
+    }
+    
+    @discardableResult
+    static public func _conditionallyBridgeFromObjectiveC(_ source: _ObjectType, result: inout Array?) -> Bool {
+        var array = [Element]()
+        for value in source.allObjects {
+            if let v = value as? Element {
+                array.append(v)
+            } else {
+                return false
+            }
+        }
+        result = array
+        return true
+    }
+    
+    static public func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectType?) -> Array {
+        if let object = source {
+            var value: Array<Element>?
+            _conditionallyBridgeFromObjectiveC(object, result: &value)
+            return value!
+        } else {
+            return Array<Element>()
+        }
+    }
+}
+

Foundation/Bridging.swift

@@ -0,0 +1,143 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+// 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 corrilation to the bridge types such that a 
+/// reference type can be converted via a callout to a conversion method.
+public protocol _StructTypeBridgeable : _StructBridgeable {
+    associatedtype _StructType
+    
+    func _bridgeToSwift() -> _StructType
+}
+
+// Default adoption of the type specific variants to the Any variant
+extension _ObjectTypeBridgeable {
+    public func _bridgeToAnyObject() -> AnyObject {
+        return _bridgeToObjectiveC()
+    }
+}
+
+extension _StructTypeBridgeable {
+    public func _bridgeToAny() -> Any {
+        return _bridgeToSwift()
+    }
+}
+
+// slated for removal, these are the swift-corelibs-only variant of the _ObjectiveCBridgeable
+internal protocol _CFBridgable {
+    associatedtype CFType
+    var _cfObject: CFType { get }
+}
+
+internal protocol _SwiftBridgable {
+    associatedtype SwiftType
+    var _swiftObject: SwiftType { get }
+}
+
+internal protocol _NSBridgable {
+    associatedtype NSType
+    var _nsObject: NSType { get }
+}
+
+
+/// - Note: This is an internal boxing value for containing abstract structures
+internal final class _SwiftValue : NSObject, NSCopying {
+    internal private(set) var value: Any
+    
+    static func fetch(_ object: AnyObject?) -> Any? {
+        if let obj = object {
+            return fetch(obj)
+        }
+        return nil
+    }
+    
+    static func fetch(_ object: AnyObject) -> Any {
+        if let container = object as? _SwiftValue {
+            return container.value
+        } else if let val = object as? _StructBridgeable {
+            return val._bridgeToAny()
+        } else {
+            return object
+        }
+    }
+    
+    static func store(_ value: Any?) -> NSObject? {
+        if let val = value {
+            return store(val)
+        }
+        return nil
+    }
+    
+    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)
+        }
+    }
+    
+    init(_ value: Any) {
+        self.value = value
+    }
+    
+    override var hash: Int {
+        if let hashable = value as? AnyHashable {
+            return hashable.hashValue
+        }
+        return ObjectIdentifier(self).hashValue
+    }
+    
+    override func isEqual(_ object: AnyObject?) -> Bool {
+        guard let other = object else {
+            return false
+        }
+        if let box = other as? _SwiftValue {
+            if let otherHashable = box.value as? AnyHashable,
+                let hashable = value as? AnyHashable {
+                return hashable == otherHashable
+            }
+        }
+        if let otherHashable = other as? AnyHashable,
+            let hashable = value as? AnyHashable {
+            return hashable == otherHashable
+        }
+        return false
+    }
+    
+    public func copy(with zone: NSZone?) -> Any {
+        return _SwiftValue(value)
+    }
+}

Foundation/Calendar.swift

@@ -1127,7 +1127,7 @@ public func ==(lhs: Calendar, rhs: Calendar) -> Bool {
     }
 }
 
-extension Calendar {
+extension Calendar : _ObjectTypeBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {
         return true
     }

Foundation/CharacterSet.swift

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

Foundation/Data.swift

@@ -628,7 +628,7 @@ public func ==(d1 : Data, d2 : Data) -> Bool {
 }
 
 /// Provides bridging functionality for struct Data to class NSData and vice-versa.
-extension Data {
+extension Data : _ObjectTypeBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {
         return true
     }

Foundation/Date.swift

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

Foundation/DateComponents.swift

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

Foundation/DateInterval.swift

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