Fix test SILOpt test cases for edge splitting.

Author: atrick

test/SILOptimizer/abcopts.sil

@@ -609,17 +609,15 @@ bb2:
 
 // HOIST-LABEL: sil @hoist_rangechecked
 // HOIST: bb0
-// HOIST:  cond_br {{.*}}, bb1{{.*}}, bb2
+// HOIST:  cond_br {{.*}}, bb2, bb1
 // HOIST: bb1:
-// HOIST: br bb6
-// HOIST: bb2:
 // HOIST:   [[CB:%[0-9]+]] = function_ref @checkbounds
 // HOIST:    apply [[CB]]
 // HOIST:   br bb3{{.*}}
 // HOIST: bb3{{.*}}:
 // HOIST-NOT: function_ref @checkbounds
 // HOIST-NOT:    apply [[CB]]
-// HOIST:   cond_br {{.*}}, bb5{{.*}}, bb4{{.*}}
+// HOIST:   cond_br {{.*}}, bb5, bb4
 // HOIST: bb4
 // HOIST:   br bb3
 // HOIST: bb5
@@ -671,17 +669,15 @@ bb3:
 
 // HOIST-LABEL: sil @hoist_rangechecked_ref_tail_addr
 // HOIST: bb0
-// HOIST:  cond_br {{.*}}, bb1{{.*}}, bb2
+// HOIST:  cond_br {{.*}}, bb2, bb1
 // HOIST: bb1:
-// HOIST: br bb6
-// HOIST: bb2:
 // HOIST:   [[CB:%[0-9]+]] = function_ref @checkbounds
 // HOIST:    apply [[CB]]
 // HOIST:   br bb3{{.*}}
 // HOIST: bb3{{.*}}:
 // HOIST-NOT: function_ref @checkbounds
 // HOIST-NOT:    apply [[CB]]
-// HOIST:   cond_br {{.*}}, bb5{{.*}}, bb4{{.*}}
+// HOIST:   cond_br {{.*}}, bb5, bb4
 // HOIST: bb4
 // HOIST:   br bb3
 // HOIST: bb5
@@ -818,17 +814,15 @@ bb2:
 
 // HOIST-LABEL: sil @hoist_rangechecked_addr_proj_store
 // HOIST: bb0
-// HOIST:  cond_br {{.*}}, bb1{{.*}}, bb2
+// HOIST:  cond_br {{.*}}, bb2, bb1
 // HOIST: bb1:
-// HOIST:  br bb6
-// HOIST: bb2:
 // HOIST:   [[CB:%[0-9]+]] = function_ref @checkbounds
 // HOIST:    apply [[CB]]
 // HOIST:   br bb3{{.*}}
 // HOIST: bb3{{.*}}:
 // HOIST-NOT: function_ref @checkbounds
 // HOIST-NOT:    apply [[CB]]
-// HOIST:   cond_br {{.*}}, bb5{{.*}}, bb4{{.*}}
+// HOIST:   cond_br {{.*}}, bb5, bb4
 // HOIST: bb4
 // HOIST:   br bb3
 // HOIST: bb5
@@ -882,17 +876,15 @@ bb3:
 
 // HOIST-LABEL: hoist_inclusive_rangechecked
 // HOIST: bb0
-// HOIST:  cond_br {{.*}}, bb1{{.*}}, bb2
+// HOIST:  cond_br {{.*}}, bb2, bb1
 // HOIST: bb1:
-// HOIST:  br bb6
-// HOIST: bb2:
 // HOIST:   [[CB:%[0-9]+]] = function_ref @checkbounds
 // HOIST:    apply [[CB]]
 // HOIST:   br bb3{{.*}}
 // HOIST: bb3{{.*}}:
 // HOIST-NOT: function_ref @checkbounds
 // HOIST-NOT:    apply [[CB]]
-// HOIST:   cond_br {{.*}}, bb5{{.*}}, bb4{{.*}}
+// HOIST:   cond_br {{.*}}, bb5, bb4
 // HOIST: bb4:
 // HOIST:  br bb3
 // HOIST: bb5:
@@ -944,16 +936,15 @@ bb3:
 /// Don't hoist arrays that are variant.
 // HOIST-LABEL: dont_hoist_variant_array
 // HOIST: bb0
-// HOIST:  cond_br {{.*}}, bb1{{.*}}, bb2
+// HOIST:  cond_br {{.*}}, bb2, bb1
 // HOIST: bb1:
-// HOIST:  br bb6
+// HOIST-NEXT:  br bb3
 // HOIST: bb2:
-// HOIST-NOT:   function_ref @checkbounds
-// HOIST:   br bb3{{.*}}
+// HOIST-NEXT:  br bb6
 // HOIST: bb3{{.*}}:
 // HOIST:   [[CB:%[0-9]+]] = function_ref @checkbounds
 // HOIST:  apply [[CB]]
-// HOIST:  cond_br {{.*}}, bb5{{.*}}, bb4{{.*}}
+// HOIST:  cond_br {{.*}}, bb5, bb4
 // HOIST: bb4:
 // HOIST:  br bb3
 // HOIST: bb5:

test/SILOptimizer/arcsequenceopts_knownsafebugs_loop.sil

@@ -202,10 +202,10 @@ bb2:
 // CHECK-LABEL: sil hidden @$unmatched_rr_loop_early_exit :
 // CHECK: bb1
 // CHECK:   strong_release %0 : $Cls
-// CHECK:   cond_br undef, bb3, bb2
-// CHECK: bb3:
+// CHECK:   cond_br undef, bb2, bb3
+// CHECK: bb2:
 // CHECK:   strong_retain %0 : $Cls
-// CHECK:   cond_br undef, bb1, bb4
+// CHECK:   cond_br undef, bb1, bb3
 // CHECK-LABEL: } // end sil function '$unmatched_rr_loop_early_exit'
 sil hidden @$unmatched_rr_loop_early_exit : $@convention(thin) (@owned Cls) -> () {
 bb0(%0 : $Cls):
@@ -233,10 +233,10 @@ bb3:
 // CHECK-LABEL: sil hidden @$matched_rr_loop_early_exit :
 // CHECK: bb1
 // CHECK:   strong_retain %0 : $Cls
-// CHECK:   cond_br undef, bb3, bb2
-// CHECK: bb3:
+// CHECK:   cond_br undef, bb2, bb3
+// CHECK: bb2:
 // CHECK:   strong_release %0 : $Cls
-// CHECK:   cond_br undef, bb1, bb4
+// CHECK:   cond_br undef, bb1, bb3
 // CHECK-LABEL: } // end sil function '$matched_rr_loop_early_exit'
 sil hidden @$matched_rr_loop_early_exit : $@convention(thin) (@owned Cls) -> () {
 bb0(%0 : $Cls):