Merge pull request #24436 from aschwaighofer/opaque_specializer_fix_cast_nested_types

Opaque archetypes specializer: Fix cast of nested types

Author: aschwaighofer

lib/SILOptimizer/Transforms/SpecializeOpaqueArchetypes.cpp

@@ -332,8 +332,19 @@ class OpaqueSpecializerCloner
           loc, opd, type, /*withoutActuallyEscaping*/ false);
     } else if (opd->getType().isTrivial(CurFn)) {
       return getBuilder().createUncheckedTrivialBitCast(loc, opd, type);
-    } else {
+    } else if (opd->getType().isObject()) {
       return getBuilder().createUncheckedRefCast(loc, opd, type);
+    } else {
+      // This could be improved upon by recursively recomposing the type.
+      auto *stackLoc = getBuilder().createAllocStack(loc, type);
+      auto *addr =
+          getBuilder().createUncheckedAddrCast(loc, stackLoc, opd->getType());
+      getBuilder().createTrivialStoreOr(loc, addr, opd,
+                                        StoreOwnershipQualifier::Init);
+      SILValue res = getBuilder().createTrivialLoadOr(
+          loc, addr, LoadOwnershipQualifier::Take);
+      getBuilder().createDeallocStack(loc, stackLoc);
+      return res;
     }
   }
 
@@ -400,24 +411,7 @@ void OpaqueSpecializerCloner::insertOpaqueToConcreteAddressCasts(
       auto argIdx = apply.getCalleeArgIndex(opd);
       auto argType = substConv.getSILArgumentType(argIdx);
       if (argType.getASTType() != opd.get()->getType().getASTType()) {
-        if (argConv.isIndirectConvention()) {
-          auto cast = getBuilder().createUncheckedAddrCast(apply.getLoc(),
-                                                           opd.get(), argType);
-          opd.set(cast);
-        } else if (argType.is<SILFunctionType>()) {
-          auto cast = getBuilder().createConvertFunction(
-              apply.getLoc(), opd.get(), argType,
-              /*withoutActuallyEscaping*/ false);
-          opd.set(cast);
-        } else if (argType.isTrivial(getBuilder().getFunction())) {
-          auto cast = getBuilder().createUncheckedTrivialBitCast(
-              apply.getLoc(), opd.get(), argType);
-          opd.set(cast);
-        } else {
-          auto cast = getBuilder().createUncheckedRefCast(apply.getLoc(),
-                                                          opd.get(), argType);
-          opd.set(cast);
-        }
+        opd.set(createCast(apply.getLoc(), opd.get(), argType));
       }
       ++idx;
     }

test/SILOptimizer/specialize_opaque_type_archetypes.swift

@@ -3,8 +3,10 @@
 // RUN: %target-swift-frontend %S/Inputs/specialize_opaque_type_archetypes_3.swift -enable-library-evolution -module-name External2 -emit-module -emit-module-path %t/External2.swiftmodule
 // RUN: %target-swift-frontend %S/Inputs/specialize_opaque_type_archetypes_4.swift -I %t -enable-library-evolution -module-name External3 -emit-module -emit-module-path %t/External3.swiftmodule
 // RUN: %target-swift-frontend %S/Inputs/specialize_opaque_type_archetypes_3.swift -I %t -enable-library-evolution -module-name External2 -Osize -emit-module -o - | %target-sil-opt -module-name External2 | %FileCheck --check-prefix=RESILIENT %s
+// RUN: %target-swift-frontend -I %t -module-name A -enforce-exclusivity=checked -Osize -emit-sil -sil-verify-all %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%ptrsize
 // RUN: %target-swift-frontend -I %t -module-name A -enforce-exclusivity=checked -Osize -emit-sil  -sil-verify-all %s | %FileCheck %s
 // RUN: %target-swift-frontend -I %t -module-name A -enforce-exclusivity=checked -enable-library-evolution -Osize -emit-sil -sil-verify-all %s | %FileCheck %s
+
 import External
 import External2
 import External3
@@ -374,16 +376,30 @@ public func testResilientInlinablePropertyCallsResilientInlinable() {
 // RESILIENT:  apply [[FUN]]([[RES]], %0)
 
 
-protocol P4 {
+public protocol P4 {
   associatedtype AT
   func foo(_ x: Int64) -> AT
+  func test()
 }
+
 struct PA : P4 {
   func foo(_ x: Int64)  -> some P {
     return Int64(x)
   }
 }
 
+// CHECK-LABEL: sil private [transparent] [thunk] @$s1A2PAVAA2P4A2aDP4testyyFTW
+// CHECK:   [[V:%.*]] = load %0 : $*PA
+// CHECK:   [[F:%.*]] = function_ref @$s1A2PAV4testyyF
+// CHECK:   apply [[F]]([[V]])
+
+// CHECK-64-LABEL: sil hidden @$s1A2PAV4testyyF : $@convention(method) (PA) -> ()
+// CHECK-64:   [[V:%.*]] = integer_literal $Builtin.Int64, 5
+// CHECK-64:   [[I:%.*]] = struct $Int64 ([[V]] : $Builtin.Int64)
+// CHECK-64:   [[F:%.*]] = function_ref @$s1A4usePyyxAA1PRzlFs5Int64V_Tg5
+// CHECK-64:   apply [[F]]([[I]]) : $@convention(thin) (Int64) -> ()
+// CHECK-64:   apply [[F]]([[I]]) : $@convention(thin) (Int64) -> ()
+
 @inline(never)
 func testIt<T>(cl: (Int64) throws -> T) {
  do {
@@ -443,3 +459,11 @@ public func testTuple() {
   useP(t.0)
   useP(t.1)
 }
+
+extension PA {
+  func test() {
+    var p = (foo, foo)
+    useP(p.0(5))
+    useP(p.1(5))
+  }
+}