Merge pull request #8063 from gottesmm/cast_to_native_object

Author: swift-ci

include/swift/AST/Builtins.def

@@ -206,8 +206,15 @@ BUILTIN_SIL_OPERATION(CastToUnknownObject, "castToUnknownObject", Special)
 BUILTIN_SIL_OPERATION(CastFromUnknownObject, "castFromUnknownObject", Special)
 
 /// CastToNativeObject has type (T) -> Builtin.NativeObject.
+///
+/// This builtin asserts if the underlying type /could/ be objc.
 BUILTIN_SIL_OPERATION(CastToNativeObject, "castToNativeObject", Special)
 
+/// UnsafeCastToNativeObject has type (T) -> Builtin.NativeObject.
+///
+/// This builtin does not check if the underlying type /could/ be objc.
+BUILTIN_SIL_OPERATION(UnsafeCastToNativeObject, "unsafeCastToNativeObject", Special)
+
 /// CastFromNativeObject has type (Builtin.NativeObject) -> T
 BUILTIN_SIL_OPERATION(CastFromNativeObject, "castFromNativeObject", Special)
 

lib/AST/Builtins.cpp

@@ -814,6 +814,7 @@ static ValueDecl *getNativeObjectCast(ASTContext &Context, Identifier Id,
 
   BuiltinGenericSignatureBuilder builder(Context);
   if (BV == BuiltinValueKind::CastToNativeObject ||
+      BV == BuiltinValueKind::UnsafeCastToNativeObject ||
       BV == BuiltinValueKind::CastToUnknownObject ||
       BV == BuiltinValueKind::BridgeToRawPointer) {
     builder.addParameter(makeGenericParam());
@@ -1661,6 +1662,7 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
     return getDeallocOperation(Context, Id);
 
   case BuiltinValueKind::CastToNativeObject:
+  case BuiltinValueKind::UnsafeCastToNativeObject:
   case BuiltinValueKind::CastFromNativeObject:
   case BuiltinValueKind::CastToUnknownObject:
   case BuiltinValueKind::CastFromUnknownObject:

lib/SIL/SILOwnershipVerifier.cpp

@@ -1118,6 +1118,7 @@ BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(Init)
 BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(CastToUnknownObject)
 BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(CastFromUnknownObject)
 BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(CastToNativeObject)
+BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(UnsafeCastToNativeObject)
 BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(CastFromNativeObject)
 BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(CastToBridgeObject)
 BUILTINS_THAT_SHOULD_HAVE_BEEN_LOWERED_TO_SILINSTS(

lib/SIL/SILValue.cpp

@@ -691,6 +691,7 @@ CONSTANT_OWNERSHIP_BUILTIN(Trivial, FCMP_UNO)
 CONSTANT_OWNERSHIP_BUILTIN(Unowned, CastToUnknownObject)
 CONSTANT_OWNERSHIP_BUILTIN(Unowned, CastFromUnknownObject)
 CONSTANT_OWNERSHIP_BUILTIN(Unowned, CastToNativeObject)
+CONSTANT_OWNERSHIP_BUILTIN(Unowned, UnsafeCastToNativeObject)
 CONSTANT_OWNERSHIP_BUILTIN(Unowned, CastFromNativeObject)
 CONSTANT_OWNERSHIP_BUILTIN(Unowned, CastToBridgeObject)
 CONSTANT_OWNERSHIP_BUILTIN(Unowned, CastReferenceFromBridgeObject)

lib/SILGen/SILGenBuiltin.cpp

@@ -361,8 +361,8 @@ static ManagedValue emitCastToReferenceType(SILGenFunction &gen,
   return ManagedValue(result, cleanup);
 }
 
-/// Specialized emitter for Builtin.castToNativeObject.
-static ManagedValue emitBuiltinCastToNativeObject(SILGenFunction &gen,
+/// Specialized emitter for Builtin.unsafeCastToNativeObject.
+static ManagedValue emitBuiltinUnsafeCastToNativeObject(SILGenFunction &gen,
                                          SILLocation loc,
                                          SubstitutionList substitutions,
                                          ArrayRef<ManagedValue> args,
@@ -372,6 +372,25 @@ static ManagedValue emitBuiltinCastToNativeObject(SILGenFunction &gen,
                         SILType::getNativeObjectType(gen.F.getASTContext()));
 }
 
+
+/// Specialized emitter for Builtin.castToNativeObject.
+static ManagedValue emitBuiltinCastToNativeObject(SILGenFunction &gen,
+                                         SILLocation loc,
+                                         SubstitutionList substitutions,
+                                         ArrayRef<ManagedValue> args,
+                                         CanFunctionType formalApplyType,
+                                         SGFContext C) {
+  CanType ty = args[0].getType().getSwiftRValueType();
+  (void)ty;
+  assert(ty->usesNativeReferenceCounting(ResilienceExpansion::Maximal) &&
+         "Can only cast types that use native reference counting to native "
+         "object");
+  return emitBuiltinUnsafeCastToNativeObject(gen, loc, substitutions,
+                                             args, formalApplyType,
+                                             C);
+}
+
+
 /// Specialized emitter for Builtin.castToUnknownObject.
 static ManagedValue emitBuiltinCastToUnknownObject(SILGenFunction &gen,
                                          SILLocation loc,

stdlib/public/core/Arrays.swift.gyb

@@ -762,7 +762,7 @@ public struct ${Self}<Element>
   /// - Precondition: The array has a native buffer.
   @_semantics("array.owner")
   internal func _getOwnerWithSemanticLabel_native() -> Builtin.NativeObject {
-    return Builtin.castToNativeObject(_buffer.nativeOwner)
+    return Builtin.unsafeCastToNativeObject(_buffer.nativeOwner)
   }
 
   /// - Precondition: The array has a native buffer.
@@ -779,7 +779,7 @@ public struct ${Self}<Element>
 #endif
     // In the value typed case the extra call to
     // _getOwnerWithSemanticLabel_native hinders optimization.
-    return Builtin.castToNativeObject(_buffer.owner)
+    return Builtin.unsafeCastToNativeObject(_buffer.owner)
   }
 
   // FIXME(ABI)#12 : move to an initializer on _Buffer.

stdlib/public/core/Equatable.swift

@@ -236,8 +236,8 @@ public func === (lhs: AnyObject?, rhs: AnyObject?) -> Bool {
   switch (lhs, rhs) {
   case let (l?, r?):
     return Bool(Builtin.cmp_eq_RawPointer(
-        Builtin.bridgeToRawPointer(Builtin.castToNativeObject(l)),
-        Builtin.bridgeToRawPointer(Builtin.castToNativeObject(r))
+        Builtin.bridgeToRawPointer(Builtin.castToUnknownObject(l)),
+        Builtin.bridgeToRawPointer(Builtin.castToUnknownObject(r))
       ))
   case (nil, nil):
     return true

stdlib/public/core/HeapBuffer.swift

@@ -132,15 +132,15 @@ struct _HeapBuffer<Value, Element> : Equatable {
 
   public // @testable
   init(_ storage: _HeapBufferStorage<Value, Element>) {
-    self._storage = Builtin.castToNativeObject(storage)
+    self._storage = Builtin.unsafeCastToNativeObject(storage)
   }
 
   internal init(_ storage: AnyObject) {
     _sanityCheck(
       _usesNativeSwiftReferenceCounting(type(of: storage)),
       "HeapBuffer manages only native objects"
     )
-    self._storage = Builtin.castToNativeObject(storage)
+    self._storage = Builtin.unsafeCastToNativeObject(storage)
   }
 
   internal init<T : AnyObject>(_ storage: T?) {
@@ -172,7 +172,7 @@ struct _HeapBuffer<Value, Element> : Equatable {
       bufferType: storageClass,
       size: totalSize,
       alignmentMask: alignMask)
-    self._storage = Builtin.castToNativeObject(object)
+    self._storage = Builtin.unsafeCastToNativeObject(object)
     self._value.initialize(to: initializer)
   }
 

stdlib/public/core/ManagedBuffer.swift

@@ -202,7 +202,7 @@ public struct ManagedBufferPointer<Header, Element> : Equatable {
   public init(unsafeBufferObject buffer: AnyObject) {
     ManagedBufferPointer._checkValidBufferClass(type(of: buffer))
 
-    self._nativeBuffer = Builtin.castToNativeObject(buffer)
+    self._nativeBuffer = Builtin.unsafeCastToNativeObject(buffer)
   }
 
   /// Internal version for use by _ContiguousArrayBuffer where we know that we
@@ -216,7 +216,7 @@ public struct ManagedBufferPointer<Header, Element> : Equatable {
   @_versioned
   internal init(_uncheckedUnsafeBufferObject buffer: AnyObject) {
     ManagedBufferPointer._sanityCheckValidBufferClass(type(of: buffer))
-    self._nativeBuffer = Builtin.castToNativeObject(buffer)
+    self._nativeBuffer = Builtin.unsafeCastToNativeObject(buffer)
   }
 
   /// The stored `Header` instance.
@@ -330,15 +330,15 @@ public struct ManagedBufferPointer<Header, Element> : Equatable {
       size: totalSize,
       alignmentMask: _My._alignmentMask)
 
-    self._nativeBuffer = Builtin.castToNativeObject(newBuffer)
+    self._nativeBuffer = Builtin.unsafeCastToNativeObject(newBuffer)
   }
 
   /// Manage the given `buffer`.
   ///
   /// - Note: It is an error to use the `header` property of the resulting
   ///   instance unless it has been initialized.
   internal init(_ buffer: ManagedBuffer<Header, Element>) {
-    _nativeBuffer = Builtin.castToNativeObject(buffer)
+    _nativeBuffer = Builtin.unsafeCastToNativeObject(buffer)
   }
 
   internal typealias _My = ManagedBufferPointer

test/SILGen/builtins.swift

@@ -236,7 +236,7 @@ func class_archetype_to_unknown_object<T : C>(_ t: T) -> Builtin.UnknownObject {
 func class_existential_to_native_object(_ t:ClassProto) -> Builtin.NativeObject {
   // CHECK: [[REF:%[0-9]+]] = open_existential_ref [[T:%[0-9]+]] : $ClassProto
   // CHECK: [[PTR:%[0-9]+]] = unchecked_ref_cast [[REF]] : $@opened({{.*}}) ClassProto to $Builtin.NativeObject
-  return Builtin.castToNativeObject(t)
+  return Builtin.unsafeCastToNativeObject(t)
 }
 
 // CHECK-LABEL: sil hidden @_T08builtins35class_existential_to_unknown_object{{[_0-9a-zA-Z]*}}F