---

yaml
---
r: 349529
b: refs/heads/master-next
c: b497780
h: refs/heads/master
i:
  349527: 417081d

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: ff7d2c2503d070f32afd2a87cb42921fffcaa31c
+refs/heads/master-next: b4977801b812a81f36c0b6cfecb519f187f8f814
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/include/swift/Runtime/ObjCBridge.h

@@ -79,11 +79,6 @@ namespace swift {
 SWIFT_RUNTIME_EXPORT
 void swift_rootObjCDealloc(HeapObject *self);
 
-// Uses Swift bridging to box a C string into an NSString without introducing
-// a link-time dependency on NSString.
-SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
-id swift_stdlib_NSStringFromUTF8(const char *cstr, int len);
-
 }
 
 #endif // SWIFT_OBJC_INTEROP

branches/master-next/stdlib/public/core/BridgeObjectiveC.swift

@@ -85,22 +85,6 @@ public protocol _ObjectiveCBridgeable {
 
 #if _runtime(_ObjC)
 
-@_silgen_name("swift_stdlib_connectNSBaseClasses")
-internal func _connectNSBaseClasses() -> Bool
-
-
-private let _bridgeInitializedSuccessfully = _connectNSBaseClasses()
-internal var _orphanedFoundationSubclassesReparented: Bool = false
-
-/// Reparents the SwiftNativeNS*Base classes to be subclasses of their respective
-/// Foundation types, or is false if they couldn't be reparented. Must be run
-/// in order to bridge Swift Strings, Arrays, Dictionarys, Sets, or Enumerators to ObjC.
- internal func _connectOrphanedFoundationSubclassesIfNeeded() -> Void {
-  let bridgeWorks = _bridgeInitializedSuccessfully
-  _debugPrecondition(bridgeWorks)
-  _orphanedFoundationSubclassesReparented = true
-}
-
 //===--- Bridging for metatypes -------------------------------------------===//
 
 /// A stand-in for a value of metatype type.

branches/master-next/stdlib/public/core/CMakeLists.txt

@@ -229,6 +229,8 @@ set(swift_core_private_link_libraries)
 set(swift_stdlib_compile_flags "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}")
 if(SWIFT_PRIMARY_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
   list(APPEND swift_core_link_flags "-all_load")
+  list(APPEND swift_core_framework_depends Foundation)
+  list(APPEND swift_core_framework_depends CoreFoundation)
   list(APPEND swift_core_private_link_libraries icucore)
 else()
   # With the GNU linker the equivalent of -all_load is to tell the linker

branches/master-next/stdlib/public/core/ContiguousArrayBuffer.swift

@@ -417,27 +417,13 @@ internal struct _ContiguousArrayBuffer<Element>: _ArrayBufferProtocol {
   }
 
 #if _runtime(_ObjC)
-  
   /// Convert to an NSArray.
   ///
   /// - Precondition: `Element` is bridged to Objective-C.
   ///
   /// - Complexity: O(1).
-  @usableFromInline
+  @inlinable
   internal __consuming func _asCocoaArray() -> AnyObject {
-    // _asCocoaArray was @inlinable in Swift 5.0 and 5.1, which means that there
-    // are existing apps out there that effectively have the old implementation
-    // Be careful with future changes to this function. Here be dragons!
-    // The old implementation was
-    // if count == 0 {
-    //   return _emptyArrayStorage
-    // }
-    // if _isBridgedVerbatimToObjectiveC(Element.self) {
-    //   return _storage
-    // }
-    // return __SwiftDeferredNSArray(_nativeStorage: _storage)
-    
-    _connectOrphanedFoundationSubclassesIfNeeded()
     if count == 0 {
       return _emptyArrayStorage
     }

branches/master-next/stdlib/public/core/DictionaryBridging.swift

@@ -29,7 +29,6 @@ internal func _stdlib_NSDictionary_allKeys(
 extension _NativeDictionary { // Bridging
   @usableFromInline
   __consuming internal func bridged() -> AnyObject {
-    _connectOrphanedFoundationSubclassesIfNeeded()
     // We can zero-cost bridge if our keys are verbatim
     // or if we're the empty singleton.
 
@@ -68,7 +67,6 @@ final internal class _SwiftDictionaryNSEnumerator<Key: Hashable, Value>
 
   internal init(_ base: __owned _NativeDictionary<Key, Value>) {
     _internalInvariant(_isBridgedVerbatimToObjectiveC(Key.self))
-    _internalInvariant(_orphanedFoundationSubclassesReparented)
     self.base = base
     self.bridgedKeys = nil
     self.nextBucket = base.hashTable.startBucket
@@ -79,7 +77,6 @@ final internal class _SwiftDictionaryNSEnumerator<Key: Hashable, Value>
   @nonobjc
   internal init(_ deferred: __owned _SwiftDeferredNSDictionary<Key, Value>) {
     _internalInvariant(!_isBridgedVerbatimToObjectiveC(Key.self))
-    _internalInvariant(_orphanedFoundationSubclassesReparented)
     self.base = deferred.native
     self.bridgedKeys = deferred.bridgeKeys()
     self.nextBucket = base.hashTable.startBucket

branches/master-next/stdlib/public/core/Hashing.swift

@@ -76,10 +76,7 @@ internal struct _UnmanagedAnyObjectArray {
 // renamed. The old name must not be used in the new runtime.
 final internal class __SwiftEmptyNSEnumerator
   : __SwiftNativeNSEnumerator, _NSEnumerator {
-  internal override required init() {
-    super.init()
-    _internalInvariant(_orphanedFoundationSubclassesReparented)
-  }
+  internal override required init() { super.init() }
 
   @objc
   internal func nextObject() -> AnyObject? {

branches/master-next/stdlib/public/core/ReflectionMirror.swift

@@ -47,12 +47,10 @@ internal func getChild<T>(of value: T, type: Any.Type, index: Int) -> (label: St
 internal func _getQuickLookObject<T>(_: T) -> AnyObject?
 
 @_silgen_name("_swift_stdlib_NSObject_isKindOfClass")
-internal func _isImpl(_ object: AnyObject, kindOf: UnsafePointer<CChar>) -> Bool
+internal func _isImpl(_ object: AnyObject, kindOf: AnyObject) -> Bool
 
 internal func _is(_ object: AnyObject, kindOf `class`: String) -> Bool {
-  return `class`.withCString {
-    return _isImpl(object, kindOf: $0)
-  }
+  return _isImpl(object, kindOf: `class` as AnyObject)
 }
 
 internal func _getClassPlaygroundQuickLook(

branches/master-next/stdlib/public/core/SetBridging.swift

@@ -14,21 +14,24 @@
 
 import SwiftShims
 
+@_silgen_name("swift_stdlib_CFSetGetValues")
+internal
+func _stdlib_CFSetGetValues(
+  _ nss: AnyObject,
+  _: UnsafeMutablePointer<AnyObject>)
+
 /// Equivalent to `NSSet.allObjects`, but does not leave objects on the
 /// autorelease pool.
 internal func _stdlib_NSSet_allObjects(_ object: AnyObject) -> _BridgingBuffer {
   let nss = unsafeBitCast(object, to: _NSSet.self)
-  let count = nss.count
-  let storage = _BridgingBuffer(count)
-  nss.getObjects(storage.baseAddress, count: count)
+  let storage = _BridgingBuffer(nss.count)
+  _stdlib_CFSetGetValues(nss, storage.baseAddress)
   return storage
 }
 
 extension _NativeSet { // Bridging
   @usableFromInline
   internal __consuming func bridged() -> AnyObject {
-    _connectOrphanedFoundationSubclassesIfNeeded()
-    
     // We can zero-cost bridge if our keys are verbatim
     // or if we're the empty singleton.
 
@@ -67,7 +70,6 @@ final internal class _SwiftSetNSEnumerator<Element: Hashable>
 
   internal init(_ base: __owned _NativeSet<Element>) {
     _internalInvariant(_isBridgedVerbatimToObjectiveC(Element.self))
-    _internalInvariant(_orphanedFoundationSubclassesReparented)
     self.base = base
     self.bridgedElements = nil
     self.nextBucket = base.hashTable.startBucket
@@ -78,7 +80,6 @@ final internal class _SwiftSetNSEnumerator<Element: Hashable>
   @nonobjc
   internal init(_ deferred: __owned _SwiftDeferredNSSet<Element>) {
     _internalInvariant(!_isBridgedVerbatimToObjectiveC(Element.self))
-    _internalInvariant(_orphanedFoundationSubclassesReparented)
     self.base = deferred.native
     self.bridgedElements = deferred.bridgeElements()
     self.nextBucket = base.hashTable.startBucket

branches/master-next/stdlib/public/core/ShadowProtocols.swift

@@ -171,10 +171,6 @@ internal protocol _NSSetCore: _NSCopying, _NSFastEnumeration {
 /// supplies.
 @unsafe_no_objc_tagged_pointer @objc
 internal protocol _NSSet: _NSSetCore {
-  @objc(getObjects:count:) func getObjects(
-    _ buffer: UnsafeMutablePointer<AnyObject>,
-    count: Int
-  )
 }
 
 /// A shadow for the API of NSNumber we will use in the core

branches/master-next/stdlib/public/core/StringBridge.swift

@@ -442,9 +442,6 @@ extension String {
   @_effects(releasenone)
   public // SPI(Foundation)
   func _bridgeToObjectiveCImpl() -> AnyObject {
-    
-    _connectOrphanedFoundationSubclassesIfNeeded()
-    
     // Smol ASCII a) may bridge to tagged pointers, b) can't contain a BOM
     if _guts.isSmallASCII {
       let maybeTagged = _guts.asSmall.withUTF8 { bufPtr in
@@ -456,7 +453,6 @@ extension String {
       }
       if let tagged = maybeTagged { return tagged }
     }
-    
     if _guts.isSmall {
         // We can't form a tagged pointer String, so grow to a non-small String,
         // and bridge that instead. Also avoids CF deleting any BOM that may be
@@ -501,17 +497,6 @@ public func _getDescription<T>(_ x: T) -> AnyObject {
   return String(reflecting: x)._bridgeToObjectiveCImpl()
 }
 
-@_silgen_name("swift_stdlib_NSStringFromUTF8")
-@usableFromInline //this makes the symbol available to the runtime :(
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
-internal func _NSStringFromUTF8(_ s: UnsafePointer<UInt8>, _ len: Int)
-  -> AnyObject {
-  return String(
-    decoding: UnsafeBufferPointer(start: s, count: len),
-    as: UTF8.self
-  )._bridgeToObjectiveCImpl()
-}
-
 #else // !_runtime(_ObjC)
 
 internal class __SwiftNativeNSString {