---

yaml
---
r: 243170
b: refs/heads/swift-5.0-branch
c: 18ad793
h: refs/heads/master

Author: lorentey

[refs]

@@ -643,7 +643,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b7c074342459a645779f106c42bf4
 refs/heads/master-llvm-swift5-transition: 8ace18c8953afb3d7d94cf04cacc0b51a7e5f1e3
 "refs/heads/revert-12883-disable_modelio_test_ios": a77ae373b809a0d8cb460cf3d1585d618510d242
 refs/heads/revert-13597-master: cccee1df039d072215f9bddc2cbc1e32a8d5d5ee
-refs/heads/swift-5.0-branch: 546c829491cb939a677c9c24edd12d82062a1904
+refs/heads/swift-5.0-branch: 18ad79378f60108192a07ad3e7885ff6779c42ec
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b32214f7e04339dfada623b6b76dbebfb41e4541
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-24-a: 1eb0be506c0744c7eff0550a10240286046e181d
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-25-a: f35a91502bad0065c83d8760407c23be7b899f48

branches/swift-5.0-branch/stdlib/public/core/Dictionary.swift

@@ -1499,7 +1499,7 @@ extension Dictionary: Equatable where Value: Equatable {
 
   #if _runtime(_ObjC)
     case (.cocoa(let lhsCocoa), .cocoa(let rhsCocoa)):
-      return _stdlib_NSObject_isEqual(lhsCocoa.object, rhsCocoa.object)
+      return lhsCocoa == rhsCocoa
 
     case (.native(let lhsNative), .cocoa(let rhsCocoa)):
 
@@ -3057,7 +3057,7 @@ internal struct _CocoaDictionary: _DictionaryBuffer {
     i = i.successor()
   }
 
-  @inlinable // FIXME(sil-serialize-all)
+  @usableFromInline
   internal func index(forKey key: Key) -> Index? {
     // Fast path that does not involve creating an array of all keys.  In case
     // the key is present, this lookup is a penalty for the slow path, but the
@@ -3135,6 +3135,16 @@ internal struct _CocoaDictionary: _DictionaryBuffer {
     return result
   }
 }
+
+extension _CocoaDictionary: Equatable {
+  @usableFromInline
+  internal static func ==(
+    lhs: _CocoaDictionary,
+    rhs: _CocoaDictionary
+  ) -> Bool {
+    return _stdlib_NSObject_isEqual(lhs.object, rhs.object)
+  }
+}
 #endif
 
 extension Dictionary {

branches/swift-5.0-branch/stdlib/public/core/Hashing.swift

@@ -14,6 +14,8 @@
 // This file implements helpers for hashing collections.
 //
 
+import SwiftShims
+
 /// The inverse of the default hash table load factor.  Factored out so that it
 /// can be used in multiple places in the implementation and stay consistent.
 /// Should not be used outside `Dictionary` implementation.
@@ -27,8 +29,6 @@ internal var _hashContainerDefaultMaxLoadFactorInverse: Double {
 ///
 /// This function is part of the runtime because `Bool` type is bridged to
 /// `ObjCBool`, which is in Foundation overlay.
-/// FIXME(sil-serialize-all): this should be internal
-@usableFromInline // FIXME(sil-serialize-all)
 @_silgen_name("swift_stdlib_NSObject_isEqual")
 internal func _stdlib_NSObject_isEqual(_ lhs: AnyObject, _ rhs: AnyObject) -> Bool
 #endif

branches/swift-5.0-branch/stdlib/public/core/Set.swift

@@ -429,7 +429,7 @@ extension Set: Equatable {
 
   #if _runtime(_ObjC)
     case (.cocoa(let lhsCocoa), .cocoa(let rhsCocoa)):
-      return _stdlib_NSObject_isEqual(lhsCocoa.object, rhsCocoa.object)
+      return lhsCocoa == rhsCocoa
 
     case (.native(let lhsNative), .cocoa(let rhsCocoa)):
       if lhsNative.count != rhsCocoa.count {
@@ -2431,6 +2431,18 @@ internal struct _CocoaSet {
   internal init(_ object: _NSSet) {
     self.object = object
   }
+}
+
+extension _CocoaSet: Equatable {
+  @usableFromInline
+  internal static func ==(lhs: _CocoaSet, rhs: _CocoaSet) -> Bool {
+    return _stdlib_NSObject_isEqual(lhs.object, rhs.object)
+  }
+}
+
+extension _CocoaSet: _SetBuffer {
+  @usableFromInline
+  internal typealias Element = AnyObject
 
   @inlinable
   internal var startIndex: Index {
@@ -2453,7 +2465,7 @@ internal struct _CocoaSet {
     i = i.successor()
   }
 
-  @inlinable
+  @usableFromInline
   internal func index(forKey key: AnyObject) -> Index? {
     // Fast path that does not involve creating an array of all keys.  In case
     // the key is present, this lookup is a penalty for the slow path, but the
@@ -2486,7 +2498,7 @@ internal struct _CocoaSet {
     return object.member(element) != nil
   }
 
-  @inlinable // FIXME(sil-serialize-all)
+  @usableFromInline
   internal func assertingGet(at i: Index) -> AnyObject {
     let value: AnyObject? = i.allKeys[i.currentKeyIndex]
     _sanityCheck(value != nil, "Item not found in underlying NSSet")