Byebye llvm-upgrade!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48762 91177308-0d34-0410-b5e6-96231b3b80d8

6 files changed, 124 insertions, 294 deletions

diff --git a/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll b/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
index e7cfd76ec7..aa24014f3b 100644
--- a/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
+++ b/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
@@ -1,28 +1,23 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: llvm-as < %s | opt -lcssa | llvm-dis | \
 ; RUN:   grep {%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry}
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: llvm-as < %s | opt -lcssa | llvm-dis | \
 ; RUN:   grep {%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry}
 
-%struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* }
+        %struct.SetJmpMapEntry = type { i8*, i32, %struct.SetJmpMapEntry* }
 
-implementation   ; Functions:
-
-void %__llvm_sjljeh_try_catching_longjmp_exception() {
+define void @__llvm_sjljeh_try_catching_longjmp_exception() {
 entry:
-	br bool false, label %UnifiedReturnBlock, label %no_exit
-
-no_exit:		; preds = %endif, %entry
-	%SJE.0.0 = phi %struct.SetJmpMapEntry* [ %tmp.24, %endif ], [ null, %entry ]		; <%struct.SetJmpMapEntry*> [#uses=1]
-	br bool false, label %then, label %endif
-
-then:		; preds = %no_exit
-	%tmp.20 = getelementptr %struct.SetJmpMapEntry* %SJE.0.0, int 0, uint 1		; <uint*> [#uses=0]
-	ret void
-
-endif:		; preds = %no_exit
-	%tmp.24 = load %struct.SetJmpMapEntry** null		; <%struct.SetJmpMapEntry*> [#uses=1]
-	br bool false, label %UnifiedReturnBlock, label %no_exit
-
-UnifiedReturnBlock:		; preds = %endif, %entry
-	ret void
+        br i1 false, label %UnifiedReturnBlock, label %no_exit
+no_exit:                ; preds = %endif, %entry
+        %SJE.0.0 = phi %struct.SetJmpMapEntry* [ %tmp.24, %endif ], [ null, %entry ]            ; <%struct.SetJmpMapEntry*> [#uses=1]
+        br i1 false, label %then, label %endif
+then:           ; preds = %no_exit
+        %tmp.20 = getelementptr %struct.SetJmpMapEntry* %SJE.0.0, i32 0, i32 1          ; <i32*> [#uses=0]
+        ret void
+endif:          ; preds = %no_exit
+        %tmp.24 = load %struct.SetJmpMapEntry** null            ; <%struct.SetJmpMapEntry*> [#uses=1]
+        br i1 false, label %UnifiedReturnBlock, label %no_exit
+UnifiedReturnBlock:             ; preds = %endif, %entry
+        ret void
 }
+
diff --git a/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll b/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
index 02765dcdc1..eaccbadbf1 100644
--- a/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
+++ b/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
@@ -1,30 +1,27 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: llvm-as < %s | opt -lcssa | llvm-dis | \
 ; RUN:    grep {%X.1.lcssa}
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: llvm-as < %s | opt -lcssa | llvm-dis | \
 ; RUN:    not grep {%X.1.lcssa1}
 
-declare bool %c1()
-declare bool %c2()
+declare i1 @c1()
 
-int %foo() {
-entry:
-  br label %loop_begin
-
-loop_begin:
-  br bool true, label %loop_body.1, label %loop_exit2
-
-loop_body.1:
-  %X.1 = add int 0, 1
-  %rel.1 = call bool %c1()
-  br bool %rel.1, label %loop_exit, label %loop_body.2
-  
-loop_body.2:
-  %rel.2 = call bool %c2()
-  br bool %rel.2, label %loop_exit, label %loop_begin
+declare i1 @c2()
 
-loop_exit:
-  ret int %X.1
-  
-loop_exit2:
-  ret int 1
+define i32 @foo() {
+entry:
+	br label %loop_begin
+loop_begin:		; preds = %loop_body.2, %entry
+	br i1 true, label %loop_body.1, label %loop_exit2
+loop_body.1:		; preds = %loop_begin
+	%X.1 = add i32 0, 1		; <i32> [#uses=1]
+	%rel.1 = call i1 @c1( )		; <i1> [#uses=1]
+	br i1 %rel.1, label %loop_exit, label %loop_body.2
+loop_body.2:		; preds = %loop_body.1
+	%rel.2 = call i1 @c2( )		; <i1> [#uses=1]
+	br i1 %rel.2, label %loop_exit, label %loop_begin
+loop_exit:		; preds = %loop_body.2, %loop_body.1
+	ret i32 %X.1
+loop_exit2:		; preds = %loop_begin
+	ret i32 1
 }
+
diff --git a/test/Transforms/LCSSA/2006-07-09-NoDominator.ll b/test/Transforms/LCSSA/2006-07-09-NoDominator.ll
index f90f6644af..c8af10058c 100644
--- a/test/Transforms/LCSSA/2006-07-09-NoDominator.ll
+++ b/test/Transforms/LCSSA/2006-07-09-NoDominator.ll
@@ -1,31 +1,24 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa
+; RUN: llvm-as < %s | opt -lcssa
 
-	%struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* }
+	%struct.SetJmpMapEntry = type { i8*, i32, %struct.SetJmpMapEntry* }
 
-implementation   ; Functions:
-
-void %__llvm_sjljeh_try_catching_longjmp_exception() {
+define void @__llvm_sjljeh_try_catching_longjmp_exception() {
 entry:
 	br label %loopentry
-
 loopentry:		; preds = %endif, %entry
-	%SJE.0 = phi %struct.SetJmpMapEntry* [ null, %entry ], [ %tmp.25, %endif ]		; <%struct.SetJmpMapEntry*> [#uses=1]
-	br bool false, label %no_exit, label %loopexit
-
+	%SJE.0 = phi %struct.SetJmpMapEntry* [ null, %entry ], [ %tmp.25, %endif ]	; <%struct.SetJmpMapEntry*> [#uses=1]
+	br i1 false, label %no_exit, label %loopexit
 no_exit:		; preds = %loopentry
-	br bool false, label %then, label %endif
-
+	br i1 false, label %then, label %endif
 then:		; preds = %no_exit
-	%tmp.21 = getelementptr %struct.SetJmpMapEntry* %SJE.0, int 0, uint 1		; <uint*> [#uses=0]
+	%tmp.21 = getelementptr %struct.SetJmpMapEntry* %SJE.0, i32 0, i32 1		; <i32*> [#uses=0]
 	br label %return
-
-endif:		; preds = %after_ret.0, %no_exit
+endif:		; preds = %no_exit
 	%tmp.25 = load %struct.SetJmpMapEntry** null		; <%struct.SetJmpMapEntry*> [#uses=1]
 	br label %loopentry
-
 loopexit:		; preds = %loopentry
 	br label %return
-
-return:		; preds = %after_ret.1, %loopexit, %then
+return:		; preds = %loopexit, %then
 	ret void
 }
+
diff --git a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll
index ac40ad5fd6..b85e6c3602 100644
--- a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll
+++ b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock-2.ll
@@ -1,210 +1,145 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa -disable-output
+; RUN: llvm-as < %s | opt -lcssa -disable-output
 ; PR977
+; END.
+declare i32 @opost_block()
 
-declare int %opost_block()
-
-void %write_chan() {
+define void @write_chan() {
 entry:
-	br bool false, label %shortcirc_next.0, label %shortcirc_done.0
-
+	br i1 false, label %shortcirc_next.0, label %shortcirc_done.0
 shortcirc_next.0:		; preds = %entry
 	br label %shortcirc_done.0
-
 shortcirc_done.0:		; preds = %shortcirc_next.0, %entry
-	br bool false, label %shortcirc_next.1, label %shortcirc_done.1
-
+	br i1 false, label %shortcirc_next.1, label %shortcirc_done.1
 shortcirc_next.1:		; preds = %shortcirc_done.0
 	br label %shortcirc_done.1
-
 shortcirc_done.1:		; preds = %shortcirc_next.1, %shortcirc_done.0
-	br bool false, label %then.0, label %endif.0
-
+	br i1 false, label %then.0, label %endif.0
 then.0:		; preds = %shortcirc_done.1
-	br bool false, label %then.1, label %endif.1
-
+	br i1 false, label %then.1, label %endif.1
 then.1:		; preds = %then.0
 	br label %return
-
 after_ret.0:		; No predecessors!
 	br label %endif.1
-
 endif.1:		; preds = %after_ret.0, %then.0
 	br label %endif.0
-
 endif.0:		; preds = %endif.1, %shortcirc_done.1
 	br label %loopentry.0
-
 loopentry.0:		; preds = %endif.12, %endif.0
-	br bool false, label %then.2, label %endif.2
-
+	br i1 false, label %then.2, label %endif.2
 then.2:		; preds = %loopentry.0
 	br label %loopexit.0
-
 dead_block_after_break.0:		; No predecessors!
 	br label %endif.2
-
 endif.2:		; preds = %dead_block_after_break.0, %loopentry.0
-	br bool false, label %shortcirc_done.2, label %shortcirc_next.2
-
+	br i1 false, label %shortcirc_done.2, label %shortcirc_next.2
 shortcirc_next.2:		; preds = %endif.2
-	br bool false, label %shortcirc_next.3, label %shortcirc_done.3
-
+	br i1 false, label %shortcirc_next.3, label %shortcirc_done.3
 shortcirc_next.3:		; preds = %shortcirc_next.2
 	br label %shortcirc_done.3
-
 shortcirc_done.3:		; preds = %shortcirc_next.3, %shortcirc_next.2
 	br label %shortcirc_done.2
-
 shortcirc_done.2:		; preds = %shortcirc_done.3, %endif.2
-	br bool false, label %then.3, label %endif.3
-
+	br i1 false, label %then.3, label %endif.3
 then.3:		; preds = %shortcirc_done.2
 	br label %loopexit.0
-
 dead_block_after_break.1:		; No predecessors!
 	br label %endif.3
-
 endif.3:		; preds = %dead_block_after_break.1, %shortcirc_done.2
-	br bool false, label %shortcirc_next.4, label %shortcirc_done.4
-
+	br i1 false, label %shortcirc_next.4, label %shortcirc_done.4
 shortcirc_next.4:		; preds = %endif.3
 	br label %shortcirc_done.4
-
 shortcirc_done.4:		; preds = %shortcirc_next.4, %endif.3
-	br bool false, label %then.4, label %else
-
+	br i1 false, label %then.4, label %else
 then.4:		; preds = %shortcirc_done.4
 	br label %loopentry.1
-
 loopentry.1:		; preds = %endif.8, %then.4
-	br bool false, label %no_exit, label %loopexit.1
-
+	br i1 false, label %no_exit, label %loopexit.1
 no_exit:		; preds = %loopentry.1
-	%tmp.94 = call int %opost_block( )		; <int> [#uses=1]
-	br bool false, label %then.5, label %endif.5
-
+	%tmp.94 = call i32 @opost_block( )		; <i32> [#uses=1]
+	br i1 false, label %then.5, label %endif.5
 then.5:		; preds = %no_exit
-	br bool false, label %then.6, label %endif.6
-
+	br i1 false, label %then.6, label %endif.6
 then.6:		; preds = %then.5
 	br label %loopexit.1
-
 dead_block_after_break.2:		; No predecessors!
 	br label %endif.6
-
 endif.6:		; preds = %dead_block_after_break.2, %then.5
 	br label %break_out
-
 dead_block_after_goto.0:		; No predecessors!
 	br label %endif.5
-
 endif.5:		; preds = %dead_block_after_goto.0, %no_exit
-	br bool false, label %then.7, label %endif.7
-
+	br i1 false, label %then.7, label %endif.7
 then.7:		; preds = %endif.5
 	br label %loopexit.1
-
 dead_block_after_break.3:		; No predecessors!
 	br label %endif.7
-
 endif.7:		; preds = %dead_block_after_break.3, %endif.5
-	switch uint 1, label %switchexit [
-		 uint 4, label %label.2
-		 uint 2, label %label.1
-		 uint 1, label %label.0
+	switch i32 1, label %switchexit [
+		 i32 4, label %label.2
+		 i32 2, label %label.1
+		 i32 1, label %label.0
 	]
-
 label.0:		; preds = %endif.7
 	br label %switchexit
-
 dead_block_after_break.4:		; No predecessors!
 	br label %label.1
-
 label.1:		; preds = %dead_block_after_break.4, %endif.7
 	br label %switchexit
-
 dead_block_after_break.5:		; No predecessors!
 	br label %label.2
-
 label.2:		; preds = %dead_block_after_break.5, %endif.7
 	br label %switchexit
-
 dead_block_after_break.6:		; No predecessors!
 	br label %switchexit
-
 switchexit:		; preds = %dead_block_after_break.6, %label.2, %label.1, %label.0, %endif.7
-	br bool false, label %then.8, label %endif.8
-
+	br i1 false, label %then.8, label %endif.8
 then.8:		; preds = %switchexit
 	br label %loopexit.1
-
 dead_block_after_break.7:		; No predecessors!
 	br label %endif.8
-
 endif.8:		; preds = %dead_block_after_break.7, %switchexit
 	br label %loopentry.1
-
 loopexit.1:		; preds = %then.8, %then.7, %then.6, %loopentry.1
-	br bool false, label %then.9, label %endif.9
-
+	br i1 false, label %then.9, label %endif.9
 then.9:		; preds = %loopexit.1
 	br label %endif.9
-
 endif.9:		; preds = %then.9, %loopexit.1
 	br label %endif.4
-
 else:		; preds = %shortcirc_done.4
-	br bool false, label %then.10, label %endif.10
-
+	br i1 false, label %then.10, label %endif.10
 then.10:		; preds = %else
 	br label %break_out
-
 dead_block_after_goto.1:		; No predecessors!
 	br label %endif.10
-
 endif.10:		; preds = %dead_block_after_goto.1, %else
 	br label %endif.4
-
 endif.4:		; preds = %endif.10, %endif.9
-	br bool false, label %then.11, label %endif.11
-
+	br i1 false, label %then.11, label %endif.11
 then.11:		; preds = %endif.4
 	br label %loopexit.0
-
 dead_block_after_break.8:		; No predecessors!
 	br label %endif.11
-
 endif.11:		; preds = %dead_block_after_break.8, %endif.4
-	br bool false, label %then.12, label %endif.12
-
+	br i1 false, label %then.12, label %endif.12
 then.12:		; preds = %endif.11
 	br label %loopexit.0
-
 dead_block_after_break.9:		; No predecessors!
 	br label %endif.12
-
 endif.12:		; preds = %dead_block_after_break.9, %endif.11
 	br label %loopentry.0
-
 loopexit.0:		; preds = %then.12, %then.11, %then.3, %then.2
 	br label %break_out
-
 break_out:		; preds = %loopexit.0, %then.10, %endif.6
-	%retval.3 = phi int [ 0, %loopexit.0 ], [ %tmp.94, %endif.6 ], [ 0, %then.10 ]		; <int> [#uses=0]
-	br bool false, label %cond_true, label %cond_false
-
+	%retval.3 = phi i32 [ 0, %loopexit.0 ], [ %tmp.94, %endif.6 ], [ 0, %then.10 ]		; <i32> [#uses=0]
+	br i1 false, label %cond_true, label %cond_false
 cond_true:		; preds = %break_out
 	br label %cond_continue
-
 cond_false:		; preds = %break_out
 	br label %cond_continue
-
 cond_continue:		; preds = %cond_false, %cond_true
 	br label %return
-
 after_ret.1:		; No predecessors!
 	br label %return
-
 return:		; preds = %after_ret.1, %cond_continue, %then.1
 	ret void
 }
diff --git a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll
index 9178411ece..b02feb4103 100644
--- a/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll
+++ b/test/Transforms/LCSSA/2006-10-31-UnreachableBlock.ll
@@ -1,270 +1,184 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa -disable-output
+; RUN: llvm-as < %s | opt -lcssa -disable-output
 ; PR977
+; END.
 
-void %process_backlog() {
+define void @process_backlog() {
 entry:
 	br label %loopentry.preheader
-
 loopentry.preheader:		; preds = %dead_block_after_break, %entry
-	%work.0.ph = phi int [ %inc, %dead_block_after_break ], [ 0, %entry ]		; <int> [#uses=0]
+	%work.0.ph = phi i32 [ %inc, %dead_block_after_break ], [ 0, %entry ]		; <i32> [#uses=0]
 	br label %loopentry
-
 loopentry:		; preds = %endif.1, %loopentry.preheader
-	br bool false, label %then.i, label %loopentry.__skb_dequeue67.exit_crit_edge
-
+	br i1 false, label %then.i, label %loopentry.__skb_dequeue67.exit_crit_edge
 loopentry.__skb_dequeue67.exit_crit_edge:		; preds = %loopentry
 	br label %__skb_dequeue67.exit
-
 then.i:		; preds = %loopentry
 	br label %__skb_dequeue67.exit
-
 __skb_dequeue67.exit:		; preds = %then.i, %loopentry.__skb_dequeue67.exit_crit_edge
-	br bool false, label %then.0, label %__skb_dequeue67.exit.endif.0_crit_edge
-
+	br i1 false, label %then.0, label %__skb_dequeue67.exit.endif.0_crit_edge
 __skb_dequeue67.exit.endif.0_crit_edge:		; preds = %__skb_dequeue67.exit
 	br label %endif.0
-
 then.0:		; preds = %__skb_dequeue67.exit
 	br label %job_done
-
 dead_block_after_goto:		; No predecessors!
 	unreachable
-
 endif.0:		; preds = %__skb_dequeue67.exit.endif.0_crit_edge
-	br bool false, label %then.0.i, label %endif.0.endif.0.i_crit_edge
-
+	br i1 false, label %then.0.i, label %endif.0.endif.0.i_crit_edge
 endif.0.endif.0.i_crit_edge:		; preds = %endif.0
 	br label %endif.0.i
-
 then.0.i:		; preds = %endif.0
 	br label %endif.0.i
-
 endif.0.i:		; preds = %then.0.i, %endif.0.endif.0.i_crit_edge
-	br bool false, label %then.i.i, label %endif.0.i.skb_bond.exit.i_crit_edge
-
+	br i1 false, label %then.i.i, label %endif.0.i.skb_bond.exit.i_crit_edge
 endif.0.i.skb_bond.exit.i_crit_edge:		; preds = %endif.0.i
 	br label %skb_bond.exit.i
-
 then.i.i:		; preds = %endif.0.i
 	br label %skb_bond.exit.i
-
 skb_bond.exit.i:		; preds = %then.i.i, %endif.0.i.skb_bond.exit.i_crit_edge
 	br label %loopentry.0.i
-
 loopentry.0.i:		; preds = %loopentry.0.i.backedge, %skb_bond.exit.i
-	br bool false, label %loopentry.0.i.no_exit.0.i_crit_edge, label %loopentry.0.i.loopexit.0.i_crit_edge
-
+	br i1 false, label %loopentry.0.i.no_exit.0.i_crit_edge, label %loopentry.0.i.loopexit.0.i_crit_edge
 loopentry.0.i.loopexit.0.i_crit_edge:		; preds = %loopentry.0.i
 	br label %loopexit.0.i
-
 loopentry.0.i.no_exit.0.i_crit_edge:		; preds = %loopentry.0.i
 	br label %no_exit.0.i
-
 no_exit.0.i:		; preds = %then.3.i.no_exit.0.i_crit_edge, %loopentry.0.i.no_exit.0.i_crit_edge
-	br bool false, label %no_exit.0.i.shortcirc_done.0.i_crit_edge, label %shortcirc_next.0.i
-
+	br i1 false, label %no_exit.0.i.shortcirc_done.0.i_crit_edge, label %shortcirc_next.0.i
 no_exit.0.i.shortcirc_done.0.i_crit_edge:		; preds = %no_exit.0.i
 	br label %shortcirc_done.0.i
-
 shortcirc_next.0.i:		; preds = %no_exit.0.i
 	br label %shortcirc_done.0.i
-
 shortcirc_done.0.i:		; preds = %shortcirc_next.0.i, %no_exit.0.i.shortcirc_done.0.i_crit_edge
-	br bool false, label %then.1.i, label %endif.1.i
-
+	br i1 false, label %then.1.i, label %endif.1.i
 then.1.i:		; preds = %shortcirc_done.0.i
-	br bool false, label %then.2.i, label %then.1.i.endif.2.i_crit_edge
-
+	br i1 false, label %then.2.i, label %then.1.i.endif.2.i_crit_edge
 then.1.i.endif.2.i_crit_edge:		; preds = %then.1.i
 	br label %endif.2.i
-
 then.2.i:		; preds = %then.1.i
-	br bool false, label %then.3.i, label %else.0.i
-
+	br i1 false, label %then.3.i, label %else.0.i
 then.3.i:		; preds = %then.2.i
-	br bool false, label %then.3.i.no_exit.0.i_crit_edge, label %then.3.i.loopexit.0.i_crit_edge
-
+	br i1 false, label %then.3.i.no_exit.0.i_crit_edge, label %then.3.i.loopexit.0.i_crit_edge
 then.3.i.loopexit.0.i_crit_edge:		; preds = %then.3.i
 	br label %loopexit.0.i
-
 then.3.i.no_exit.0.i_crit_edge:		; preds = %then.3.i
 	br label %no_exit.0.i
-
 else.0.i:		; preds = %then.2.i
 	br label %endif.2.i
-
 endif.3.i:		; No predecessors!
 	unreachable
-
 endif.2.i:		; preds = %else.0.i, %then.1.i.endif.2.i_crit_edge
 	br label %loopentry.0.i.backedge
-
 endif.1.i:		; preds = %shortcirc_done.0.i
 	br label %loopentry.0.i.backedge
-
 loopentry.0.i.backedge:		; preds = %endif.1.i, %endif.2.i
 	br label %loopentry.0.i
-
 loopexit.0.i:		; preds = %then.3.i.loopexit.0.i_crit_edge, %loopentry.0.i.loopexit.0.i_crit_edge
 	br label %loopentry.1.i
-
 loopentry.1.i:		; preds = %loopentry.1.i.backedge, %loopexit.0.i
-	br bool false, label %loopentry.1.i.no_exit.1.i_crit_edge, label %loopentry.1.i.loopexit.1.i_crit_edge
-
+	br i1 false, label %loopentry.1.i.no_exit.1.i_crit_edge, label %loopentry.1.i.loopexit.1.i_crit_edge
 loopentry.1.i.loopexit.1.i_crit_edge:		; preds = %loopentry.1.i
 	br label %loopexit.1.i
-
 loopentry.1.i.no_exit.1.i_crit_edge:		; preds = %loopentry.1.i
 	br label %no_exit.1.i
-
 no_exit.1.i:		; preds = %then.6.i.no_exit.1.i_crit_edge, %loopentry.1.i.no_exit.1.i_crit_edge
-	br bool false, label %shortcirc_next.1.i, label %no_exit.1.i.shortcirc_done.1.i_crit_edge
-
+	br i1 false, label %shortcirc_next.1.i, label %no_exit.1.i.shortcirc_done.1.i_crit_edge
 no_exit.1.i.shortcirc_done.1.i_crit_edge:		; preds = %no_exit.1.i
 	br label %shortcirc_done.1.i
-
 shortcirc_next.1.i:		; preds = %no_exit.1.i
-	br bool false, label %shortcirc_next.1.i.shortcirc_done.2.i_crit_edge, label %shortcirc_next.2.i
-
+	br i1 false, label %shortcirc_next.1.i.shortcirc_done.2.i_crit_edge, label %shortcirc_next.2.i
 shortcirc_next.1.i.shortcirc_done.2.i_crit_edge:		; preds = %shortcirc_next.1.i
 	br label %shortcirc_done.2.i
-
 shortcirc_next.2.i:		; preds = %shortcirc_next.1.i
 	br label %shortcirc_done.2.i
-
 shortcirc_done.2.i:		; preds = %shortcirc_next.2.i, %shortcirc_next.1.i.shortcirc_done.2.i_crit_edge
 	br label %shortcirc_done.1.i
-
 shortcirc_done.1.i:		; preds = %shortcirc_done.2.i, %no_exit.1.i.shortcirc_done.1.i_crit_edge
-	br bool false, label %then.4.i, label %endif.4.i
-
+	br i1 false, label %then.4.i, label %endif.4.i
 then.4.i:		; preds = %shortcirc_done.1.i
-	br bool false, label %then.5.i, label %then.4.i.endif.5.i_crit_edge
-
+	br i1 false, label %then.5.i, label %then.4.i.endif.5.i_crit_edge
 then.4.i.endif.5.i_crit_edge:		; preds = %then.4.i
 	br label %endif.5.i
-
 then.5.i:		; preds = %then.4.i
-	br bool false, label %then.6.i, label %else.1.i
-
+	br i1 false, label %then.6.i, label %else.1.i
 then.6.i:		; preds = %then.5.i
-	br bool false, label %then.6.i.no_exit.1.i_crit_edge, label %then.6.i.loopexit.1.i_crit_edge
-
+	br i1 false, label %then.6.i.no_exit.1.i_crit_edge, label %then.6.i.loopexit.1.i_crit_edge
 then.6.i.loopexit.1.i_crit_edge:		; preds = %then.6.i
 	br label %loopexit.1.i
-
 then.6.i.no_exit.1.i_crit_edge:		; preds = %then.6.i
 	br label %no_exit.1.i
-
 else.1.i:		; preds = %then.5.i
 	br label %endif.5.i
-
 endif.6.i:		; No predecessors!
 	unreachable
-
 endif.5.i:		; preds = %else.1.i, %then.4.i.endif.5.i_crit_edge
 	br label %loopentry.1.i.backedge
-
 endif.4.i:		; preds = %shortcirc_done.1.i
 	br label %loopentry.1.i.backedge
-
 loopentry.1.i.backedge:		; preds = %endif.4.i, %endif.5.i
 	br label %loopentry.1.i
-
 loopexit.1.i:		; preds = %then.6.i.loopexit.1.i_crit_edge, %loopentry.1.i.loopexit.1.i_crit_edge
-	br bool false, label %then.7.i, label %else.2.i
-
+	br i1 false, label %then.7.i, label %else.2.i
 then.7.i:		; preds = %loopexit.1.i
-	br bool false, label %then.8.i, label %else.3.i
-
+	br i1 false, label %then.8.i, label %else.3.i
 then.8.i:		; preds = %then.7.i
 	br label %netif_receive_skb.exit
-
 else.3.i:		; preds = %then.7.i
 	br label %netif_receive_skb.exit
-
 endif.8.i:		; No predecessors!
 	unreachable
-
 else.2.i:		; preds = %loopexit.1.i
-	br bool false, label %else.2.i.shortcirc_done.i.i_crit_edge, label %shortcirc_next.i.i
-
+	br i1 false, label %else.2.i.shortcirc_done.i.i_crit_edge, label %shortcirc_next.i.i
 else.2.i.shortcirc_done.i.i_crit_edge:		; preds = %else.2.i
 	br label %shortcirc_done.i.i
-
 shortcirc_next.i.i:		; preds = %else.2.i
 	br label %shortcirc_done.i.i
-
 shortcirc_done.i.i:		; preds = %shortcirc_next.i.i, %else.2.i.shortcirc_done.i.i_crit_edge
-	br bool false, label %then.i1.i, label %shortcirc_done.i.i.kfree_skb65.exit.i_crit_edge
-
+	br i1 false, label %then.i1.i, label %shortcirc_done.i.i.kfree_skb65.exit.i_crit_edge
 shortcirc_done.i.i.kfree_skb65.exit.i_crit_edge:		; preds = %shortcirc_done.i.i
 	br label %kfree_skb65.exit.i
-
 then.i1.i:		; preds = %shortcirc_done.i.i
 	br label %kfree_skb65.exit.i
-
 kfree_skb65.exit.i:		; preds = %then.i1.i, %shortcirc_done.i.i.kfree_skb65.exit.i_crit_edge
 	br label %netif_receive_skb.exit
-
 netif_receive_skb.exit:		; preds = %kfree_skb65.exit.i, %else.3.i, %then.8.i
-	br bool false, label %then.i1, label %netif_receive_skb.exit.dev_put69.exit_crit_edge
-
+	br i1 false, label %then.i1, label %netif_receive_skb.exit.dev_put69.exit_crit_edge
 netif_receive_skb.exit.dev_put69.exit_crit_edge:		; preds = %netif_receive_skb.exit
 	br label %dev_put69.exit
-
 then.i1:		; preds = %netif_receive_skb.exit
 	br label %dev_put69.exit
-
 dev_put69.exit:		; preds = %then.i1, %netif_receive_skb.exit.dev_put69.exit_crit_edge
-	%inc = add int 0, 1		; <int> [#uses=1]
-	br bool false, label %dev_put69.exit.shortcirc_done_crit_edge, label %shortcirc_next
-
+	%inc = add i32 0, 1		; <i32> [#uses=1]
+	br i1 false, label %dev_put69.exit.shortcirc_done_crit_edge, label %shortcirc_next
 dev_put69.exit.shortcirc_done_crit_edge:		; preds = %dev_put69.exit
 	br label %shortcirc_done
-
 shortcirc_next:		; preds = %dev_put69.exit
 	br label %shortcirc_done
-
 shortcirc_done:		; preds = %shortcirc_next, %dev_put69.exit.shortcirc_done_crit_edge
-	br bool false, label %then.1, label %endif.1
-
+	br i1 false, label %then.1, label %endif.1
 then.1:		; preds = %shortcirc_done
 	ret void
-
 dead_block_after_break:		; No predecessors!
 	br label %loopentry.preheader
-
 endif.1:		; preds = %shortcirc_done
 	br label %loopentry
-
 loopexit:		; No predecessors!
 	unreachable
-
 after_ret.0:		; No predecessors!
 	br label %job_done
-
 job_done:		; preds = %after_ret.0, %then.0
 	br label %loopentry.i
-
 loopentry.i:		; preds = %no_exit.i, %job_done
-	br bool false, label %no_exit.i, label %clear_bit62.exit
-
+	br i1 false, label %no_exit.i, label %clear_bit62.exit
 no_exit.i:		; preds = %loopentry.i
 	br label %loopentry.i
-
 clear_bit62.exit:		; preds = %loopentry.i
-	br bool false, label %then.2, label %endif.2
-
+	br i1 false, label %then.2, label %endif.2
 then.2:		; preds = %clear_bit62.exit
 	ret void
-
 endif.2:		; preds = %clear_bit62.exit
 	ret void
-
 after_ret.1:		; No predecessors!
 	ret void
-
 return:		; No predecessors!
 	unreachable
 }
diff --git a/test/Transforms/LCSSA/basictest.ll b/test/Transforms/LCSSA/basictest.ll
index 4dc1f54cd7..090bde95d9 100644
--- a/test/Transforms/LCSSA/basictest.ll
+++ b/test/Transforms/LCSSA/basictest.ll
@@ -1,28 +1,24 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: llvm-as < %s | opt -lcssa | llvm-dis | \
 ; RUN:   grep {X3.lcssa = phi i32}
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: llvm-as < %s | opt -lcssa | llvm-dis | \
 ; RUN:   grep {X4 = add i32 3, %X3.lcssa}
 
-void %lcssa(bool %S2) {
+define void @lcssa(i1 %S2) {
 entry:
 	br label %loop.interior
-
-loop.interior:		; preds = %entry
-	br bool %S2, label %if.true, label %if.false
-	
-if.true:
-	%X1 = add int 0, 0
+loop.interior:		; preds = %post.if, %entry
+	br i1 %S2, label %if.true, label %if.false
+if.true:		; preds = %loop.interior
+	%X1 = add i32 0, 0		; <i32> [#uses=1]
 	br label %post.if
-
-if.false:
-	%X2 = add int 0, 1
+if.false:		; preds = %loop.interior
+	%X2 = add i32 0, 1		; <i32> [#uses=1]
 	br label %post.if
-
-post.if:
-	%X3 = phi int [%X1, %if.true], [%X2, %if.false]
-	br bool %S2, label %loop.exit, label %loop.interior
-
-loop.exit:
-	%X4 = add int 3, %X3
+post.if:		; preds = %if.false, %if.true
+	%X3 = phi i32 [ %X1, %if.true ], [ %X2, %if.false ]		; <i32> [#uses=1]
+	br i1 %S2, label %loop.exit, label %loop.interior
+loop.exit:		; preds = %post.if
+	%X4 = add i32 3, %X3		; <i32> [#uses=0]
 	ret void
 }
+