[Test] Backport SIL test to 6.1.

On main type annotations are not always required but on 6.1 they are.

Author: nate-chandler

test/SILOptimizer/canonicalize_ossa_lifetime_unit.sil

@@ -162,9 +162,9 @@ exit(%phi : @owned $C, %typhi : $S):
 sil @empty : $@convention(thin) () -> () {
 [global: ]
 bb0:
-  %0 = tuple ()                                   
-  return %0 : $()                                 
-} 
+  %0 = tuple ()
+  return %0 : $()
+}
 
 // Even though the apply of %empty is not a deinit barrier, verify that the
 // destroy is not hoisted, because MoS is move-only.
@@ -568,16 +568,16 @@ entry(%c1 : @owned $C):
 // CHECK:       bb0([[C1:%[^,]+]] : @owned $C):
 // CHECK:         [[TAKE_C:%[^,]+]] = function_ref @takeC
 // CHECK:         [[BARRIER:%[^,]+]] = function_ref @barrier
-// CHECK:         cond_br undef, [[LEFT]], [[RIGHT]]                         
-// CHECK:       [[LEFT]]:                                              
+// CHECK:         cond_br undef, [[LEFT]], [[RIGHT]]
+// CHECK:       [[LEFT]]:
 // CHECK:         [[M:%[^,]+]] = move_value [[C1]]
 // CHECK:         apply [[TAKE_C]]([[M]])
-// CHECK:         br [[EXIT]]                                          
-// CHECK:       [[RIGHT]]:                                              
+// CHECK:         br [[EXIT]]
+// CHECK:       [[RIGHT]]:
 // CHECK:         apply [[BARRIER]]()
 // CHECK:         destroy_value [[C1]]
-// CHECK:         br [[EXIT]]                                          
-// CHECK:       [[EXIT]]:                                              
+// CHECK:         br [[EXIT]]
+// CHECK:       [[EXIT]]:
 // CHECK:         apply [[BARRIER]]()
 // CHECK-LABEL: } // end sil function 'lexical_end_at_end_2'
 // CHECK-LABEL: end running test {{.*}} on lexical_end_at_end_2: canonicalize_ossa_lifetime
@@ -858,6 +858,7 @@ exit:
   return %retval : $()
 }
 
+
 // CHECK-LABEL: begin running test {{.*}} on consume_copy_before_use_in_dead_end
 // CHECK-LABEL: sil [ossa] @consume_copy_before_use_in_dead_end : {{.*}} {
 // CHECK-NOT:     destroy_value [dead_end]
@@ -868,19 +869,19 @@ entry(%c : @owned $C):
   cond_br undef, exit, die
 
 exit:
-  destroy_value %c
+  destroy_value %c : $C
   %retval = tuple ()
-  return %retval
+  return %retval : $()
 
 die:
-  %move = move_value [lexical] %c
-  %copy = copy_value %move
+  %move = move_value [lexical] %c : $C
+  %copy = copy_value %move : $C
   specify_test "canonicalize_ossa_lifetime true false true %move"
   apply undef(%move) : $@convention(thin) (@owned C) -> ()
   %addr = alloc_stack $C
-  %token = store_borrow %copy to %addr
+  %token = store_borrow %copy to %addr : $*C
   apply undef() : $@convention(thin) () -> ()
-  %reload = load_borrow %token
+  %reload = load_borrow %token : $*C
   apply undef(%reload) : $@convention(thin) (@guaranteed C) -> ()
   unreachable
 }