Manually add _unconditionallyBridgeFromObjectiveC throughout test cases. NFC

Author: DougGregor

test/1_stdlib/ArrayBridge.swift

@@ -24,16 +24,6 @@
 import Foundation
 import ArrayBridgeObjC
 
-// FIXME: Should go into the standard library.
-public extension _ObjectiveCBridgeable {
-  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
-      -> Self {
-    var result: Self? = nil
-    _forceBridgeFromObjectiveC(source!, result: &result)
-    return result!
-  }
-}
-
 // CHECK: testing...
 print("testing...")
 
@@ -137,7 +127,14 @@ struct BridgedSwift : CustomStringConvertible, _ObjectiveCBridgeable {
     result = nil
     return false
   }
-  
+
+  static func _unconditionallyBridgeFromObjectiveC(_ source: BridgedObjC?)
+      -> BridgedSwift {
+    var result: BridgedSwift? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
+
   var description: String {
     assert(trak.serialNumber > 0, "dead Tracked!")
     return "BridgedSwift#\(trak.serialNumber)(\(trak.value))"

test/1_stdlib/BridgeNonVerbatim.swift

@@ -26,16 +26,6 @@ import SwiftShims
 import ObjectiveC
 import StdlibUnittest
 
-// FIXME: Should go into the standard library.
-public extension _ObjectiveCBridgeable {
-  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
-      -> Self {
-    var result: Self? = nil
-    _forceBridgeFromObjectiveC(source!, result: &result)
-    return result!
-  }
-}
-
 struct X : _ObjectiveCBridgeable {
   static func _isBridgedToObjectiveC() -> Bool {
     return true
@@ -64,6 +54,13 @@ struct X : _ObjectiveCBridgeable {
     return true
   }
 
+  static func _unconditionallyBridgeFromObjectiveC(_ source: LifetimeTracked?)
+      -> X {
+    var result: X? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
+
   var value: Int
 }
 

test/1_stdlib/DictionaryTraps.swift

@@ -13,17 +13,6 @@
 import StdlibUnittest
 import Foundation
 
-// FIXME: Should go into the standard library.
-public extension _ObjectiveCBridgeable {
-  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
-      -> Self {
-    var result: Self? = nil
-    _forceBridgeFromObjectiveC(source!, result: &result)
-    return result!
-  }
-}
-
-
 struct NotBridgedKeyTy : Equatable, Hashable {
   init(_ value: Int) {
     self.value = value
@@ -196,6 +185,13 @@ struct TestBridgedKeyTy : Hashable, _ObjectiveCBridgeable {
     return true
   }
 
+  static func _unconditionallyBridgeFromObjectiveC(_ source: TestObjCKeyTy?)
+      -> TestBridgedKeyTy {
+    var result: TestBridgedKeyTy? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
+
   var value: Int
 }
 

test/1_stdlib/RuntimeObjC.swift

@@ -15,16 +15,6 @@ import CoreGraphics
 import SwiftShims
 import MirrorObjC
 
-// FIXME: Should go into the standard library.
-public extension _ObjectiveCBridgeable {
-  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
-      -> Self {
-    var result: Self? = nil
-    _forceBridgeFromObjectiveC(source!, result: &result)
-    return result!
-  }
-}
-
 var nsObjectCanaryCount = 0
 @objc class NSObjectCanary : NSObject {
   override init() {
@@ -100,6 +90,13 @@ struct BridgedValueType : _ObjectiveCBridgeable {
     return false
   }
 
+  static func _unconditionallyBridgeFromObjectiveC(_ source: ClassA?)
+      -> BridgedValueType {
+    var result: BridgedValueType? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
+
   var value: Int
   var canaryRef = SwiftObjectCanary()
 }
@@ -146,6 +143,13 @@ struct BridgedLargeValueType : _ObjectiveCBridgeable {
     return false
   }
 
+  static func _unconditionallyBridgeFromObjectiveC(_ source: ClassA?)
+      -> BridgedLargeValueType {
+    var result: BridgedLargeValueType? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
+
   var value: Int {
     let x = value0
     assert(value0 == x && value1 == x && value2 == x && value3 == x &&
@@ -189,6 +193,13 @@ struct ConditionallyBridgedValueType<T> : _ObjectiveCBridgeable {
     return false
   }
 
+  static func _unconditionallyBridgeFromObjectiveC(_ source: ClassA?)
+      -> ConditionallyBridgedValueType {
+    var result: ConditionallyBridgedValueType? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
+
   static func _isBridgedToObjectiveC() -> Bool {
     return ((T.self as Any) as? String.Type) == nil
   }

test/1_stdlib/SetTrapsObjC.swift

@@ -12,16 +12,6 @@ import StdlibUnittest
 import Foundation
 
 
-// FIXME: Should go into the standard library.
-public extension _ObjectiveCBridgeable {
-  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
-      -> Self {
-    var result: Self? = nil
-    _forceBridgeFromObjectiveC(source!, result: &result)
-    return result!
-  }
-}
-
 struct NotBridgedKeyTy : Equatable, Hashable {
   init(_ value: Int) {
     self.value = value
@@ -116,6 +106,13 @@ struct TestBridgedKeyTy : Hashable, _ObjectiveCBridgeable {
     return true
   }
 
+  static func _unconditionallyBridgeFromObjectiveC(_ source: TestObjCKeyTy?)
+      -> TestBridgedKeyTy {
+    var result: TestBridgedKeyTy? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
+
   var value: Int
 }
 

test/Constraints/bridging.swift

@@ -4,16 +4,6 @@
 
 import Foundation
 
-// FIXME: Should go into the standard library.
-public extension _ObjectiveCBridgeable {
-  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
-      -> Self {
-    var result: Self? = nil
-    _forceBridgeFromObjectiveC(source!, result: &result)
-    return result!
-  }
-}
-
 public class BridgedClass : NSObject, NSCopying {
   @objc(copyWithZone:)
   public func copy(with zone: NSZone?) -> AnyObject {
@@ -75,6 +65,13 @@ struct BridgedStruct : Hashable, _ObjectiveCBridgeable {
   ) -> Bool {
     return true
   }
+
+  static func _unconditionallyBridgeFromObjectiveC(_ source: BridgedClass?)
+      -> BridgedStruct {
+    var result: BridgedStruct? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
 }
 
 func ==(x: BridgedStruct, y: BridgedStruct) -> Bool { return true }

test/SILOptimizer/cast_folding_objc.swift

@@ -10,16 +10,6 @@
 
 import Foundation
 
-// FIXME: Should go into the standard library.
-public extension _ObjectiveCBridgeable {
-  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
-      -> Self {
-    var result: Self? = nil
-    _forceBridgeFromObjectiveC(source!, result: &result)
-    return result!
-  }
-}
-
 class ObjCX : NSObject {}
 
 struct CX: _ObjectiveCBridgeable {
@@ -36,6 +26,13 @@ struct CX: _ObjectiveCBridgeable {
   static func _conditionallyBridgeFromObjectiveC(_ source: ObjCX, result: inout CX?) -> Bool {
     return false
   }
+
+  static func _unconditionallyBridgeFromObjectiveC(_ source: ObjCX?)
+      -> CX {
+    var result: CX? = nil
+    _forceBridgeFromObjectiveC(source!, result: &result)
+    return result!
+  }
 }
 
 // Check casts to types which are _ObjectiveCBridgeable