Kill old set/dictionary-specific bridging entrypoints (swiftlang#18930)

Author: airspeedswift

stdlib/public/SDK/Foundation/NSDictionary.swift

@@ -121,7 +121,7 @@ extension Dictionary : _ObjectiveCBridgeable {
       return result != nil
     }
 
-    result = Swift._dictionaryBridgeFromObjectiveCConditional(anyDict)
+    result = anyDict as? Dictionary
     return result != nil
   }
 

stdlib/public/SDK/Foundation/NSSet.swift

@@ -107,7 +107,7 @@ extension Set : _ObjectiveCBridgeable {
       return result != nil
     }
 
-    result = Swift._setBridgeFromObjectiveCConditional(anySet)
+    result = anySet as? Set
     return result != nil
   }
 

stdlib/public/core/Dictionary.swift

@@ -1641,65 +1641,6 @@ public func _dictionaryUpCast<DerivedKey, DerivedValue, BaseKey, BaseValue>(
   return result
 }
 
-#if _runtime(_ObjC)
-
-/// Implements an unconditional upcast that involves bridging.
-///
-/// The cast can fail if bridging fails.
-///
-/// - Precondition: `SwiftKey` and `SwiftValue` are bridged to Objective-C,
-///   and at least one of them requires non-trivial bridging.
-@inline(never)
-public func _dictionaryBridgeToObjectiveC<
-  SwiftKey, SwiftValue, ObjCKey, ObjCValue
->(
-  _ source: Dictionary<SwiftKey, SwiftValue>
-) -> Dictionary<ObjCKey, ObjCValue> {
-
-  // Note: We force this function to stay in the swift dylib because
-  // it is not performance sensitive and keeping it in the dylib saves
-  // a new kilobytes for each specialization for all users of dictionary.
-
-  _sanityCheck(
-    !_isBridgedVerbatimToObjectiveC(SwiftKey.self) ||
-    !_isBridgedVerbatimToObjectiveC(SwiftValue.self))
-  _sanityCheck(
-    _isClassOrObjCExistential(ObjCKey.self) ||
-    _isClassOrObjCExistential(ObjCValue.self))
-
-  var result = Dictionary<ObjCKey, ObjCValue>(minimumCapacity: source.count)
-  let keyBridgesDirectly =
-    _isBridgedVerbatimToObjectiveC(SwiftKey.self) ==
-      _isBridgedVerbatimToObjectiveC(ObjCKey.self)
-  let valueBridgesDirectly =
-    _isBridgedVerbatimToObjectiveC(SwiftValue.self) ==
-      _isBridgedVerbatimToObjectiveC(ObjCValue.self)
-  for (key, value) in source {
-    // Bridge the key
-    var bridgedKey: ObjCKey
-    if keyBridgesDirectly {
-      bridgedKey = unsafeBitCast(key, to: ObjCKey.self)
-    } else {
-      let bridged: AnyObject = _bridgeAnythingToObjectiveC(key)
-      bridgedKey = unsafeBitCast(bridged, to: ObjCKey.self)
-    }
-
-    // Bridge the value
-    var bridgedValue: ObjCValue
-    if valueBridgesDirectly {
-      bridgedValue = unsafeBitCast(value, to: ObjCValue.self)
-    } else {
-      let bridged: AnyObject? = _bridgeAnythingToObjectiveC(value)
-      bridgedValue = unsafeBitCast(bridged, to: ObjCValue.self)
-    }
-
-    result[bridgedKey] = bridgedValue
-  }
-
-  return result
-}
-#endif
-
 /// Called by the casting machinery.
 @_silgen_name("_swift_dictionaryDownCastIndirect")
 internal func _dictionaryDownCastIndirect<SourceKey, SourceValue,
@@ -1778,92 +1719,6 @@ public func _dictionaryDownCastConditional<
   return result
 }
 
-#if _runtime(_ObjC)
-/// Implements an unconditional downcast that involves bridging.
-///
-/// - Precondition: At least one of `SwiftKey` or `SwiftValue` is a bridged value
-///   type, and the corresponding `ObjCKey` or `ObjCValue` is a reference type.
-@inlinable
-public func _dictionaryBridgeFromObjectiveC<
-  ObjCKey, ObjCValue, SwiftKey, SwiftValue
->(
-  _ source: Dictionary<ObjCKey, ObjCValue>
-) -> Dictionary<SwiftKey, SwiftValue> {
-  let result: Dictionary<SwiftKey, SwiftValue>? =
-    _dictionaryBridgeFromObjectiveCConditional(source)
-  _precondition(result != nil, "Dictionary cannot be bridged from Objective-C")
-  return result!
-}
-
-/// Implements a conditional downcast that involves bridging.
-///
-/// If the cast fails, the function returns `nil`.  All checks should be
-/// performed eagerly.
-///
-/// - Precondition: At least one of `SwiftKey` or `SwiftValue` is a bridged value
-///   type, and the corresponding `ObjCKey` or `ObjCValue` is a reference type.
-@inlinable
-public func _dictionaryBridgeFromObjectiveCConditional<
-  ObjCKey, ObjCValue, SwiftKey, SwiftValue
->(
-  _ source: Dictionary<ObjCKey, ObjCValue>
-) -> Dictionary<SwiftKey, SwiftValue>? {
-  _sanityCheck(
-    _isClassOrObjCExistential(ObjCKey.self) ||
-    _isClassOrObjCExistential(ObjCValue.self))
-  _sanityCheck(
-    !_isBridgedVerbatimToObjectiveC(SwiftKey.self) ||
-    !_isBridgedVerbatimToObjectiveC(SwiftValue.self))
-
-  let keyBridgesDirectly =
-    _isBridgedVerbatimToObjectiveC(SwiftKey.self) ==
-      _isBridgedVerbatimToObjectiveC(ObjCKey.self)
-  let valueBridgesDirectly =
-    _isBridgedVerbatimToObjectiveC(SwiftValue.self) ==
-      _isBridgedVerbatimToObjectiveC(ObjCValue.self)
-
-  var result = Dictionary<SwiftKey, SwiftValue>(minimumCapacity: source.count)
-  for (key, value) in source {
-    // Downcast the key.
-    var resultKey: SwiftKey
-    if keyBridgesDirectly {
-      if let bridgedKey = key as? SwiftKey {
-        resultKey = bridgedKey
-      } else {
-        return nil
-      }
-    } else {
-      if let bridgedKey = _conditionallyBridgeFromObjectiveC(
-        _reinterpretCastToAnyObject(key), SwiftKey.self) {
-          resultKey = bridgedKey
-      } else {
-        return nil
-      }
-    }
-
-    // Downcast the value.
-    var resultValue: SwiftValue
-    if valueBridgesDirectly {
-      if let bridgedValue = value as? SwiftValue {
-        resultValue = bridgedValue
-      } else {
-        return nil
-      }
-    } else {
-      if let bridgedValue = _conditionallyBridgeFromObjectiveC(
-        _reinterpretCastToAnyObject(value), SwiftValue.self) {
-          resultValue = bridgedValue
-      } else {
-        return nil
-      }
-    }
-
-    result[resultKey] = resultValue
-  }
-  return result
-}
-#endif
-
 //===--- APIs templated for Dictionary and Set ----------------------------===//
 
 /// This protocol is only used for compile-time checks that

stdlib/public/core/Set.swift

@@ -1102,40 +1102,6 @@ public func _setUpCast<DerivedValue, BaseValue>(_ source: Set<DerivedValue>)
   return builder.take()
 }
 
-#if _runtime(_ObjC)
-
-/// Implements an unconditional upcast that involves bridging.
-///
-/// The cast can fail if bridging fails.
-///
-/// - Precondition: `SwiftValue` is bridged to Objective-C
-///   and requires non-trivial bridging.
-@inlinable
-public func _setBridgeToObjectiveC<SwiftValue, ObjCValue>(
-  _ source: Set<SwiftValue>
-) -> Set<ObjCValue> {
-  _sanityCheck(_isClassOrObjCExistential(ObjCValue.self))
-  _sanityCheck(!_isBridgedVerbatimToObjectiveC(SwiftValue.self))
-
-  var result = Set<ObjCValue>(minimumCapacity: source.count)
-  let valueBridgesDirectly =
-    _isBridgedVerbatimToObjectiveC(SwiftValue.self) ==
-    _isBridgedVerbatimToObjectiveC(ObjCValue.self)
-
-  for member in source {
-    var bridgedMember: ObjCValue
-    if valueBridgesDirectly {
-      bridgedMember = unsafeBitCast(member, to: ObjCValue.self)
-    } else {
-      let bridged: AnyObject = _bridgeAnythingToObjectiveC(member)
-      bridgedMember = unsafeBitCast(bridged, to: ObjCValue.self)
-    }
-    result.insert(bridgedMember)
-  }
-  return result
-}
-#endif
-
 /// Called by the casting machinery.
 @_silgen_name("_swift_setDownCastIndirect")
 internal func _setDownCastIndirect<SourceValue, TargetValue>(
@@ -1204,65 +1170,6 @@ public func _setDownCastConditional<BaseValue, DerivedValue>(
   return result
 }
 
-#if _runtime(_ObjC)
-
-/// Implements an unconditional downcast that involves bridging.
-///
-/// - Precondition: At least one of `SwiftValue` is a bridged value
-///   type, and the corresponding `ObjCValue` is a reference type.
-@inlinable
-public func _setBridgeFromObjectiveC<ObjCValue, SwiftValue>(
-  _ source: Set<ObjCValue>
-) -> Set<SwiftValue> {
-  let result: Set<SwiftValue>? = _setBridgeFromObjectiveCConditional(source)
-  _precondition(result != nil, "This set cannot be bridged from Objective-C")
-  return result!
-}
-
-/// Implements a conditional downcast that involves bridging.
-///
-/// If the cast fails, the function returns `nil`.  All checks should be
-/// performed eagerly.
-///
-/// - Precondition: At least one of `SwiftValue` is a bridged value
-///   type, and the corresponding `ObjCValue` is a reference type.
-@inlinable
-public func _setBridgeFromObjectiveCConditional<
-  ObjCValue, SwiftValue
->(
-  _ source: Set<ObjCValue>
-) -> Set<SwiftValue>? {
-  _sanityCheck(_isClassOrObjCExistential(ObjCValue.self))
-  _sanityCheck(!_isBridgedVerbatimToObjectiveC(SwiftValue.self))
-
-  let valueBridgesDirectly =
-    _isBridgedVerbatimToObjectiveC(SwiftValue.self) ==
-      _isBridgedVerbatimToObjectiveC(ObjCValue.self)
-
-  var result = Set<SwiftValue>(minimumCapacity: source.count)
-  for value in source {
-    // Downcast the value.
-    var resultValue: SwiftValue
-    if valueBridgesDirectly {
-      if let bridgedValue = value as? SwiftValue {
-        resultValue = bridgedValue
-      } else {
-        return nil
-      }
-    } else {
-      if let bridgedValue = _conditionallyBridgeFromObjectiveC(
-          _reinterpretCastToAnyObject(value), SwiftValue.self) {
-        resultValue = bridgedValue
-      } else {
-        return nil
-      }
-    }
-    result.insert(resultValue)
-  }
-  return result
-}
-#endif
-
 extension Set {
   /// Removes the elements of the given set from this set.
   ///

test/IRGen/bitcast_specialization.swift

@@ -5,7 +5,8 @@
 // specialized version fo myDictionaryBridge.
 // <rdar://problem/17821040>
 
-// A minimized version of _dictionaryBridgeToObjectiveC in the stdlib 
+// A minimized version of _dictionaryBridgeToObjectiveC that used to be in the
+// stdlib 
 public func myDictionaryBridge<
     SrcType, DestType
 >(

test/stdlib/SetTrapsObjC.swift

@@ -55,8 +55,8 @@ var SetTraps = TestSuite("SetTraps" + testSuiteSuffix)
 
 SetTraps.test("sanity") {
   // Sanity checks.  This code should not trap.
-  var s = Set<BridgedVerbatimRefTy>()
-  var nss = s as NSSet
+  let s = Set<BridgedVerbatimRefTy>()
+  _ = s as NSSet
 }
 
 class TestObjCKeyTy : NSObject {
@@ -120,8 +120,8 @@ func ==(x: TestBridgedKeyTy, y: TestBridgedKeyTy) -> Bool {
 
 SetTraps.test("BridgedKeyIsNotNSCopyable1") {
   // This Set is bridged in O(1).
-  var s: Set<TestObjCKeyTy> = [ TestObjCKeyTy(10) ]
-  var nss = s as NSSet
+  let s: Set<TestObjCKeyTy> = [ TestObjCKeyTy(10) ]
+  let nss = s as NSSet
 
   // Unlike NSDictionary, NSSet does not require NSCopying from its element
   // type.
@@ -137,11 +137,11 @@ SetTraps.test("Downcast1")
   let s: Set<NSObject> = [ NSObject(), NSObject() ]
   let s2: Set<TestObjCKeyTy> = _setDownCast(s)
   expectCrashLater()
-  let v1 = s2.contains(TestObjCKeyTy(10))
-  let v2 = s2.contains(TestObjCKeyTy(20))
+  _ = s2.contains(TestObjCKeyTy(10))
+  _ = s2.contains(TestObjCKeyTy(20))
 
   // This triggers failure.
-  for m in s2 { }
+  for _ in s2 { }
 }
 
 SetTraps.test("Downcast2")
@@ -151,8 +151,8 @@ SetTraps.test("Downcast2")
   .code {
   let s: Set<NSObject> = [ TestObjCKeyTy(10), NSObject() ]
   expectCrashLater()
-  let s2: Set<TestBridgedKeyTy> = _setBridgeFromObjectiveC(s)
-  let v1 = s2.contains(TestBridgedKeyTy(10))
+  let s2 = s as! Set<TestBridgedKeyTy>
+  _ = s2.contains(TestBridgedKeyTy(10))
 }
 
 runAllTests()