[Test] Adapted tests to CopyPropagation changes.

Author: nate-chandler

test/SILOptimizer/copy_propagation_borrow.sil

@@ -24,6 +24,7 @@ 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] @accessRawP : $@convention(method) (Builtin.RawPointer) -> ()
+sil [ossa] @synchronization_point : $@convention(thin) () -> ()
 
 struct NativeObjectPair {
   var obj1 : Builtin.NativeObject
@@ -329,7 +330,8 @@ bb0(%0 : @owned $C):
   %copy3 = copy_value %borrow : $C
   %copy4 = copy_value %borrow : $C
   // Force the borrow not to be eliminated early.
-  %call0 = apply %fguaranteed(%borrow) : $@convention(thin) (@guaranteed C) -> ()
+  %synchronization_point = function_ref @synchronization_point : $@convention(thin) () -> ()
+  %synchronized = apply %synchronization_point() : $@convention(thin) () -> ()
   end_borrow %borrow : $C
   cond_br undef, bb1, bb2
 bb1:
@@ -421,7 +423,9 @@ bb0:
 //
 // CHECK-LABEL: sil [ossa] @testInterleavedBorrowCrossBlock : $@convention(thin) () -> @owned C {
 // CHECK:        [[ALLOC:%.*]] = alloc_ref $C
-// CHECK:        apply %{{.*}}([[ALLOC]]) : $@convention(thin) (@guaranteed C) -> ()
+// CHECK:        [[B1:%.*]] = begin_borrow [[ALLOC]]
+// CHECK:        apply %{{.*}}([[B1]]) : $@convention(thin) (@guaranteed C) -> ()
+// CHECK-NEXT:   end_borrow [[B1]] : $C
 // CHECK-NEXT:   cond_br undef, bb1, bb2
 // CHECK:      bb1:
 // CHECK:        apply %{{.*}}([[ALLOC]]) : $@convention(thin) (@guaranteed C) -> ()
@@ -507,8 +511,8 @@ bb3:
 // CHECK-LABEL: sil [ossa] @testEscapingForward : $@convention(method) (@guaranteed HasObject) -> () {
 // CHECK:   begin_borrow %0 : $HasObject
 // CHECK:   copy_value
-// CHECK:   end_borrow
 // CHECK:   destructure_struct
+// CHECK:   end_borrow
 // CHECK:   ref_to_unmanaged
 // CHECK:   destroy_value
 // CHECK-LABEL: } // end sil function 'testEscapingForward'
@@ -748,15 +752,18 @@ bb3(%borrow3 : @guaranteed $C, %copy3 : @owned $C):
 
 // Test conversion from struct_extract to destructure.
 //
+// TODO: The redundant borrow scope should be removed by a SemanticARC pass.
+//
 // CHECK-LABEL: sil [ossa] @testDestructureConversion : $@convention(thin) (@owned Wrapper) -> () {
 // CHECK: bb0(%0 : @owned $Wrapper):
 // CHECK-NOT: copy
-// CHECK:   [[SPLIT:%.*]] = destructure_struct %0 : $Wrapper
+// CHECK:   [[BORROW:%.*]] = begin_borrow %0 : $Wrapper
+// CHECK:   [[SPLIT:%.*]] = destructure_struct [[BORROW]] : $Wrapper
 // CHECK:   [[BORROWINNER:%.*]] = begin_borrow [[SPLIT]] : $HasObjectAndInt
 // CHECK:   debug_value [[BORROWINNER]] : $HasObjectAndInt, let, name "self", argno 1
 // CHECK:   struct_extract [[BORROWINNER]] : $HasObjectAndInt, #HasObjectAndInt.value
 // CHECK:   end_borrow [[BORROWINNER]] : $HasObjectAndInt
-// CHECK:   destroy_value [[SPLIT]] : $HasObjectAndInt
+// CHECK:   destroy_value %0 : $Wrapper
 // CHECK-LABEL: } // end sil function 'testDestructureConversion'
 sil [ossa] @testDestructureConversion : $@convention(thin) (@owned Wrapper) -> () {
 bb0(%0 : @owned $Wrapper):
@@ -950,13 +957,17 @@ bb0(%0 : @owned $HasObjectAndInt):
 
 // Test removing copies within an outer borrow scope with no outer uses.
 //
+// TODO: The redundant borrow scope should be removed by a SemanticARC pass.
+//
 // CHECK-LABEL: sil [ossa] @testBorrowCopy : $@convention(thin) (@guaranteed C) -> Int64 {
 // CHECK: bb0(%0 : @guaranteed $C):
 // CHECK-NEXT:  %1 = begin_borrow %0 : $C
-// CHECK-NEXT:  %2 = ref_element_addr %1 : $C, #C.a
-// CHECK-NEXT:  %3 = load [trivial] %2 : $*Int64
+// CHECK-NEXT:  %2 = begin_borrow %1 : $C
+// CHECK-NEXT:  %3 = ref_element_addr %2 : $C, #C.a
+// CHECK-NEXT:  %4 = load [trivial] %3 : $*Int64
+// CHECK-NEXT:  end_borrow %2 : $C
 // CHECK-NEXT:  end_borrow %1 : $C
-// CHECK-NEXT:  return %3 : $Int64
+// CHECK-NEXT:  return %4 : $Int64
 // CHECK-LABEL: } // end sil function 'testBorrowCopy'
 sil [ossa] @testBorrowCopy : $@convention(thin) (@guaranteed C) -> Int64 {
 bb0(%0 : @guaranteed $C):

test/SILOptimizer/copy_propagation_opaque.sil

@@ -392,11 +392,9 @@ 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:  Deleting   %{{.*}} = copy_value
-// CHECK-TRACE:  Removing   destroy_value [[OUTERCOPY]] : $T
-// CHECK-TRACE:  Removing   [[OUTERCOPY]] = copy_value %0 : $T
+// CHECK-TRACE:        Canonicalizing: %0 = argument of bb0 : $T
+// CHECK-TRACE:        Removing   destroy_value [[REGISTER_1:%[^,]+]] : $T
+// CHECK-TRACE:        Removing   [[REGISTER_1]] = copy_value %0 : $T
 //
 // CHECK-LABEL: sil [ossa] @testBorrowCopy : $@convention(thin) <T> (@in T) -> () {
 // CHECK-LABEL: bb0(%0 : @owned $T):
@@ -416,11 +414,10 @@ bb0(%0 : @owned $T):
 }
 
 // CHECK-TRACE-LABEL: *** CopyPropagation: testCopyBorrow
-// CHECK-TRACE-NOT: Removing
 //
 // CHECK-LABEL: sil [ossa] @testCopyBorrow : $@convention(thin) <T> (@in T) -> () {
 // CHECK:       bb0(%0 : @owned $T):
-// CHECK-NEXT:  destroy_value %0 : $T
+// CHECK:       destroy_value %0 : $T
 // CHECK-NEXT:  tuple
 // CHECK-NEXT:  return
 // CHECK-LABEL: } // end sil function 'testCopyBorrow'