Index: lib/CodeGen/BranchFolding.cpp =================================================================== --- lib/CodeGen/BranchFolding.cpp +++ lib/CodeGen/BranchFolding.cpp @@ -1255,7 +1255,7 @@ // where a BB jumps to more than one landing pad. // TODO: Is it ever worth rewriting predecessors which don't already // jump to a landing pad, and so can safely jump to the fallthrough? - } else { + } else if (MBB->isSuccessor(&*FallThrough)) { // Rewrite all predecessors of the old block to go to the fallthrough // instead. while (!MBB->pred_empty()) { Index: test/CodeGen/Mips/eh.ll =================================================================== --- test/CodeGen/Mips/eh.ll +++ test/CodeGen/Mips/eh.ll @@ -24,7 +24,7 @@ lpad: ; preds = %entry ; CHECK-EL: # %lpad -; CHECK-EL: beq $5 +; CHECK-EL: bne $5 %exn.val = landingpad { i8*, i32 } cleanup Index: test/CodeGen/SPARC/missinglabel.ll =================================================================== --- test/CodeGen/SPARC/missinglabel.ll +++ test/CodeGen/SPARC/missinglabel.ll @@ -4,14 +4,14 @@ define void @f() align 2 { entry: -; CHECK: %xcc, .LBB0_1 +; CHECK: %xcc, .LBB0_2 %cmp = icmp eq i64 undef, 0 br i1 %cmp, label %targetblock, label %cond.false cond.false: unreachable -; CHECK: .LBB0_1: ! %targetblock +; CHECK: .LBB0_2: ! %targetblock targetblock: br i1 undef, label %cond.false.i83, label %exit.i85 Index: test/CodeGen/Thumb2/thumb2-cbnz.ll =================================================================== --- test/CodeGen/Thumb2/thumb2-cbnz.ll +++ test/CodeGen/Thumb2/thumb2-cbnz.ll @@ -5,6 +5,7 @@ define void @t(i32 %c, double %b) { entry: +; CHECK: cmp r0, #0 %cmp1 = icmp ne i32 %c, 0 br i1 %cmp1, label %bb3, label %bb1 @@ -23,8 +24,7 @@ br i1 %cmp3, label %bb11, label %bb9 bb9: ; preds = %bb7 -; CHECK: cmp r0, #0 -; CHECK-NEXT: cbnz +; CHECK: cbnz %0 = tail call double @foo(double %b) nounwind readnone ; [#uses=0] br label %bb11 Index: test/CodeGen/Thumb2/v8_IT_5.ll =================================================================== --- test/CodeGen/Thumb2/v8_IT_5.ll +++ /dev/null @@ -1,65 +0,0 @@ -; RUN: llc < %s -mtriple=thumbv8 -arm-atomic-cfg-tidy=0 | FileCheck %s -; RUN: llc < %s -mtriple=thumbv7 -arm-atomic-cfg-tidy=0 -arm-restrict-it | FileCheck %s -; CHECK: it ne -; CHECK-NEXT: cmpne -; CHECK-NEXT: bne [[JUMPTARGET:.LBB[0-9]+_[0-9]+]] -; CHECK: cbz -; CHECK-NEXT: %if.else163 -; CHECK-NEXT: mov.w -; CHECK-NEXT: b -; CHECK: [[JUMPTARGET]]:{{.*}}%if.else173 -; CHECK-NEXT: mov.w -; CHECK-NEXT: bx lr -; CHECK-NEXT: %if.else145 -; CHECK-NEXT: mov.w - -%struct.hc = type { i32, i32, i32, i32 } - -define i32 @t(i32 %type) optsize { -entry: - br i1 undef, label %if.then, label %if.else - -if.then: - unreachable - -if.else: - br i1 undef, label %if.then15, label %if.else18 - -if.then15: - unreachable - -if.else18: - switch i32 %type, label %if.else173 [ - i32 3, label %if.then115 - i32 1, label %if.then102 - ] - -if.then102: - br i1 undef, label %cond.true10.i, label %t.exit - -cond.true10.i: - br label %t.exit - -t.exit: - unreachable - -if.then115: - br i1 undef, label %if.else163, label %if.else145 - -if.else145: - %call150 = call fastcc %struct.hc* @foo(%struct.hc* undef, i32 34865152) optsize - br label %while.body172 - -if.else163: - %call168 = call fastcc %struct.hc* @foo(%struct.hc* undef, i32 34078720) optsize - br label %while.body172 - -while.body172: - br label %while.body172 - -if.else173: - ret i32 -1 -} - -declare hidden fastcc %struct.hc* @foo(%struct.hc* nocapture, i32) nounwind optsize - Index: test/CodeGen/X86/br-fold.ll =================================================================== --- test/CodeGen/X86/br-fold.ll +++ test/CodeGen/X86/br-fold.ll @@ -5,9 +5,11 @@ ; RUN: llc -mtriple=x86_64-scei-ps4 < %s | FileCheck -check-prefix=PS4 %s ; X64_DARWIN: orq +; X64_DARWIN-NEXT: jne ; X64_DARWIN-NEXT: %bb8.i329 ; X64_LINUX: orq %rax, %rcx +; X64_LINUX-NEXT: jne ; X64_LINUX-NEXT: %bb8.i329 ; X64_WINDOWS: orq %rax, %rcx Index: test/CodeGen/X86/licm-dominance.ll =================================================================== --- test/CodeGen/X86/licm-dominance.ll +++ /dev/null @@ -1,36 +0,0 @@ -; RUN: llc -asm-verbose=true < %s | FileCheck %s - -; MachineLICM should check dominance before hoisting instructions. -; CHECK: ## in Loop: -; CHECK-NEXT: xorl %eax, %eax -; CHECK-NEXT: testb %al, %al - -target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" -target triple = "x86_64-apple-macosx10.7.2" - -define void @CMSColorWorldCreateParametricData() nounwind uwtable optsize ssp { -entry: - br label %for.body.i - -for.body.i: - br i1 undef, label %for.inc.i, label %if.then26.i - -if.then26.i: - br i1 undef, label %if.else.i.i, label %lor.lhs.false.i.i - -if.else.i.i: - br i1 undef, label %lor.lhs.false.i.i, label %if.then116.i.i - -lor.lhs.false.i.i: - br i1 undef, label %for.inc.i, label %if.then116.i.i - -if.then116.i.i: - unreachable - -for.inc.i: - %cmp17.i = icmp ult i64 undef, undef - br i1 %cmp17.i, label %for.body.i, label %if.end28.i - -if.end28.i: - ret void -} Index: test/CodeGen/X86/tail-merge-unreachable.ll =================================================================== --- /dev/null +++ test/CodeGen/X86/tail-merge-unreachable.ll @@ -0,0 +1,34 @@ +; RUN: llc -mtriple=x86_64-linux-gnu %s -o - -verify-machineinstrs | FileCheck %s + +define i32 @tail_merge_unreachable(i32 %i) { +entry: + br i1 undef, label %sw, label %end +sw: + switch i32 %i, label %end [ + i32 99, label %sw.bb + i32 98, label %sw.bb + i32 101, label %sw.bb + i32 97, label %sw.bb2 + i32 96, label %sw.bb2 + i32 100, label %sw.bb2 + ] +sw.bb: + unreachable +sw.bb2: + unreachable +end: + %p = phi i32 [ 1, %sw ], [ 0, %entry ] + ret i32 %p + +; CHECK-LABEL: tail_merge_unreachable: +; Range Check +; CHECK: addl $-96 +; CHECK: cmpl $5 +; CHECK: jbe [[JUMP_TABLE_BLOCK:[.][A-Za-z0-9_]+]] +; CHECK: retq +; CHECK: [[JUMP_TABLE_BLOCK]]: +; CHECK: btl +; CHECK: jae [[UNREACHABLE_BLOCK:[.][A-Za-z0-9_]+]] +; CHECK [[UNREACHABLE_BLOCK]]: +; CHECK: .Lfunc_end0 +}