diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 5719cefb42e..cd86f8fc32e 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -3015,7 +3015,6 @@ SDValue SelectionDAG::getNode(unsigned Opcode, DebugLoc DL, EVT VT,
                               SDValue N1, SDValue N2, SDValue N3) {
   // Perform various simplifications.
   ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.getNode());
-  ConstantSDNode *N2C = dyn_cast<ConstantSDNode>(N2.getNode());
   switch (Opcode) {
   case ISD::CONCAT_VECTORS:
     // A CONCAT_VECTOR with all operands BUILD_VECTOR can be simplified to
@@ -3045,12 +3044,6 @@ SDValue SelectionDAG::getNode(unsigned Opcode, DebugLoc DL, EVT VT,
 
     if (N2 == N3) return N2;   // select C, X, X -> X
     break;
-  case ISD::BRCOND:
-    if (N2C) {
-      if (!N2C->getZExtValue()) // Unconditional branch
-        return N1;         // Never-taken branch
-    }
-    break;
   case ISD::VECTOR_SHUFFLE:
     llvm_unreachable("should use getVectorShuffle constructor!");
     break;
diff --git a/test/CodeGen/ARM/reg_sequence.ll b/test/CodeGen/ARM/reg_sequence.ll
index 79ed84f0dff..b00020c3950 100644
--- a/test/CodeGen/ARM/reg_sequence.ll
+++ b/test/CodeGen/ARM/reg_sequence.ll
@@ -250,13 +250,13 @@ define arm_aapcs_vfpcc float @t9(%0* nocapture, %3* nocapture) nounwind {
   br label %8
 
 ; <label>:6                                       ; preds = %8
-  br i1 undef, label %7, label %10
+  br label %7
 
 ; <label>:7                                       ; preds = %6
   br label %8
 
 ; <label>:8                                       ; preds = %7, %2
-  br i1 undef, label %6, label %9
+  br label %6
 
 ; <label>:9                                       ; preds = %8
   ret float undef
diff --git a/test/CodeGen/PowerPC/2010-02-26-FoldFloats.ll b/test/CodeGen/PowerPC/2010-02-26-FoldFloats.ll
deleted file mode 100644
index f43f5cae6e2..00000000000
--- a/test/CodeGen/PowerPC/2010-02-26-FoldFloats.ll
+++ /dev/null
@@ -1,433 +0,0 @@
-; RUN: llc < %s -O3 | FileCheck %s
-target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128-n32"
-target triple = "powerpc-apple-darwin9.6"
-
-; There should be no stfs spills
-; CHECK: main:
-; CHECK-NOT: stfs
-; CHECK: .section
-
-@.str66 = external constant [3 x i8], align 4     ; <[3 x i8]*> [#uses=1]
-@.str31 = external constant [6 x i8], align 4     ; <[6 x i8]*> [#uses=1]
-@.str61 = external constant [21 x i8], align 4    ; <[21 x i8]*> [#uses=1]
-@.str101 = external constant [61 x i8], align 4   ; <[61 x i8]*> [#uses=1]
-@.str104 = external constant [31 x i8], align 4   ; <[31 x i8]*> [#uses=1]
-@.str105 = external constant [45 x i8], align 4   ; <[45 x i8]*> [#uses=1]
-@.str112 = external constant [38 x i8], align 4   ; <[38 x i8]*> [#uses=1]
-@.str121 = external constant [36 x i8], align 4   ; <[36 x i8]*> [#uses=1]
-@.str12293 = external constant [67 x i8], align 4 ; <[67 x i8]*> [#uses=1]
-@.str123 = external constant [68 x i8], align 4   ; <[68 x i8]*> [#uses=1]
-@.str124 = external constant [52 x i8], align 4   ; <[52 x i8]*> [#uses=1]
-@.str125 = external constant [51 x i8], align 4   ; <[51 x i8]*> [#uses=1]
-
-define i32 @main(i32 %argc, i8** %argv) noreturn nounwind {
-entry:
-  br i1 undef, label %bb4.i1, label %my_fopen.exit
-
-bb4.i1:                                           ; preds = %entry
-  unreachable
-
-my_fopen.exit:                                    ; preds = %entry
-  br i1 undef, label %bb.i, label %bb1.i
-
-bb.i:                                             ; preds = %my_fopen.exit
-  unreachable
-
-bb1.i:                                            ; preds = %my_fopen.exit
-  br label %bb134.i
-
-bb2.i:                                            ; preds = %bb134.i
-  %0 = icmp eq i32 undef, 0                       ; <i1> [#uses=1]
-  br i1 %0, label %bb20.i, label %bb21.i
-
-bb20.i:                                           ; preds = %bb2.i
-  br label %bb134.i
-
-bb21.i:                                           ; preds = %bb2.i
-  %1 = call i32 @strcmp(i8* undef, i8* getelementptr inbounds ([6 x i8]* @.str31, i32 0, i32 0)) nounwind readonly ; <i32> [#uses=0]
-  br i1 undef, label %bb30.i, label %bb31.i
-
-bb30.i:                                           ; preds = %bb21.i
-  br label %bb134.i
-
-bb31.i:                                           ; preds = %bb21.i
-  br i1 undef, label %bb41.i, label %bb44.i
-
-bb41.i:                                           ; preds = %bb31.i
-  %2 = icmp slt i32 undef, %argc                  ; <i1> [#uses=1]
-  br i1 %2, label %bb1.i77.i, label %bb2.i78.i
-
-bb1.i77.i:                                        ; preds = %bb41.i
-  %3 = load float* undef, align 4                 ; <float> [#uses=2]
-  %4 = fcmp ugt float %3, 0.000000e+00            ; <i1> [#uses=1]
-  br i1 %4, label %bb43.i, label %bb42.i
-
-bb2.i78.i:                                        ; preds = %bb41.i
-  unreachable
-
-bb42.i:                                           ; preds = %bb1.i77.i
-  unreachable
-
-bb43.i:                                           ; preds = %bb1.i77.i
-  br label %bb134.i
-
-bb44.i:                                           ; preds = %bb31.i
-  br i1 undef, label %bb45.i, label %bb49.i
-
-bb45.i:                                           ; preds = %bb44.i
-  %5 = icmp slt i32 undef, %argc                  ; <i1> [#uses=1]
-  br i1 %5, label %bb1.i72.i, label %bb2.i73.i
-
-bb1.i72.i:                                        ; preds = %bb45.i
-  %6 = load float* undef, align 4                 ; <float> [#uses=3]
-  %7 = fcmp ult float %6, 1.000000e+00            ; <i1> [#uses=1]
-  %or.cond.i = and i1 undef, %7                   ; <i1> [#uses=1]
-  br i1 %or.cond.i, label %bb48.i, label %bb47.i
-
-bb2.i73.i:                                        ; preds = %bb45.i
-  unreachable
-
-bb47.i:                                           ; preds = %bb1.i72.i
-  unreachable
-
-bb48.i:                                           ; preds = %bb1.i72.i
-  br label %bb134.i
-
-bb49.i:                                           ; preds = %bb44.i
-  br i1 undef, label %bb50.i, label %bb53.i
-
-bb50.i:                                           ; preds = %bb49.i
-  br i1 false, label %bb1.i67.i, label %bb2.i68.i
-
-bb1.i67.i:                                        ; preds = %bb50.i
-  br i1 false, label %read_float_option.exit69.i, label %bb1.i67.bb2.i68_crit_edge.i
-
-bb1.i67.bb2.i68_crit_edge.i:                      ; preds = %bb1.i67.i
-  br label %bb2.i68.i
-
-bb2.i68.i:                                        ; preds = %bb1.i67.bb2.i68_crit_edge.i, %bb50.i
-  unreachable
-
-read_float_option.exit69.i:                       ; preds = %bb1.i67.i
-  br i1 undef, label %bb52.i, label %bb51.i
-
-bb51.i:                                           ; preds = %read_float_option.exit69.i
-  unreachable
-
-bb52.i:                                           ; preds = %read_float_option.exit69.i
-  br label %bb134.i
-
-bb53.i:                                           ; preds = %bb49.i
-  %8 = call i32 @strcmp(i8* undef, i8* getelementptr inbounds ([21 x i8]* @.str61, i32 0, i32 0)) nounwind readonly ; <i32> [#uses=0]
-  br i1 false, label %bb89.i, label %bb92.i
-
-bb89.i:                                           ; preds = %bb53.i
-  br i1 undef, label %bb1.i27.i, label %bb2.i28.i
-
-bb1.i27.i:                                        ; preds = %bb89.i
-  unreachable
-
-bb2.i28.i:                                        ; preds = %bb89.i
-  unreachable
-
-bb92.i:                                           ; preds = %bb53.i
-  br i1 undef, label %bb93.i, label %bb96.i
-
-bb93.i:                                           ; preds = %bb92.i
-  br i1 undef, label %bb1.i22.i, label %bb2.i23.i
-
-bb1.i22.i:                                        ; preds = %bb93.i
-  br i1 undef, label %bb95.i, label %bb94.i
-
-bb2.i23.i:                                        ; preds = %bb93.i
-  unreachable
-
-bb94.i:                                           ; preds = %bb1.i22.i
-  unreachable
-
-bb95.i:                                           ; preds = %bb1.i22.i
-  br label %bb134.i
-
-bb96.i:                                           ; preds = %bb92.i
-  br i1 undef, label %bb97.i, label %bb100.i
-
-bb97.i:                                           ; preds = %bb96.i
-  %9 = icmp slt i32 undef, %argc                  ; <i1> [#uses=1]
-  br i1 %9, label %bb1.i17.i, label %bb2.i18.i
-
-bb1.i17.i:                                        ; preds = %bb97.i
-  %10 = call i32 (i8*, i8*, ...)* @"\01_sscanf$LDBL128"(i8* undef, i8* getelementptr inbounds ([3 x i8]* @.str66, i32 0, i32 0), float* undef) nounwind ; <i32> [#uses=1]
-  %phitmp.i16.i = icmp eq i32 %10, 1              ; <i1> [#uses=1]
-  br i1 %phitmp.i16.i, label %read_float_option.exit19.i, label %bb1.i17.bb2.i18_crit_edge.i
-
-bb1.i17.bb2.i18_crit_edge.i:                      ; preds = %bb1.i17.i
-  br label %bb2.i18.i
-
-bb2.i18.i:                                        ; preds = %bb1.i17.bb2.i18_crit_edge.i, %bb97.i
-  unreachable
-
-read_float_option.exit19.i:                       ; preds = %bb1.i17.i
-  br i1 false, label %bb99.i, label %bb98.i
-
-bb98.i:                                           ; preds = %read_float_option.exit19.i
-  unreachable
-
-bb99.i:                                           ; preds = %read_float_option.exit19.i
-  br label %bb134.i
-
-bb100.i:                                          ; preds = %bb96.i
-  br i1 false, label %bb101.i, label %bb104.i
-
-bb101.i:                                          ; preds = %bb100.i
-  br i1 false, label %bb1.i12.i, label %bb2.i13.i
-
-bb1.i12.i:                                        ; preds = %bb101.i
-  br i1 undef, label %bb102.i, label %bb103.i
-
-bb2.i13.i:                                        ; preds = %bb101.i
-  unreachable
-
-bb102.i:                                          ; preds = %bb1.i12.i
-  unreachable
-
-bb103.i:                                          ; preds = %bb1.i12.i
-  br label %bb134.i
-
-bb104.i:                                          ; preds = %bb100.i
-  unreachable
-
-bb134.i:                                          ; preds = %bb103.i, %bb99.i, %bb95.i, %bb52.i, %bb48.i, %bb43.i, %bb30.i, %bb20.i, %bb1.i
-  %annealing_sched.1.0 = phi float [ 1.000000e+01, %bb1.i ], [ %annealing_sched.1.0, %bb20.i ], [ 1.000000e+00, %bb30.i ], [ %annealing_sched.1.0, %bb43.i ], [ %annealing_sched.1.0, %bb48.i ], [ %annealing_sched.1.0, %bb52.i ], [ %annealing_sched.1.0, %bb95.i ], [ %annealing_sched.1.0, %bb99.i ], [ %annealing_sched.1.0, %bb103.i ] ; <float> [#uses=8]
-  %annealing_sched.2.0 = phi float [ 1.000000e+02, %bb1.i ], [ %annealing_sched.2.0, %bb20.i ], [ %annealing_sched.2.0, %bb30.i ], [ %3, %bb43.i ], [ %annealing_sched.2.0, %bb48.i ], [ %annealing_sched.2.0, %bb52.i ], [ %annealing_sched.2.0, %bb95.i ], [ %annealing_sched.2.0, %bb99.i ], [ %annealing_sched.2.0, %bb103.i ] ; <float> [#uses=8]
-  %annealing_sched.3.0 = phi float [ 0x3FE99999A0000000, %bb1.i ], [ %annealing_sched.3.0, %bb20.i ], [ %annealing_sched.3.0, %bb30.i ], [ %annealing_sched.3.0, %bb43.i ], [ %6, %bb48.i ], [ %annealing_sched.3.0, %bb52.i ], [ %annealing_sched.3.0, %bb95.i ], [ %annealing_sched.3.0, %bb99.i ], [ %annealing_sched.3.0, %bb103.i ] ; <float> [#uses=8]
-  %annealing_sched.4.0 = phi float [ 0x3F847AE140000000, %bb1.i ], [ %annealing_sched.4.0, %bb20.i ], [ %annealing_sched.4.0, %bb30.i ], [ %annealing_sched.4.0, %bb43.i ], [ %annealing_sched.4.0, %bb48.i ], [ 0.000000e+00, %bb52.i ], [ %annealing_sched.4.0, %bb95.i ], [ %annealing_sched.4.0, %bb99.i ], [ %annealing_sched.4.0, %bb103.i ] ; <float> [#uses=8]
-  %router_opts.0.0 = phi float [ 0.000000e+00, %bb1.i ], [ %router_opts.0.0, %bb20.i ], [ 1.000000e+04, %bb30.i ], [ %router_opts.0.0, %bb43.i ], [ %router_opts.0.0, %bb48.i ], [ %router_opts.0.0, %bb52.i ], [ %router_opts.0.0, %bb95.i ], [ %router_opts.0.0, %bb99.i ], [ %router_opts.0.0, %bb103.i ] ; <float> [#uses=8]
-  %router_opts.1.0 = phi float [ 5.000000e-01, %bb1.i ], [ %router_opts.1.0, %bb20.i ], [ 1.000000e+04, %bb30.i ], [ %router_opts.1.0, %bb43.i ], [ %router_opts.1.0, %bb48.i ], [ %router_opts.1.0, %bb52.i ], [ undef, %bb95.i ], [ %router_opts.1.0, %bb99.i ], [ %router_opts.1.0, %bb103.i ] ; <float> [#uses=7]
-  %router_opts.2.0 = phi float [ 1.500000e+00, %bb1.i ], [ %router_opts.2.0, %bb20.i ], [ %router_opts.2.0, %bb30.i ], [ %router_opts.2.0, %bb43.i ], [ %router_opts.2.0, %bb48.i ], [ %router_opts.2.0, %bb52.i ], [ %router_opts.2.0, %bb95.i ], [ undef, %bb99.i ], [ %router_opts.2.0, %bb103.i ] ; <float> [#uses=8]
-  %router_opts.3.0 = phi float [ 0x3FC99999A0000000, %bb1.i ], [ %router_opts.3.0, %bb20.i ], [ %router_opts.3.0, %bb30.i ], [ %router_opts.3.0, %bb43.i ], [ %router_opts.3.0, %bb48.i ], [ %router_opts.3.0, %bb52.i ], [ %router_opts.3.0, %bb95.i ], [ %router_opts.3.0, %bb99.i ], [ 0.000000e+00, %bb103.i ] ; <float> [#uses=8]
-  %11 = phi float [ 0x3FC99999A0000000, %bb1.i ], [ %11, %bb20.i ], [ %11, %bb30.i ], [ %11, %bb43.i ], [ %11, %bb48.i ], [ %11, %bb52.i ], [ %11, %bb95.i ], [ %11, %bb99.i ], [ 0.000000e+00, %bb103.i ] ; <float> [#uses=8]
-  %12 = phi float [ 1.500000e+00, %bb1.i ], [ %12, %bb20.i ], [ %12, %bb30.i ], [ %12, %bb43.i ], [ %12, %bb48.i ], [ %12, %bb52.i ], [ %12, %bb95.i ], [ undef, %bb99.i ], [ %12, %bb103.i ] ; <float> [#uses=8]
-  %13 = phi float [ 5.000000e-01, %bb1.i ], [ %13, %bb20.i ], [ 1.000000e+04, %bb30.i ], [ %13, %bb43.i ], [ %13, %bb48.i ], [ %13, %bb52.i ], [ undef, %bb95.i ], [ %13, %bb99.i ], [ %13, %bb103.i ] ; <float> [#uses=7]
-  %14 = phi float [ 0.000000e+00, %bb1.i ], [ %14, %bb20.i ], [ 1.000000e+04, %bb30.i ], [ %14, %bb43.i ], [ %14, %bb48.i ], [ %14, %bb52.i ], [ %14, %bb95.i ], [ %14, %bb99.i ], [ %14, %bb103.i ] ; <float> [#uses=8]
-  %15 = phi float [ 0x3FE99999A0000000, %bb1.i ], [ %15, %bb20.i ], [ %15, %bb30.i ], [ %15, %bb43.i ], [ %6, %bb48.i ], [ %15, %bb52.i ], [ %15, %bb95.i ], [ %15, %bb99.i ], [ %15, %bb103.i ] ; <float> [#uses=8]
-  %16 = phi float [ 0x3F847AE140000000, %bb1.i ], [ %16, %bb20.i ], [ %16, %bb30.i ], [ %16, %bb43.i ], [ %16, %bb48.i ], [ 0.000000e+00, %bb52.i ], [ %16, %bb95.i ], [ %16, %bb99.i ], [ %16, %bb103.i ] ; <float> [#uses=8]
-  %17 = phi float [ 1.000000e+01, %bb1.i ], [ %17, %bb20.i ], [ 1.000000e+00, %bb30.i ], [ %17, %bb43.i ], [ %17, %bb48.i ], [ %17, %bb52.i ], [ %17, %bb95.i ], [ %17, %bb99.i ], [ %17, %bb103.i ] ; <float> [#uses=8]
-  %18 = icmp slt i32 undef, %argc                 ; <i1> [#uses=1]
-  br i1 %18, label %bb2.i, label %bb135.i
-
-bb135.i:                                          ; preds = %bb134.i
-  br i1 undef, label %bb141.i, label %bb142.i
-
-bb141.i:                                          ; preds = %bb135.i
-  unreachable
-
-bb142.i:                                          ; preds = %bb135.i
-  br i1 undef, label %bb145.i, label %bb144.i
-
-bb144.i:                                          ; preds = %bb142.i
-  unreachable
-
-bb145.i:                                          ; preds = %bb142.i
-  br i1 undef, label %bb146.i, label %bb147.i
-
-bb146.i:                                          ; preds = %bb145.i
-  unreachable
-
-bb147.i:                                          ; preds = %bb145.i
-  br i1 undef, label %bb148.i, label %bb155.i
-
-bb148.i:                                          ; preds = %bb147.i
-  br label %bb155.i
-
-bb155.i:                                          ; preds = %bb148.i, %bb147.i
-  br i1 undef, label %bb156.i, label %bb161.i
-
-bb156.i:                                          ; preds = %bb155.i
-  unreachable
-
-bb161.i:                                          ; preds = %bb155.i
-  br i1 undef, label %bb162.i, label %bb163.i
-
-bb162.i:                                          ; preds = %bb161.i
-  %19 = fpext float %17 to double                 ; <double> [#uses=1]
-  %20 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([61 x i8]* @.str101, i32 0, i32 0), double %19) nounwind ; <i32> [#uses=0]
-  unreachable
-
-bb163.i:                                          ; preds = %bb161.i
-  %21 = fpext float %16 to double                 ; <double> [#uses=1]
-  %22 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([31 x i8]* @.str104, i32 0, i32 0), double %21) nounwind ; <i32> [#uses=0]
-  %23 = fpext float %15 to double                 ; <double> [#uses=1]
-  %24 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([45 x i8]* @.str105, i32 0, i32 0), double %23) nounwind ; <i32> [#uses=0]
-  %25 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([38 x i8]* @.str112, i32 0, i32 0), double undef) nounwind ; <i32> [#uses=0]
-  br i1 undef, label %parse_command.exit, label %bb176.i
-
-bb176.i:                                          ; preds = %bb163.i
-  br i1 undef, label %bb177.i, label %bb178.i
-
-bb177.i:                                          ; preds = %bb176.i
-  unreachable
-
-bb178.i:                                          ; preds = %bb176.i
-  %26 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([36 x i8]* @.str121, i32 0, i32 0), double undef) nounwind ; <i32> [#uses=0]
-  %27 = fpext float %14 to double                 ; <double> [#uses=1]
-  %28 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([67 x i8]* @.str12293, i32 0, i32 0), double %27) nounwind ; <i32> [#uses=0]
-  %29 = fpext float %13 to double                 ; <double> [#uses=1]
-  %30 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([68 x i8]* @.str123, i32 0, i32 0), double %29) nounwind ; <i32> [#uses=0]
-  %31 = fpext float %12 to double                 ; <double> [#uses=1]
-  %32 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([52 x i8]* @.str124, i32 0, i32 0), double %31) nounwind ; <i32> [#uses=0]
-  %33 = fpext float %11 to double                 ; <double> [#uses=1]
-  %34 = call i32 (i8*, ...)* @"\01_printf$LDBL128"(i8* getelementptr inbounds ([51 x i8]* @.str125, i32 0, i32 0), double %33) nounwind ; <i32> [#uses=0]
-  unreachable
-
-parse_command.exit:                               ; preds = %bb163.i
-  br i1 undef, label %bb4.i152.i, label %my_fopen.exit.i
-
-bb4.i152.i:                                       ; preds = %parse_command.exit
-  unreachable
-
-my_fopen.exit.i:                                  ; preds = %parse_command.exit
-  br i1 undef, label %bb.i6.i99, label %bb49.preheader.i.i
-
-bb.i6.i99:                                        ; preds = %my_fopen.exit.i
-  br i1 undef, label %bb3.i.i100, label %bb1.i8.i
-
-bb1.i8.i:                                         ; preds = %bb.i6.i99
-  unreachable
-
-bb3.i.i100:                                       ; preds = %bb.i6.i99
-  unreachable
-
-bb49.preheader.i.i:                               ; preds = %my_fopen.exit.i
-  br i1 undef, label %bb7.i11.i, label %bb50.i.i
-
-bb7.i11.i:                                        ; preds = %bb49.preheader.i.i
-  unreachable
-
-bb50.i.i:                                         ; preds = %bb49.preheader.i.i
-  br i1 undef, label %bb.i.i.i20.i, label %my_calloc.exit.i.i.i
-
-bb.i.i.i20.i:                                     ; preds = %bb50.i.i
-  unreachable
-
-my_calloc.exit.i.i.i:                             ; preds = %bb50.i.i
-  br i1 undef, label %bb.i.i37.i.i, label %alloc_hash_table.exit.i21.i
-
-bb.i.i37.i.i:                                     ; preds = %my_calloc.exit.i.i.i
-  unreachable
-
-alloc_hash_table.exit.i21.i:                      ; preds = %my_calloc.exit.i.i.i
-  br i1 undef, label %bb51.i.i, label %bb3.i23.i.i
-
-bb51.i.i:                                         ; preds = %alloc_hash_table.exit.i21.i
-  unreachable
-
-bb3.i23.i.i:                                      ; preds = %alloc_hash_table.exit.i21.i
-  br i1 undef, label %bb.i8.i.i, label %bb.nph.i.i
-
-bb.nph.i.i:                                       ; preds = %bb3.i23.i.i
-  unreachable
-
-bb.i8.i.i:                                        ; preds = %bb3.i.i34.i, %bb3.i23.i.i
-  br i1 undef, label %bb3.i.i34.i, label %bb1.i.i32.i
-
-bb1.i.i32.i:                                      ; preds = %bb.i8.i.i
-  unreachable
-
-bb3.i.i34.i:                                      ; preds = %bb.i8.i.i
-  br i1 undef, label %free_hash_table.exit.i.i, label %bb.i8.i.i
-
-free_hash_table.exit.i.i:                         ; preds = %bb3.i.i34.i
-  br i1 undef, label %check_netlist.exit.i, label %bb59.i.i
-
-bb59.i.i:                                         ; preds = %free_hash_table.exit.i.i
-  unreachable
-
-check_netlist.exit.i:                             ; preds = %free_hash_table.exit.i.i
-  br label %bb.i.i3.i
-
-bb.i.i3.i:                                        ; preds = %bb3.i.i4.i, %check_netlist.exit.i
-  br i1 false, label %bb3.i.i4.i, label %bb1.i.i.i122
-
-bb1.i.i.i122:                                     ; preds = %bb1.i.i.i122, %bb.i.i3.i
-  br i1 false, label %bb3.i.i4.i, label %bb1.i.i.i122
-
-bb3.i.i4.i:                                       ; preds = %bb1.i.i.i122, %bb.i.i3.i
-  br i1 undef, label %read_net.exit, label %bb.i.i3.i
-
-read_net.exit:                                    ; preds = %bb3.i.i4.i
-  br i1 undef, label %bb.i44, label %bb3.i47
-
-bb.i44:                                           ; preds = %read_net.exit
-  unreachable
-
-bb3.i47:                                          ; preds = %read_net.exit
-  br i1 false, label %bb9.i50, label %bb8.i49
-
-bb8.i49:                                          ; preds = %bb3.i47
-  unreachable
-
-bb9.i50:                                          ; preds = %bb3.i47
-  br i1 undef, label %bb11.i51, label %bb12.i52
-
-bb11.i51:                                         ; preds = %bb9.i50
-  unreachable
-
-bb12.i52:                                         ; preds = %bb9.i50
-  br i1 undef, label %bb.i.i53, label %my_malloc.exit.i54
-
-bb.i.i53:                                         ; preds = %bb12.i52
-  unreachable
-
-my_malloc.exit.i54:                               ; preds = %bb12.i52
-  br i1 undef, label %bb.i2.i55, label %my_malloc.exit3.i56
-
-bb.i2.i55:                                        ; preds = %my_malloc.exit.i54
-  unreachable
-
-my_malloc.exit3.i56:                              ; preds = %my_malloc.exit.i54
-  br i1 undef, label %bb.i.i.i57, label %my_malloc.exit.i.i
-
-bb.i.i.i57:                                       ; preds = %my_malloc.exit3.i56
-  unreachable
-
-my_malloc.exit.i.i:                               ; preds = %my_malloc.exit3.i56
-  br i1 undef, label %bb, label %bb10
-
-bb:                                               ; preds = %my_malloc.exit.i.i
-  unreachable
-
-bb10:                                             ; preds = %my_malloc.exit.i.i
-  br i1 false, label %bb12, label %bb11
-
-bb11:                                             ; preds = %bb10
-  unreachable
-
-bb12:                                             ; preds = %bb10
-  store float %annealing_sched.1.0, float* null, align 4
-  store float %annealing_sched.2.0, float* undef, align 8
-  store float %annealing_sched.3.0, float* undef, align 4
-  store float %annealing_sched.4.0, float* undef, align 8
-  store float %router_opts.0.0, float* undef, align 8
-  store float %router_opts.1.0, float* undef, align 4
-  store float %router_opts.2.0, float* null, align 8
-  store float %router_opts.3.0, float* undef, align 4
-  br i1 undef, label %place_and_route.exit, label %bb7.i22
-
-bb7.i22:                                          ; preds = %bb12
-  br i1 false, label %bb8.i23, label %bb9.i26
-
-bb8.i23:                                          ; preds = %bb7.i22
-  unreachable
-
-bb9.i26:                                          ; preds = %bb7.i22
-  unreachable
-
-place_and_route.exit:                             ; preds = %bb12
-  unreachable
-}
-
-declare i32 @"\01_printf$LDBL128"(i8*, ...) nounwind
-
-declare i32 @strcmp(i8* nocapture, i8* nocapture) nounwind readonly
-
-declare i32 @"\01_sscanf$LDBL128"(i8*, i8*, ...) nounwind
diff --git a/test/CodeGen/X86/2008-03-18-CoalescerBug.ll b/test/CodeGen/X86/2008-03-18-CoalescerBug.ll
index ccc4d754c1f..3ae50261972 100644
--- a/test/CodeGen/X86/2008-03-18-CoalescerBug.ll
+++ b/test/CodeGen/X86/2008-03-18-CoalescerBug.ll
@@ -19,7 +19,7 @@ bb33:		; preds = %entry
 	br i1 %tmp35, label %bb38, label %bb87.preheader
 bb38:		; preds = %bb33
 	%tmp53 = add i32 %tmp19, %delta		; <i32> [#uses=2]
-	br i1 false, label %bb50, label %bb43
+	br label %bb43
 bb43:		; preds = %bb38
 	store i32 %tmp53, i32* null, align 4
 	ret void
diff --git a/test/CodeGen/X86/2008-04-09-BranchFolding.ll b/test/CodeGen/X86/2008-04-09-BranchFolding.ll
index 41fbdd19f2b..f4b2d719ae1 100644
--- a/test/CodeGen/X86/2008-04-09-BranchFolding.ll
+++ b/test/CodeGen/X86/2008-04-09-BranchFolding.ll
@@ -10,7 +10,7 @@
 define fastcc %struct.tree_node* @pushdecl(%struct.tree_node* %x) nounwind  {
 entry:
 	%tmp3.i40 = icmp eq %struct.binding_level* null, null		; <i1> [#uses=2]
-	br i1 false, label %bb143, label %bb140
+	br label %bb140
 bb140:		; preds = %entry
 	br i1 %tmp3.i40, label %bb160, label %bb17.i
 bb17.i:		; preds = %bb140
diff --git a/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll b/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll
index eacb4a51c21..ce9e389fb35 100644
--- a/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll
+++ b/test/CodeGen/X86/2008-08-23-X86-64AsmBug.ll
@@ -7,7 +7,7 @@
 
 define double @_Z7qstrtodPKcPS0_Pb(i8* %s00, i8** %se, i8* %ok) nounwind {
 entry:
-	br i1 false, label %bb151, label %bb163
+	br label %bb163
 
 bb151:		; preds = %entry
 	br label %bb163
@@ -19,13 +19,13 @@ bb163:		; preds = %bb151, %entry
 	br label %bb5.i
 
 bb5.i:		; preds = %bb5.i57.i, %bb163
-	%b.0.i = phi %struct.Bigint* [ null, %bb163 ], [ %tmp9.i.i41.i, %bb5.i57.i ]		; <%struct.Bigint*> [#uses=1]
+	%b.0.i = phi %struct.Bigint* [ null, %bb163 ]		; <%struct.Bigint*> [#uses=1]
 	%tmp3.i7.i728 = load i32* null, align 4		; <i32> [#uses=1]
 	br label %bb.i27.i
 
 bb.i27.i:		; preds = %bb.i27.i, %bb5.i
 	%tmp23.i20.i = lshr i32 0, 16		; <i32> [#uses=1]
-	br i1 false, label %bb.i27.i, label %bb5.i57.i
+	br label %bb5.i57.i
 
 bb5.i57.i:		; preds = %bb.i27.i
 	%tmp50.i35.i = load i32* null, align 4		; <i32> [#uses=1]
@@ -41,7 +41,7 @@ bb5.i57.i:		; preds = %bb.i27.i
 	store i32 %tmp23.i20.i, i32* null, align 4
 	%tmp74.i61.i = add i32 %tmp3.i7.i728, 1		; <i32> [#uses=1]
 	store i32 %tmp74.i61.i, i32* null, align 4
-	br i1 false, label %bb5.i, label %bb7.i
+	br label %bb7.i
 
 bb7.i:		; preds = %bb5.i57.i
 	%tmp514 = load i32* null, align 4		; <i32> [#uses=1]
diff --git a/test/CodeGen/X86/2009-01-12-CoalescerBug.ll b/test/CodeGen/X86/2009-01-12-CoalescerBug.ll
deleted file mode 100644
index 27a7113ffd5..00000000000
--- a/test/CodeGen/X86/2009-01-12-CoalescerBug.ll
+++ /dev/null
@@ -1,84 +0,0 @@
-; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu | grep movq | count 2
-; PR3311
-
-	%struct.CUMULATIVE_ARGS = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }
-	%struct.VEC_basic_block_base = type { i32, i32, [1 x %struct.basic_block_def*] }
-	%struct.VEC_basic_block_gc = type { %struct.VEC_basic_block_base }
-	%struct.VEC_edge_base = type { i32, i32, [1 x %struct.edge_def*] }
-	%struct.VEC_edge_gc = type { %struct.VEC_edge_base }
-	%struct.VEC_rtx_base = type { i32, i32, [1 x %struct.rtx_def*] }
-	%struct.VEC_rtx_gc = type { %struct.VEC_rtx_base }
-	%struct.VEC_temp_slot_p_base = type { i32, i32, [1 x %struct.temp_slot*] }
-	%struct.VEC_temp_slot_p_gc = type { %struct.VEC_temp_slot_p_base }
-	%struct.VEC_tree_base = type { i32, i32, [1 x %struct.tree_node*] }
-	%struct.VEC_tree_gc = type { %struct.VEC_tree_base }
-	%struct._obstack_chunk = type { i8*, %struct._obstack_chunk*, [4 x i8] }
-	%struct.basic_block_def = type { %struct.tree_node*, %struct.VEC_edge_gc*, %struct.VEC_edge_gc*, i8*, %struct.loop*, [2 x %struct.et_node*], %struct.basic_block_def*, %struct.basic_block_def*, %struct.basic_block_il_dependent, %struct.tree_node*, %struct.edge_prediction*, i64, i32, i32, i32, i32 }
-	%struct.basic_block_il_dependent = type { %struct.rtl_bb_info* }
-	%struct.bitmap_element_def = type { %struct.bitmap_element_def*, %struct.bitmap_element_def*, i32, [2 x i64] }
-	%struct.bitmap_head_def = type { %struct.bitmap_element_def*, %struct.bitmap_element_def*, i32, %struct.bitmap_obstack* }
-	%struct.bitmap_obstack = type { %struct.bitmap_element_def*, %struct.bitmap_head_def*, %struct.obstack }
-	%struct.block_symbol = type { [3 x %struct.rtunion], %struct.object_block*, i64 }
-	%struct.c_arg_info = type { %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, i8 }
-	%struct.c_language_function = type { %struct.stmt_tree_s }
-	%struct.c_switch = type opaque
-	%struct.control_flow_graph = type { %struct.basic_block_def*, %struct.basic_block_def*, %struct.VEC_basic_block_gc*, i32, i32, i32, %struct.VEC_basic_block_gc*, i32 }
-	%struct.edge_def = type { %struct.basic_block_def*, %struct.basic_block_def*, %struct.edge_def_insns, i8*, %struct.location_t*, i32, i32, i64, i32 }
-	%struct.edge_def_insns = type { %struct.rtx_def* }
-	%struct.edge_prediction = type opaque
-	%struct.eh_status = type opaque
-	%struct.emit_status = type { i32, i32, %struct.rtx_def*, %struct.rtx_def*, %struct.sequence_stack*, i32, %struct.location_t, i32, i8*, %struct.rtx_def** }
-	%struct.et_node = type opaque
-	%struct.expr_status = type { i32, i32, i32, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def* }
-	%struct.function = type { %struct.eh_status*, %struct.expr_status*, %struct.emit_status*, %struct.varasm_status*, %struct.control_flow_graph*, %struct.tree_node*, %struct.function*, i32, i32, i32, i32, %struct.rtx_def*, %struct.CUMULATIVE_ARGS, %struct.rtx_def*, %struct.rtx_def*, %struct.initial_value_struct*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, i8, i32, i64, %struct.tree_node*, %struct.tree_node*, %struct.rtx_def*, %struct.VEC_temp_slot_p_gc*, %struct.temp_slot*, %struct.var_refs_queue*, i32, i32, i32, i32, %struct.machine_function*, i32, i32, %struct.language_function*, %struct.htab*, %struct.rtx_def*, i32, i32, i32, %struct.location_t, %struct.VEC_tree_gc*, %struct.tree_node*, i8*, i8*, i8*, i8*, i8*, %struct.tree_node*, i8, i8, i8, i8, i8, i8 }
-	%struct.htab = type { i32 (i8*)*, i32 (i8*, i8*)*, void (i8*)*, i8**, i64, i64, i64, i32, i32, i8* (i64, i64)*, void (i8*)*, i8*, i8* (i8*, i64, i64)*, void (i8*, i8*)*, i32 }
-	%struct.initial_value_struct = type opaque
-	%struct.lang_decl = type { i8 }
-	%struct.language_function = type { %struct.c_language_function, %struct.tree_node*, %struct.tree_node*, %struct.c_switch*, %struct.c_arg_info*, i32, i32, i32, i32 }
-	%struct.location_t = type { i8*, i32 }
-	%struct.loop = type opaque
-	%struct.machine_function = type { %struct.stack_local_entry*, i8*, %struct.rtx_def*, i32, i32, [4 x i32], i32, i32, i32 }
-	%struct.object_block = type { %struct.section*, i32, i64, %struct.VEC_rtx_gc*, %struct.VEC_rtx_gc* }
-	%struct.obstack = type { i64, %struct._obstack_chunk*, i8*, i8*, i8*, i64, i32, %struct._obstack_chunk* (i8*, i64)*, void (i8*, %struct._obstack_chunk*)*, i8*, i8 }
-	%struct.omp_clause_subcode = type { i32 }
-	%struct.rtl_bb_info = type { %struct.rtx_def*, %struct.rtx_def*, %struct.bitmap_head_def*, %struct.bitmap_head_def*, %struct.rtx_def*, %struct.rtx_def*, i32 }
-	%struct.rtunion = type { i8* }
-	%struct.rtx_def = type { i16, i8, i8, %struct.u }
-	%struct.section = type { %struct.unnamed_section }
-	%struct.sequence_stack = type { %struct.rtx_def*, %struct.rtx_def*, %struct.sequence_stack* }
-	%struct.stack_local_entry = type opaque
-	%struct.stmt_tree_s = type { %struct.tree_node*, i32 }
-	%struct.temp_slot = type opaque
-	%struct.tree_common = type { %struct.tree_node*, %struct.tree_node*, %union.tree_ann_d*, i8, i8, i8, i8, i8 }
-	%struct.tree_decl_common = type { %struct.tree_decl_minimal, %struct.tree_node*, i8, i8, i8, i8, i8, i32, i32, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, i64, %struct.lang_decl* }
-	%struct.tree_decl_minimal = type { %struct.tree_common, %struct.location_t, i32, %struct.tree_node*, %struct.tree_node* }
-	%struct.tree_decl_non_common = type { %struct.tree_decl_with_vis, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node* }
-	%struct.tree_decl_with_rtl = type { %struct.tree_decl_common, %struct.rtx_def*, i32 }
-	%struct.tree_decl_with_vis = type { %struct.tree_decl_with_rtl, %struct.tree_node*, %struct.tree_node*, i8, i8, i8, i8 }
-	%struct.tree_function_decl = type { %struct.tree_decl_non_common, i32, i8, i8, i64, %struct.function* }
-	%struct.tree_node = type { %struct.tree_function_decl }
-	%struct.u = type { %struct.block_symbol }
-	%struct.unnamed_section = type { %struct.omp_clause_subcode, void (i8*)*, i8*, %struct.section* }
-	%struct.var_refs_queue = type { %struct.rtx_def*, i32, i32, %struct.var_refs_queue* }
-	%struct.varasm_status = type opaque
-	%union.tree_ann_d = type opaque
-@.str1 = external constant [31 x i8]		; <[31 x i8]*> [#uses=1]
-@integer_types = external global [11 x %struct.tree_node*]		; <[11 x %struct.tree_node*]*> [#uses=1]
-@__FUNCTION__.31164 = external constant [23 x i8], align 16		; <[23 x i8]*> [#uses=1]
-@llvm.used = appending global [1 x i8*] [ i8* bitcast (i32 (i32, i32)* @c_common_type_for_size to i8*) ], section "llvm.metadata"		; <[1 x i8*]*> [#uses=0]
-
-define i32 @c_common_type_for_size(i32 %bits, i32 %unsignedp) nounwind {
-entry:
-	%0 = load %struct.tree_node** getelementptr ([11 x %struct.tree_node*]* @integer_types, i32 0, i64 5), align 8		; <%struct.tree_node*> [#uses=1]
-	br i1 false, label %bb16, label %bb
-
-bb:		; preds = %entry
-	tail call void @tree_class_check_failed(%struct.tree_node* %0, i32 2, i8* getelementptr ([31 x i8]* @.str1, i32 0, i64 0), i32 1785, i8* getelementptr ([23 x i8]* @__FUNCTION__.31164, i32 0, i32 0)) noreturn nounwind
-	unreachable
-
-bb16:		; preds = %entry
-	%tmp = add i32 %bits, %unsignedp		; <i32> [#uses=1]
-	ret i32 %tmp
-}
-
-declare void @tree_class_check_failed(%struct.tree_node*, i32, i8*, i32, i8*) noreturn
diff --git a/test/CodeGen/X86/2009-09-07-CoalescerBug.ll b/test/CodeGen/X86/2009-09-07-CoalescerBug.ll
deleted file mode 100644
index 41b4bc08727..00000000000
--- a/test/CodeGen/X86/2009-09-07-CoalescerBug.ll
+++ /dev/null
@@ -1,47 +0,0 @@
-; RUN: llc < %s -mtriple=x86_64-unknown-freebsd7.2 -code-model=kernel | FileCheck %s
-; PR4689
-
-%struct.__s = type { [8 x i8] }
-%struct.pcb = type { i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i16, i8* }
-%struct.pcpu = type { i32*, i32*, i32*, i32*, %struct.pcb*, i64, i32, i32, i32, i32 }
-
-define i64 @hammer_time(i64 %modulep, i64 %physfree) nounwind ssp noredzone noimplicitfloat {
-; CHECK: hammer_time:
-; CHECK: movq $Xrsvd, %rax
-; CHECK: movq $Xrsvd, %rcx
-entry:
-  br i1 undef, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  br label %if.end
-
-if.end:                                           ; preds = %if.then, %entry
-  br label %for.body
-
-for.body:                                         ; preds = %for.inc, %if.end
-  switch i32 undef, label %if.then76 [
-    i32 9, label %for.inc
-    i32 10, label %for.inc
-    i32 11, label %for.inc
-    i32 12, label %for.inc
-  ]
-
-if.then76:                                        ; preds = %for.body
-  unreachable
-
-for.inc:                                          ; preds = %for.body, %for.body, %for.body, %for.body
-  br i1 undef, label %for.end, label %for.body
-
-for.end:                                          ; preds = %for.inc
-  call void asm sideeffect "mov $1,%gs:$0", "=*m,r,~{dirflag},~{fpsr},~{flags}"(%struct.__s* bitcast (%struct.pcb** getelementptr (%struct.pcpu* null, i32 0, i32 4) to %struct.__s*), i64 undef) nounwind
-  br label %for.body170
-
-for.body170:                                      ; preds = %for.body170, %for.end
-  store i64 or (i64 and (i64 or (i64 ptrtoint (void (i32, i32, i32, i32)* @Xrsvd to i64), i64 2097152), i64 2162687), i64 or (i64 or (i64 and (i64 shl (i64 ptrtoint (void (i32, i32, i32, i32)* @Xrsvd to i64), i64 32), i64 -281474976710656), i64 140737488355328), i64 15393162788864)), i64* undef
-  br i1 undef, label %for.end175, label %for.body170
-
-for.end175:                                       ; preds = %for.body170
-  unreachable
-}
-
-declare void @Xrsvd(i32, i32, i32, i32) ssp noredzone noimplicitfloat
diff --git a/test/CodeGen/X86/2009-09-19-SchedCustomLoweringBug.ll b/test/CodeGen/X86/2009-09-19-SchedCustomLoweringBug.ll
deleted file mode 100644
index 8cb538b0735..00000000000
--- a/test/CodeGen/X86/2009-09-19-SchedCustomLoweringBug.ll
+++ /dev/null
@@ -1,29 +0,0 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin10 -post-RA-scheduler=true | FileCheck %s
-
-; PR4958
-
-define i32 @main() nounwind ssp {
-entry:
-; CHECK: main:
-  %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
-  br label %bb
-
-bb:                                               ; preds = %bb1, %entry
-; CHECK:      addl $1
-; CHECK-NEXT: movl %e
-; CHECK-NEXT: adcl $0
-  %i.0 = phi i64 [ 0, %entry ], [ %0, %bb1 ]      ; <i64> [#uses=1]
-  %0 = add nsw i64 %i.0, 1                        ; <i64> [#uses=2]
-  %1 = icmp sgt i32 0, 0                          ; <i1> [#uses=1]
-  br i1 %1, label %bb2, label %bb1
-
-bb1:                                              ; preds = %bb
-  %2 = icmp sle i64 %0, 1                         ; <i1> [#uses=1]
-  br i1 %2, label %bb, label %bb2
-
-bb2:                                              ; preds = %bb1, %bb
-  br label %return
-
-return:                                           ; preds = %bb2
-  ret i32 0
-}
diff --git a/test/CodeGen/X86/2009-12-12-CoalescerBug.ll b/test/CodeGen/X86/2009-12-12-CoalescerBug.ll
deleted file mode 100644
index 4e8f5fdc530..00000000000
--- a/test/CodeGen/X86/2009-12-12-CoalescerBug.ll
+++ /dev/null
@@ -1,40 +0,0 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin | FileCheck %s
-
-define i32 @do_loop(i32* nocapture %sdp, i32* nocapture %ddp, i8* %mdp, i8* nocapture %cdp, i32 %w) nounwind readonly optsize ssp {
-entry:
-  br label %bb
-
-bb:                                               ; preds = %bb5, %entry
-  %mask.1.in = load i8* undef, align 1            ; <i8> [#uses=3]
-  %0 = icmp eq i8 %mask.1.in, 0                   ; <i1> [#uses=1]
-  br i1 %0, label %bb5, label %bb1
-
-bb1:                                              ; preds = %bb
-  br i1 undef, label %bb2, label %bb3
-
-bb2:                                              ; preds = %bb1
-; CHECK: %bb2
-; CHECK: movb %ch, %al
-  %1 = zext i8 %mask.1.in to i32                  ; <i32> [#uses=1]
-  %2 = zext i8 undef to i32                       ; <i32> [#uses=1]
-  %3 = mul i32 %2, %1                             ; <i32> [#uses=1]
-  %4 = add i32 %3, 1                              ; <i32> [#uses=1]
-  %5 = add i32 %4, 0                              ; <i32> [#uses=1]
-  %6 = lshr i32 %5, 8                             ; <i32> [#uses=1]
-  %retval12.i = trunc i32 %6 to i8                ; <i8> [#uses=1]
-  br label %bb3
-
-bb3:                                              ; preds = %bb2, %bb1
-  %mask.0.in = phi i8 [ %retval12.i, %bb2 ], [ %mask.1.in, %bb1 ] ; <i8> [#uses=1]
-  %7 = icmp eq i8 %mask.0.in, 0                   ; <i1> [#uses=1]
-  br i1 %7, label %bb5, label %bb4
-
-bb4:                                              ; preds = %bb3
-  br label %bb5
-
-bb5:                                              ; preds = %bb4, %bb3, %bb
-  br i1 undef, label %bb6, label %bb
-
-bb6:                                              ; preds = %bb5
-  ret i32 undef
-}
diff --git a/test/CodeGen/X86/loop-strength-reduce6.ll b/test/CodeGen/X86/loop-strength-reduce6.ll
index bbafcf7cbc7..919f836841f 100644
--- a/test/CodeGen/X86/loop-strength-reduce6.ll
+++ b/test/CodeGen/X86/loop-strength-reduce6.ll
@@ -2,22 +2,22 @@
 
 define fastcc i32 @decodeMP3(i32 %isize, i32* %done) nounwind {
 entry:
-	br i1 false, label %cond_next191, label %cond_true189
+	br label %cond_true189
 
 cond_true189:		; preds = %entry
 	ret i32 0
 
 cond_next191:		; preds = %entry
-	br i1 false, label %cond_next37.i, label %cond_false.i9
+	br label %cond_false.i9
 
 cond_false.i9:		; preds = %cond_next191
 	ret i32 0
 
 cond_next37.i:		; preds = %cond_next191
-	br i1 false, label %cond_false50.i, label %cond_true44.i
+	br label %cond_true44.i
 
 cond_true44.i:		; preds = %cond_next37.i
-	br i1 false, label %cond_true11.i.i, label %bb414.preheader.i
+	br label %bb414.preheader.i
 
 cond_true11.i.i:		; preds = %cond_true44.i
 	ret i32 0
@@ -26,19 +26,19 @@ cond_false50.i:		; preds = %cond_next37.i
 	ret i32 0
 
 bb414.preheader.i:		; preds = %cond_true44.i
-	br i1 false, label %bb.i18, label %do_layer3.exit
+	br label %do_layer3.exit
 
 bb.i18:		; preds = %bb414.preheader.i
-	br i1 false, label %bb358.i, label %cond_true79.i
+	br label %cond_true79.i
 
 cond_true79.i:		; preds = %bb.i18
 	ret i32 0
 
 bb331.i:		; preds = %bb358.i, %cond_true.i149.i
-	br i1 false, label %cond_true.i149.i, label %cond_false.i151.i
+	br label %cond_false.i151.i
 
 cond_true.i149.i:		; preds = %bb331.i
-	br i1 false, label %bb178.preheader.i.i, label %bb331.i
+	br label %bb331.i
 
 cond_false.i151.i:		; preds = %bb331.i
 	ret i32 0
@@ -56,7 +56,7 @@ bb178.preheader.i.i:		; preds = %bb163.i.i, %cond_true.i149.i
 	br label %bb163.i.i
 
 bb358.i:		; preds = %bb.i18
-	br i1 false, label %bb331.i, label %bb406.i
+	br label %bb406.i
 
 bb406.i:		; preds = %bb358.i
 	ret i32 0