Merge pull request #17114 from aschwaighofer/fix_sil_combine_cast_opt_address_only_type_4.2

Author: swift-ci

lib/SILOptimizer/Utils/CastOptimizer.cpp

@@ -1440,10 +1440,7 @@ static bool optimizeStaticallyKnownProtocolConformance(
                                                       SourceType, Conformances);
           auto Projection =
               B.createProjectExistentialBox(Loc, Src->getType(), AllocBox);
-          auto Value = B.createLoad(Loc, Src,
-                                    swift::LoadOwnershipQualifier::Unqualified);
-          B.createStore(Loc, Value, Projection,
-                        swift::StoreOwnershipQualifier::Unqualified);
+          B.createCopyAddr(Loc, Src, Projection, IsTake, IsInitialization);
           B.createStore(Loc, AllocBox, Dest,
                         swift::StoreOwnershipQualifier::Unqualified);
           break;

test/SILOptimizer/constant_propagation.sil

@@ -889,8 +889,7 @@ bb0(%0 : $*MyError, %1 : $*E2<X>):
 // CHECK-NOT: unconditional_checked_cast_addr
 // CHECK: [[ALLOC_BOX:%.*]] = alloc_existential_box $Error, $E1
 // CHECK: [[PROJ:%.*]] = project_existential_box $E1 in [[ALLOC_BOX]] : $Error
-// CHECK: [[VAL:%.*]] = load %1 : $*E1
-// CHECK: store [[VAL]] to [[PROJ]]
+// CHECK: copy_addr [take] %1 to [initialization] [[PROJ]]
 // CHECK: store [[ALLOC_BOX]] to %0 : $*Error
 // CHECK: return
 sil @replace_unconditional_check_cast_addr_for_type_to_error_existential : $@convention(thin) (@in E1) -> (@out Error) {

test/SILOptimizer/sil_combine_objc_bridge.sil

@@ -197,3 +197,28 @@ bb0(%0 : $*NSObject, %1 : $*Array<String>):
   return %7 : $()
 }
 
+enum AddressOnlyError : Error {
+  case data(Data)
+  case none
+}
+
+// CHECK-LABEL: sil @unconditional_checked_cast_addr_address_only_type
+// CHECK: alloc_stack $Error
+// CHECK: alloc_stack $AddressOnlyError
+// CHECK  copy_addr
+// CHECK: alloc_existential_box
+// CHECK: project_existential_box
+// CHECK: copy_addr
+// CHECK: store
+sil @unconditional_checked_cast_addr_address_only_type: $@convention(thin) (@in_guaranteed AddressOnlyError) -> @owned Error {
+bb0(%0 : $*AddressOnlyError):
+  %1 = alloc_stack $Error
+  %2 = alloc_stack $AddressOnlyError
+  copy_addr %0 to [initialization] %2 : $*AddressOnlyError
+  unconditional_checked_cast_addr AddressOnlyError in %2 : $*AddressOnlyError to Error in %1 : $*Error
+  dealloc_stack %2 : $*AddressOnlyError
+  %8 = tuple ()
+  %9 = load %1 : $*Error
+  dealloc_stack %1 : $*Error
+  return %9 : $Error
+}