Merge pull request #72204 from kavon/ncgenerics-fixes-3-8-2024

NCGenerics: More Builtin fixes and casting test fix

Author: kavon

lib/AST/Builtins.cpp

@@ -725,6 +725,11 @@ namespace {
       InterfaceResult = generator.build(*this);
     }
 
+    template <class G>
+    void addConformanceRequirement(const G &generator, KnownProtocolKind kp) {
+      addConformanceRequirement(generator, Context.getProtocol(kp));
+    }
+
     template <class G>
     void addConformanceRequirement(const G &generator, ProtocolDecl *proto) {
       assert(proto && "missing protocol");
@@ -1194,14 +1199,23 @@ static ValueDecl *getNativeObjectCast(ASTContext &Context, Identifier Id,
   }
 
   BuiltinFunctionBuilder builder(Context);
+
+  auto genParam = makeGenericParam();
+
+  // Add safety, unless requested.
+  if (BV != BuiltinValueKind::UnsafeCastToNativeObject) {
+    builder.addConformanceRequirement(genParam, KnownProtocolKind::Copyable);
+    builder.addConformanceRequirement(genParam, KnownProtocolKind::Escapable);
+  }
+
   if (BV == BuiltinValueKind::CastToNativeObject ||
       BV == BuiltinValueKind::UnsafeCastToNativeObject ||
       BV == BuiltinValueKind::BridgeToRawPointer) {
-    builder.addParameter(makeGenericParam(), ownership);
+    builder.addParameter(genParam, ownership);
     builder.setResult(makeConcrete(builtinTy));
   } else {
     builder.addParameter(makeConcrete(builtinTy), ownership);
-    builder.setResult(makeGenericParam());
+    builder.setResult(genParam);
   }
   return builder.build(Id);
 }
@@ -1303,7 +1317,9 @@ static ValueDecl *getZeroInitializerOperation(ASTContext &Context,
                                              Identifier Id) {
   // <T> () -> T
   BuiltinFunctionBuilder builder(Context);
-  builder.setResult(makeGenericParam());
+  auto genParam = makeGenericParam();
+  builder.addConformanceRequirement(genParam, KnownProtocolKind::Escapable);
+  builder.setResult(genParam);
   return builder.build(Id);
 }
 

test/Interpreter/moveonly_generics_casting.swift

@@ -47,8 +47,7 @@ func main() {
   // CHECK: hello
   attemptCall(Cat<Noncopyable, Ordinary>())
 
-  // FIXME: this should succeeed!!
-  // CHECK: failed to cast (test_radar124171788)
+  // CHECK: cast succeeded
   test_radar124171788(.nothing)
 }
 
@@ -58,8 +57,8 @@ enum Maybe<Wrapped: ~Copyable>: ~Copyable {
   case nothing
 }
 extension Maybe: Copyable {}
-extension Maybe: CustomStringConvertible {
-  var description: String {
+extension Maybe: CustomDebugStringConvertible {
+  var debugDescription: String {
     "cast succeeded"
   }
 }

test/SILOptimizer/moveonly_builtins.swift

@@ -31,3 +31,11 @@ func checkArrayBuiltins(_ dest: Builtin.RawPointer, src: Builtin.RawPointer, cou
   Builtin.assignCopyArrayBackToFront(NC.self, dest, src, count) // expected-illegal-error {{noncopyable type 'NC' cannot be substituted for copyable generic parameter 'T' in 'assignCopyArrayBackToFront'}}
 #endif
 }
+
+public func checkIllegal() {
+#if ILLEGAL
+  _ = Builtin.unsafeCastToNativeObject(NC())
+  _ = Builtin.castToNativeObject(NC()) // expected-illegal-error {{noncopyable type 'NC' cannot be substituted for copyable generic parameter 'T' in 'castToNativeObject'}}
+  let _: NC = Builtin.zeroInitializer()
+#endif
+}