Index: llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll
===================================================================
--- llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll
+++ llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll
@@ -11,37 +11,37 @@
 ; CHECK-LABEL: @func(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[CMP4:%.*]] = icmp eq i64 [[LIMIT:%.*]], 0
-; CHECK-NEXT:    br i1 [[CMP4]], label [[FOR_COND_CLEANUP:%.*]], label [[FOR_BODY_LR_PH:%.*]]
-; CHECK:       for.body.lr.ph:
+; CHECK-NEXT:    br i1 [[CMP4]], label %[[FOR_COND_CLEANUP:.*]], label %[[FOR_BODY_LR_PH:.*]]
+; CHECK:       [[FOR_BODY_LR_PH]]:
 ; CHECK-NEXT:    [[CONV:%.*]] = and i64 [[BLAH:%.*]], 4294967295
 ; CHECK-NEXT:    [[TMP0:%.*]] = add i64 [[LIMIT]], -1
 ; CHECK-NEXT:    [[XTRAITER:%.*]] = and i64 [[LIMIT]], 7
 ; CHECK-NEXT:    [[TMP1:%.*]] = icmp ult i64 [[TMP0]], 7
-; CHECK-NEXT:    br i1 [[TMP1]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:%.*]], label [[FOR_BODY_LR_PH_NEW:%.*]]
-; CHECK:       for.body.lr.ph.new:
+; CHECK-NEXT:    br i1 [[TMP1]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:.*]], label %[[FOR_BODY_LR_PH_NEW:.*]]
+; CHECK:       [[FOR_BODY_LR_PH_NEW]]:
 ; CHECK-NEXT:    [[UNROLL_ITER:%.*]] = sub i64 [[LIMIT]], [[XTRAITER]]
-; CHECK-NEXT:    br label [[FOR_BODY:%.*]]
-; CHECK:       for.cond.cleanup.loopexit.unr-lcssa:
-; CHECK-NEXT:    [[ADD_LCSSA_PH:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH]] ], [ [[ADD_7:%.*]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[K_05_UNR:%.*]] = phi i64 [ 1, [[FOR_BODY_LR_PH]] ], [ [[AND:%.*]], [[FOR_BODY]] ]
+; CHECK-NEXT:    br label %[[FOR_BODY:.*]]
+; CHECK:       [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]]:
+; CHECK-NEXT:    [[ADD_LCSSA_PH:%.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH]] ], [ [[ADD_7:%.*]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    [[K_05_UNR:%.*]] = phi i64 [ 1, %[[FOR_BODY_LR_PH]] ], [ [[AND:%.*]], %[[FOR_BODY]] ]
 ; CHECK-NEXT:    [[LCMP_MOD:%.*]] = icmp eq i64 [[XTRAITER]], 0
-; CHECK-NEXT:    br i1 [[LCMP_MOD]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL:%.*]]
-; CHECK:       for.body.epil:
-; CHECK-NEXT:    [[G_06_EPIL:%.*]] = phi i64 [ [[ADD_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; CHECK-NEXT:    [[K_05_EPIL:%.*]] = phi i64 [ [[AND_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[K_05_UNR]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; CHECK-NEXT:    [[EPIL_ITER:%.*]] = phi i64 [ [[EPIL_ITER_SUB:%.*]], [[FOR_BODY_EPIL]] ], [ [[XTRAITER]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; CHECK-NEXT:    br i1 [[LCMP_MOD]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL:.*]]
+; CHECK:       [[FOR_BODY_EPIL]]:
+; CHECK-NEXT:    [[G_06_EPIL:%.*]] = phi i64 [ [[ADD_EPIL:%.*]], %[[FOR_BODY_EPIL]] ], [ [[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; CHECK-NEXT:    [[K_05_EPIL:%.*]] = phi i64 [ [[AND_EPIL:%.*]], %[[FOR_BODY_EPIL]] ], [ [[K_05_UNR]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; CHECK-NEXT:    [[EPIL_ITER:%.*]] = phi i64 [ [[EPIL_ITER_SUB:%.*]], %[[FOR_BODY_EPIL]] ], [ [[XTRAITER]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
 ; CHECK-NEXT:    [[AND_EPIL]] = and i64 [[CONV]], [[K_05_EPIL]]
 ; CHECK-NEXT:    [[ADD_EPIL]] = add i64 [[AND_EPIL]], [[G_06_EPIL]]
 ; CHECK-NEXT:    [[EPIL_ITER_SUB]] = add i64 [[EPIL_ITER]], -1
 ; CHECK-NEXT:    [[EPIL_ITER_CMP:%.*]] = icmp eq i64 [[EPIL_ITER_SUB]], 0
-; CHECK-NEXT:    br i1 [[EPIL_ITER_CMP]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL]], !llvm.loop !0
-; CHECK:       for.cond.cleanup:
-; CHECK-NEXT:    [[G_0_LCSSA:%.*]] = phi i64 [ undef, [[ENTRY:%.*]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ [[ADD_EPIL]], [[FOR_BODY_EPIL]] ]
+; CHECK-NEXT:    br i1 [[EPIL_ITER_CMP]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL]], !llvm.loop !0
+; CHECK:       [[FOR_COND_CLEANUP]]:
+; CHECK-NEXT:    [[G_0_LCSSA:%.*]] = phi i64 [ undef, [[ENTRY:%.*]] ], [ [[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ [[ADD_EPIL]], %[[FOR_BODY_EPIL]] ]
 ; CHECK-NEXT:    ret i64 [[G_0_LCSSA]]
-; CHECK:       for.body:
-; CHECK-NEXT:    [[G_06:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH_NEW]] ], [ [[ADD_7]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[K_05:%.*]] = phi i64 [ 1, [[FOR_BODY_LR_PH_NEW]] ], [ [[AND]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[NITER:%.*]] = phi i64 [ [[UNROLL_ITER]], [[FOR_BODY_LR_PH_NEW]] ], [ [[NITER_NSUB_7:%.*]], [[FOR_BODY]] ]
+; CHECK:       [[FOR_BODY]]:
+; CHECK-NEXT:    [[G_06:%.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH_NEW]] ], [ [[ADD_7]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    [[K_05:%.*]] = phi i64 [ 1, %[[FOR_BODY_LR_PH_NEW]] ], [ [[AND]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    [[NITER:%.*]] = phi i64 [ [[UNROLL_ITER]], %[[FOR_BODY_LR_PH_NEW]] ], [ [[NITER_NSUB_7:%.*]], %[[FOR_BODY]] ]
 ; CHECK-NEXT:    [[AND]] = and i64 [[CONV]], [[K_05]]
 ; CHECK-NEXT:    [[ADD:%.*]] = add i64 [[AND]], [[G_06]]
 ; CHECK-NEXT:    [[ADD_1:%.*]] = add i64 [[AND]], [[ADD]]
@@ -53,43 +53,43 @@
 ; CHECK-NEXT:    [[ADD_7]] = add i64 [[AND]], [[ADD_6]]
 ; CHECK-NEXT:    [[NITER_NSUB_7]] = add i64 [[NITER]], -8
 ; CHECK-NEXT:    [[NITER_NCMP_7:%.*]] = icmp eq i64 [[NITER_NSUB_7]], 0
-; CHECK-NEXT:    br i1 [[NITER_NCMP_7]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label [[FOR_BODY]]
+; CHECK-NEXT:    br i1 [[NITER_NCMP_7]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label %[[FOR_BODY]]
 ;
 ; NPM-LABEL: @func(
 ; NPM-NEXT:  entry:
 ; NPM-NEXT:    [[CMP4:%.*]] = icmp eq i64 [[LIMIT:%.*]], 0
-; NPM-NEXT:    br i1 [[CMP4]], label [[FOR_COND_CLEANUP:%.*]], label [[FOR_BODY_LR_PH:%.*]]
-; NPM:       for.body.lr.ph:
+; NPM-NEXT:    br i1 [[CMP4]], label %[[FOR_COND_CLEANUP:.*]], label %[[FOR_BODY_LR_PH:.*]]
+; NPM:       [[FOR_BODY_LR_PH]]:
 ; NPM-NEXT:    [[CONV:%.*]] = and i64 [[BLAH:%.*]], 4294967295
 ; NPM-NEXT:    [[TMP0:%.*]] = add i64 [[LIMIT]], -1
 ; NPM-NEXT:    [[XTRAITER:%.*]] = and i64 [[LIMIT]], 7
 ; NPM-NEXT:    [[TMP1:%.*]] = icmp ult i64 [[TMP0]], 7
-; NPM-NEXT:    br i1 [[TMP1]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:%.*]], label [[FOR_BODY_LR_PH_NEW:%.*]]
-; NPM:       for.body.lr.ph.new:
+; NPM-NEXT:    br i1 [[TMP1]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:.*]], label %[[FOR_BODY_LR_PH_NEW:.*]]
+; NPM:       [[FOR_BODY_LR_PH_NEW]]:
 ; NPM-NEXT:    [[UNROLL_ITER:%.*]] = sub i64 [[LIMIT]], [[XTRAITER]]
 ; NPM-NEXT:    [[AND_0:%.*]] = and i64 [[CONV]], 1
-; NPM-NEXT:    br label [[FOR_BODY:%.*]]
-; NPM:       for.cond.cleanup.loopexit.unr-lcssa:
-; NPM-NEXT:    [[ADD_LCSSA_PH:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH]] ], [ [[ADD_7:%.*]], [[FOR_BODY]] ]
-; NPM-NEXT:    [[K_05_UNR:%.*]] = phi i64 [ 1, [[FOR_BODY_LR_PH]] ], [ [[AND_PHI:%.*]], [[FOR_BODY]] ]
+; NPM-NEXT:    br label %[[FOR_BODY:.*]]
+; NPM:       [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]]:
+; NPM-NEXT:    [[ADD_LCSSA_PH:%.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH]] ], [ [[ADD_7:%.*]], %[[FOR_BODY]] ]
+; NPM-NEXT:    [[K_05_UNR:%.*]] = phi i64 [ 1, %[[FOR_BODY_LR_PH]] ], [ [[AND_PHI:%.*]], %[[FOR_BODY]] ]
 ; NPM-NEXT:    [[LCMP_MOD:%.*]] = icmp eq i64 [[XTRAITER]], 0
-; NPM-NEXT:    br i1 [[LCMP_MOD]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL:%.*]]
-; NPM:       for.body.epil:
-; NPM-NEXT:    [[G_06_EPIL:%.*]] = phi i64 [ [[ADD_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; NPM-NEXT:    [[K_05_EPIL:%.*]] = phi i64 [ [[AND_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[K_05_UNR]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; NPM-NEXT:    [[EPIL_ITER:%.*]] = phi i64 [ [[EPIL_ITER_SUB:%.*]], [[FOR_BODY_EPIL]] ], [ [[XTRAITER]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; NPM-NEXT:    br i1 [[LCMP_MOD]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL:.*]]
+; NPM:       [[FOR_BODY_EPIL]]:
+; NPM-NEXT:    [[G_06_EPIL:%.*]] = phi i64 [ [[ADD_EPIL:%.*]], %[[FOR_BODY_EPIL]] ], [ [[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; NPM-NEXT:    [[K_05_EPIL:%.*]] = phi i64 [ [[AND_EPIL:%.*]], %[[FOR_BODY_EPIL]] ], [ [[K_05_UNR]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; NPM-NEXT:    [[EPIL_ITER:%.*]] = phi i64 [ [[EPIL_ITER_SUB:%.*]], %[[FOR_BODY_EPIL]] ], [ [[XTRAITER]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
 ; NPM-NEXT:    [[AND_EPIL]] = and i64 [[CONV]], [[K_05_EPIL]]
 ; NPM-NEXT:    [[ADD_EPIL]] = add i64 [[AND_EPIL]], [[G_06_EPIL]]
 ; NPM-NEXT:    [[EPIL_ITER_SUB]] = add i64 [[EPIL_ITER]], -1
 ; NPM-NEXT:    [[EPIL_ITER_CMP:%.*]] = icmp eq i64 [[EPIL_ITER_SUB]], 0
-; NPM-NEXT:    br i1 [[EPIL_ITER_CMP]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL]], !llvm.loop !0
-; NPM:       for.cond.cleanup:
-; NPM-NEXT:    [[G_0_LCSSA:%.*]] = phi i64 [ undef, [[ENTRY:%.*]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ [[ADD_EPIL]], [[FOR_BODY_EPIL]] ]
+; NPM-NEXT:    br i1 [[EPIL_ITER_CMP]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL]], !llvm.loop !0
+; NPM:       [[FOR_COND_CLEANUP]]:
+; NPM-NEXT:    [[G_0_LCSSA:%.*]] = phi i64 [ undef, [[ENTRY:%.*]] ], [ [[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ [[ADD_EPIL]], %[[FOR_BODY_EPIL]] ]
 ; NPM-NEXT:    ret i64 [[G_0_LCSSA]]
-; NPM:       for.body:
-; NPM-NEXT:    [[G_06:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH_NEW]] ], [ [[ADD_7]], [[FOR_BODY_FOR_BODY_CRIT_EDGE:%.*]] ]
-; NPM-NEXT:    [[AND_PHI]] = phi i64 [ [[AND_0]], [[FOR_BODY_LR_PH_NEW]] ], [ [[AND_1:%.*]], [[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
-; NPM-NEXT:    [[NITER:%.*]] = phi i64 [ [[UNROLL_ITER]], [[FOR_BODY_LR_PH_NEW]] ], [ [[NITER_NSUB_7:%.*]], [[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
+; NPM:       [[FOR_BODY]]:
+; NPM-NEXT:    [[G_06:%.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH_NEW]] ], [ [[ADD_7]], %[[FOR_BODY_FOR_BODY_CRIT_EDGE:.*]] ]
+; NPM-NEXT:    [[AND_PHI]] = phi i64 [ [[AND_0]], %[[FOR_BODY_LR_PH_NEW]] ], [ [[AND_1:%.*]], %[[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
+; NPM-NEXT:    [[NITER:%.*]] = phi i64 [ [[UNROLL_ITER]], %[[FOR_BODY_LR_PH_NEW]] ], [ [[NITER_NSUB_7:%.*]], %[[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
 ; NPM-NEXT:    [[ADD:%.*]] = add i64 [[AND_PHI]], [[G_06]]
 ; NPM-NEXT:    [[ADD_1:%.*]] = add i64 [[AND_PHI]], [[ADD]]
 ; NPM-NEXT:    [[ADD_2:%.*]] = add i64 [[AND_PHI]], [[ADD_1]]
@@ -100,10 +100,10 @@
 ; NPM-NEXT:    [[ADD_7]] = add i64 [[AND_PHI]], [[ADD_6]]
 ; NPM-NEXT:    [[NITER_NSUB_7]] = add i64 [[NITER]], -8
 ; NPM-NEXT:    [[NITER_NCMP_7:%.*]] = icmp eq i64 [[NITER_NSUB_7]], 0
-; NPM-NEXT:    br i1 [[NITER_NCMP_7]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label [[FOR_BODY_FOR_BODY_CRIT_EDGE]]
-; NPM:       for.body.for.body_crit_edge:
+; NPM-NEXT:    br i1 [[NITER_NCMP_7]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label %[[FOR_BODY_FOR_BODY_CRIT_EDGE]]
+; NPM:       [[FOR_BODY_FOR_BODY_CRIT_EDGE]]:
 ; NPM-NEXT:    [[AND_1]] = and i64 [[CONV]], [[AND_PHI]]
-; NPM-NEXT:    br label [[FOR_BODY]]
+; NPM-NEXT:    br label %[[FOR_BODY]]
 ;
 entry:
   %blah.addr = alloca i64, align 8