[cast-opt] Fix up the tests for differences from master -> 5.1.

Author: gottesmm

test/SILOptimizer/constant_propagation_objc.sil

@@ -33,6 +33,9 @@ sil @guaranteed_swift_array_user : $@convention(thin) <τ_0_0> (@guaranteed Arra
 //
 // CHECK: [[FAIL_BB:bb[0-9]+]]:
 // CHECK-NEXT:   dealloc_stack [[CAST_TMP:%.*]]
+// CHECK-NEXT:   br [[NEXT:bb[0-9]+]]
+//
+// CHECK: [[NEXT]]:
 // CHECK-NEXT:   dealloc_stack [[OUTPUT]]
 // CHECK-NEXT:   destroy_addr [[INPUT]]
 // CHECK-NEXT:   dealloc_stack [[INPUT]]
@@ -43,9 +46,9 @@ sil @guaranteed_swift_array_user : $@convention(thin) <τ_0_0> (@guaranteed Arra
 //
 // CHECK: [[BRIDGE_BB]]([[INPUT_VALUE:%.*]] : $NSArray):
 // CHECK:   [[CAST_TMP:%.*]] = alloc_stack $Optional<Array<String>>
-// CHECK:   strong_retain [[INPUT_VALUE]]
+// CHECK:   retain_value [[INPUT_VALUE]]
 // CHECK:   apply {{%.*}}<Array<String>>([[CAST_TMP]], [[INPUT_VALUE]],
-// CHECK:   strong_release [[INPUT_VALUE]]
+// CHECK:   release_value [[INPUT_VALUE]]
 // CHECK:   switch_enum_addr [[CAST_TMP]] : $*Optional<Array<String>>, case #Optional.none!enumelt: [[FAIL_BB]], default [[SUCCESS_TRAMPOLINE_BB:bb[0-9]+]]
 //
 // CHECK: [[SUCCESS_TRAMPOLINE_BB]]:
@@ -103,6 +106,9 @@ bb4:
 //
 // CHECK: [[FAIL_BB:bb[0-9]+]]:
 // CHECK-NEXT:   dealloc_stack [[CAST_TMP:%.*]]
+// CHECK-NEXT:   br [[FAIL_NEXT:bb[0-9]+]]
+//
+// CHECK: [[FAIL_NEXT]]:
 // CHECK-NEXT:   dealloc_stack [[OUTPUT]]
 // CHECK-NEXT:   destroy_addr [[INPUT]]
 // CHECK-NEXT:   dealloc_stack [[INPUT]]
@@ -113,9 +119,9 @@ bb4:
 //
 // CHECK: [[BRIDGE_BB]]([[INPUT_VALUE]] : $NSArray):
 // CHECK:   [[CAST_TMP:%.*]] = alloc_stack $Optional<Array<String>>
-// CHECK:   strong_retain [[INPUT_VALUE]]
+// CHECK:   retain_value [[INPUT_VALUE]]
 // CHECK:   apply {{%.*}}<Array<String>>([[CAST_TMP]], [[INPUT_VALUE]],
-// CHECK:   strong_release [[INPUT_VALUE]]
+// CHECK:   release_value [[INPUT_VALUE]]
 // NOTE: In contrast to with take_always, the release_value is above in SUCCESS_BLOCK
 // CHECK:   switch_enum_addr [[CAST_TMP]] : $*Optional<Array<String>>, case #Optional.none!enumelt: [[FAIL_BB]], default [[SUCCESS_TRAMPOLINE_BB:bb[0-9]+]]
 //
@@ -172,6 +178,9 @@ bb4:
 //
 // CHECK: [[FAIL_BB:bb[0-9]+]]:
 // CHECK-NEXT:   dealloc_stack [[CAST_TMP:%.*]]
+// CHECK-NEXT:   br [[FAIL_NEXT:bb[0-9]+]]
+//
+// CHECK: [[FAIL_NEXT]]:
 // CHECK-NEXT:   dealloc_stack [[OUTPUT]]
 // CHECK-NEXT:   dealloc_stack [[INPUT]]
 // CHECK-NEXT:   br [[EXIT_BB]]
@@ -181,9 +190,9 @@ bb4:
 //
 // CHECK: [[BRIDGE_BB]]([[INPUT_VALUE:%.*]] : $NSArray):
 // CHECK:   [[CAST_TMP:%.*]] = alloc_stack $Optional<Array<String>>
-// CHECK:   strong_retain [[INPUT_VALUE]]
+// CHECK:   retain_value [[INPUT_VALUE]]
 // CHECK:   apply {{%.*}}<Array<String>>([[CAST_TMP]], [[INPUT_VALUE]],
-// CHECK:   strong_release [[INPUT_VALUE]]
+// CHECK:   release_value [[INPUT_VALUE]]
 // NOTE: When we perform take_always, this is the take of the cast.
 // CHECK:   release_value [[INPUT_VALUE]]
 // CHECK:   switch_enum_addr [[CAST_TMP]] : $*Optional<Array<String>>, case #Optional.none!enumelt: [[FAIL_BB]], default [[SUCCESS_TRAMPOLINE_BB:bb[0-9]+]]