Update unit tests for fixed borrowed-from ownership and liveness.

Author: atrick

test/SILOptimizer/copy_propagation.sil

@@ -1,5 +1,5 @@
-// RUN: %target-sil-opt -sil-print-types -update-borrowed-from -copy-propagation -canonical-ossa-rewrite-borrows -enable-sil-verify-all %s | %FileCheck %s --check-prefixes=CHECK,CHECK-OPT
-// RUN: %target-sil-opt -sil-print-types -update-borrowed-from -mandatory-copy-propagation -canonical-ossa-rewrite-borrows -enable-sil-verify-all %s | %FileCheck %s --check-prefixes=CHECK,CHECK-ONONE
+// RUN: %target-sil-opt -sil-print-types -update-borrowed-from -copy-propagation -canonical-ossa-rewrite-borrows -enable-sil-verify-all %s | %FileCheck %s --check-prefixes=CHECK
+// RUN: %target-sil-opt -sil-print-types -update-borrowed-from -mandatory-copy-propagation -canonical-ossa-rewrite-borrows -enable-sil-verify-all %s | %FileCheck %s --check-prefixes=CHECK
 
 // REQUIRES: asserts
 
@@ -836,14 +836,16 @@ bb4:
   return %v : $()
 }
 
-// Test a dead begin_borrow (with no scope ending uses). Make sure
-// copy-propagation doesn't end the lifetime before the dead borrow.
+// Test a dead begin_borrow (with no scope ending uses).
+//
+// TODO: with lifetime completion, both copies should be deleted.
 //
 // CHECK-LABEL: sil hidden [ossa] @testDeadBorrow : {{.*}} {
 // CHECK: bb0:
-// CHECK-NOT: copy_value
-// CHECK:   begin_borrow
+// CHECK:   copy_value
 // CHECK:   destroy_value
+// CHECK:   copy_value
+// CHECK:   begin_borrow
 // CHECK:   unreachable
 // CHECK-LABEL: } // end sil function 'testDeadBorrow'
 sil hidden [ossa] @testDeadBorrow : $@convention(thin) () -> () {

test/SILOptimizer/liveness_unit.sil

@@ -258,9 +258,9 @@ bb3(%phi : @guaranteed $D):
 // CHECK-NEXT: Incomplete liveness: Reborrowed inner scope
 // CHECK-NEXT: bb0: LiveOut
 // CHECK-NEXT: bb1: LiveWithin
-// CHECK-NEXT: regular user:   %7 = borrowed %4 : $C from (%0 : $C)
-// CHECK-NEXT: regular user:   br bb1(%1 : $C, %2 : $PairC)
-// CHECK-NEXT: last user:   %7 = borrowed %4 : $C from (%0 : $C)
+// CHECK-NEXT: regular user:   end_borrow %{{.*}} : $C
+// CHECK-NEXT: regular user:   br bb1(%{{.*}} : $C, %{{.*}} : $PairC)
+// CHECK-NEXT: last user:   end_borrow %{{.*}} : $C
 // CHECK-NEXT: end running
 sil [ossa] @testSSAInnerReborrowedPhi : $@convention(thin) (@guaranteed C) -> () {
 bb0(%0 : @guaranteed $C):

test/SILOptimizer/sil_combine_ossa.sil

@@ -4932,16 +4932,14 @@ bb0(%0 : @guaranteed $_ContiguousArrayBuffer<Element>):
 }
 
 // CHECK-LABEL: sil [ossa] @cowbuffer_reading_no_lookthrough_reborrow : $@convention(method) <Element> (@guaranteed _ContiguousArrayBuffer<Element>) -> MyInt {
-// CHECK-NOT: ref_element_addr [immutable]
-// CHECK-NOT: ref_tail_addr [immutable]
+//
+// After updating with borrowed-from instructions, the ref_element_addr's can all be promoted without looking through
+// reborrows because they are reachable from the borrowed-from.
+//
 // CHECK-NOT: builtin "COWBufferForReading"
-// CHECK: ref_element_addr %
-// CHECK-NOT: ref_element_addr [immutable]
-// CHECK-NOT: ref_tail_addr [immutable]
+// CHECK: ref_element_addr [immutable]
 // CHECK-NOT: builtin "COWBufferForReading"
-// CHECK: ref_tail_addr %
-// CHECK-NOT: ref_element_addr [immutable]
-// CHECK-NOT: ref_tail_addr [immutable]
+// CHECK: ref_tail_addr [immutable] %
 // CHECK-NOT: builtin "COWBufferForReading"
 // CHECK: } // end sil function 'cowbuffer_reading_no_lookthrough_reborrow'
 sil [ossa] @cowbuffer_reading_no_lookthrough_reborrow : $@convention(method) <Element> (@guaranteed _ContiguousArrayBuffer<Element>) -> MyInt {