Fix test cases for copy propagation improvements

More dead code happens to be eliminated now because of consistent use
of the InstructionDeleter.

Author: atrick

test/SILOptimizer/copy_propagation.sil

@@ -32,6 +32,7 @@ sil [ossa] @getOwnedC : $@convention(thin) () -> (@owned C)
 sil [ossa] @takeOwnedC : $@convention(thin) (@owned C) -> ()
 sil [ossa] @takeOwnedCTwice : $@convention(thin) (@owned C, @owned C) -> ()
 sil [ossa] @takeGuaranteedC : $@convention(thin) (@guaranteed C) -> ()
+sil [ossa] @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
 
 // -O ignores this because there's no copy_value
 // -Onone hoists the destroy and adds a poison flag.
@@ -342,6 +343,8 @@ bb0:
   br bb1
 
 bb1:
+  %f2 = function_ref @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %call = apply %f2(%obj) : $@convention(thin) (@guaranteed AnyObject) -> ()
   destroy_value %copy : $AnyObject
   destroy_value %obj : $AnyObject
   destroy_value %box : ${ var AnyObject }
@@ -392,6 +395,8 @@ bb1:
   br bb2
 
 bb2:
+  %f2 = function_ref @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %call = apply %f2(%obj) : $@convention(thin) (@guaranteed AnyObject) -> ()
   destroy_value %copy : $AnyObject
   destroy_value %obj : $AnyObject
   destroy_value %box : ${ var AnyObject }
@@ -435,6 +440,8 @@ bb0:
   br bb1
 
 bb1:
+  %f2 = function_ref @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %call = apply %f2(%obj) : $@convention(thin) (@guaranteed AnyObject) -> ()
   destroy_value %copy : $AnyObject
   destroy_value %obj : $AnyObject
   destroy_value %box : ${ var AnyObject }
@@ -484,6 +491,8 @@ bb1:
   br bb2
 
 bb2:
+  %f2 = function_ref @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %call = apply %f2(%obj) : $@convention(thin) (@guaranteed AnyObject) -> ()
   destroy_value %copy : $AnyObject
   destroy_value %obj : $AnyObject
   destroy_value %box : ${ var AnyObject }
@@ -527,6 +536,8 @@ bb0:
   br bb1
 
 bb1:
+  %f2 = function_ref @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %call = apply %f2(%obj) : $@convention(thin) (@guaranteed AnyObject) -> ()
   destroy_value %copy : $AnyObject
   destroy_value %obj : $AnyObject
   destroy_value %box : ${ var AnyObject }
@@ -577,6 +588,8 @@ bb1:
   br bb2
 
 bb2:
+  %f2 = function_ref @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %call = apply %f2(%obj) : $@convention(thin) (@guaranteed AnyObject) -> ()
   destroy_value %copy : $AnyObject
   destroy_value %obj : $AnyObject
   destroy_value %box : ${ var AnyObject }
@@ -622,6 +635,8 @@ bb0:
   br bb1
 
 bb1:
+  %f2 = function_ref @takeGuaranteedAnyObject : $@convention(thin) (@guaranteed AnyObject) -> ()
+  %call = apply %f2(%obj) : $@convention(thin) (@guaranteed AnyObject) -> ()
   destroy_value %obj : $AnyObject
   destroy_value %box : ${ var AnyObject }
   %v = tuple ()

test/SILOptimizer/copy_propagation_opaque.sil

@@ -394,7 +394,7 @@ bb0(%arg : @owned $T):
 // CHECK-TRACE-LABEL: *** CopyPropagation: testBorrowCopy
 // CHECK-TRACE:  Outer copy          [[OUTERCOPY:%.*]] = copy_value %0 : $T
 // CHECK-TRACE:  Use of outer copy   destroy_value
-// CHECK-TRACE:  Removing   %{{.*}} = copy_value
+// CHECK-TRACE:  Deleting   %{{.*}} = copy_value
 // CHECK-TRACE:  Removing   destroy_value [[OUTERCOPY]] : $T
 // CHECK-TRACE:  Removing   [[OUTERCOPY]] = copy_value %0 : $T
 //

test/SILOptimizer/sil_combine_apply_ossa.sil

@@ -1,4 +1,6 @@
-// RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -sil-combine-disable-alloc-stack-opts | %FileCheck %s
+// RUN: %target-sil-opt -enable-ossa-modules -enable-sil-verify-all %s -sil-combine -sil-combine-disable-alloc-stack-opts | %FileCheck %s
+
+// -enable-ossa-modules happens to enable copy propagation during sil-combine, which these tests rely on.
 
 import Swift
 import Builtin
@@ -516,10 +518,10 @@ sil [ossa] @guaranteed_closure : $@convention(thin) (@guaranteed C) -> ()
 
 // CHECK-LABEL: sil [ossa] @test_guaranteed_closure
 // CHECK: bb0([[ARG:%.*]] : @guaranteed $C):
-// CHECK: [[ARG_COPY:%.*]] = copy_value [[ARG]]
 // CHECK: [[F:%.*]] = function_ref @guaranteed_closure
+// CHECK: [[ARG_COPY:%.*]] = copy_value [[ARG]]
 // CHECK: [[C:%.*]] = partial_apply [callee_guaranteed] [[F]]([[ARG_COPY]])
-// CHECK: apply [[F]]([[ARG]])
+// CHECK: apply [[F]](%0)
 // Don't release the closure context -- it is @callee_guaranteed.
 // CHECK-NOT: destroy_value [[C]] : $@callee_guaranteed () -> ()
 // CHECK-NOT: destroy_value [[C]] : $@callee_guaranteed () -> ()