Create copy_value and compensating destroys for owned concrete values.

Author: meg-gupta

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -1125,6 +1125,7 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
   // Create the new set of arguments to apply including their substitutions.
   SubstitutionMap NewCallSubs = Apply.getSubstitutionMap();
   SmallVector<SILValue, 8> NewArgs;
+  SmallVector<SILValue, 8> valuesToClean;
   unsigned ArgIdx = 0;
   // Push the indirect result arguments.
   for (unsigned EndIdx = Apply.getSubstCalleeConv().getSILArgIndexOfFirstParam();
@@ -1186,7 +1187,15 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
       concreteArgCopies.push_back(*argSub);
       NewArgs.push_back(argSub->tempArg);
     } else {
-      NewArgs.push_back(CEI.ConcreteValue);
+      auto argValue = CEI.ConcreteValue;
+      if (argValue->getOwnershipKind() == OwnershipKind::Owned) {
+        SILBuilderWithScope copyBuilder(argValue->getNextInstruction(),
+                                        BuilderCtx);
+        argValue = copyBuilder.createCopyValue(
+            argValue->getNextInstruction()->getLoc(), argValue);
+        valuesToClean.push_back(argValue);
+      }
+      NewArgs.push_back(argValue);
     }
 
     // Form a new set of substitutions where the argument is
@@ -1290,6 +1299,10 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
       cleanupBuilder.createDestroyAddr(cleanupLoc, argCopy.origArg);
       cleanupBuilder.createDeallocStack(cleanupLoc, argCopy.tempArg);
     }
+  // Insert compensating destroys for owned values.
+  for (auto value : valuesToClean) {
+    cleanupBuilder.createDestroyValue(cleanupLoc, value);
+  }
   }
   return NewApply.getInstruction();
 }

test/SILOptimizer/sil_combine_ossa.sil

@@ -2860,6 +2860,21 @@ bb0(%0 : @owned $Klass):
   return %3 : $Builtin.NativeObject
 }
 
+// CHECK-LABEL: sil [ossa] @collapse_existential_pack_unpack_unchecked_ref_cast_owned4 :
+// CHECK:     apply {{.*}}<Klass>
+// CHECK: } // end sil function 'collapse_existential_pack_unpack_unchecked_ref_cast_owned4'
+sil [ossa] @collapse_existential_pack_unpack_unchecked_ref_cast_owned4 : $@convention(thin) (@owned Klass) -> @owned Builtin.NativeObject {
+bb0(%0 : @owned $Klass):
+  %1 = init_existential_ref %0 : $Klass : $Klass, $AnyObject
+  %f1 = function_ref @use_anyobject_guaranteed : $@convention(thin) (@guaranteed AnyObject) -> ()
+  apply %f1(%1) : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %2 = open_existential_ref %1 : $AnyObject to $@opened("7CAE06CE-5F10-11E4-AF13-C82A1428F987", AnyObject) Self
+  %f2 = function_ref @use_generic_obj_guaranteed : $@convention(thin) <τ_0_0> (@guaranteed τ_0_0) -> ()
+  apply %f2<@opened("7CAE06CE-5F10-11E4-AF13-C82A1428F987", AnyObject) Self>(%2) : $@convention(thin) <τ_0_0> (@guaranteed τ_0_0) -> ()
+  %3 = unchecked_ref_cast %2 : $@opened("7CAE06CE-5F10-11E4-AF13-C82A1428F987", AnyObject) Self to $Builtin.NativeObject
+  return %3 : $Builtin.NativeObject
+}
+
 // CHECK-LABEL: sil [ossa] @collapse_existential_pack_unpack_ref_to_raw_pointer
 // CHECK:       bb0([[Ref:%.*]] : @guaranteed $MyClass):
 // CHECK-NOT:     init_existential_ref