Remove llvm-upgrade and update tests.

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

1 files changed, 11 insertions, 13 deletions

diff --git a/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll b/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
index 876e9f2..1a555b3 100644
--- a/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
+++ b/test/CodeGen/Generic/2006-01-12-BadSetCCFold.ll
@@ -1,33 +1,31 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-as < %s | llc
+; ModuleID = '2006-01-12-BadSetCCFold.ll'
+	%struct.node_t = type { double*, %struct.node_t*, %struct.node_t**, double**, double*, i32, i32 }
 
-	%struct.node_t = type { double*, %struct.node_t*, %struct.node_t**, double**, double*, int, int }
-
-implementation   ; Functions:
-
-void %main() {
+define void @main() {
 entry:
-	br bool false, label %then.2.i, label %endif.2.i
+	br i1 false, label %then.2.i, label %endif.2.i
 
 then.2.i:		; preds = %entry
 	br label %dealwithargs.exit
 
 endif.2.i:		; preds = %entry
-	br bool false, label %then.3.i, label %dealwithargs.exit
+	br i1 false, label %then.3.i, label %dealwithargs.exit
 
 then.3.i:		; preds = %endif.2.i
 	br label %dealwithargs.exit
 
 dealwithargs.exit:		; preds = %then.3.i, %endif.2.i, %then.2.i
-	%n_nodes.4 = phi int [ 64, %then.3.i ], [ 64, %then.2.i ], [ 64, %endif.2.i ]		; <int> [#uses=1]
-	%tmp.14.i1134.i.i = setgt int %n_nodes.4, 1		; <bool> [#uses=2]
-	br bool %tmp.14.i1134.i.i, label %no_exit.i12.i.i, label %fill_table.exit22.i.i
+	%n_nodes.4 = phi i32 [ 64, %then.3.i ], [ 64, %then.2.i ], [ 64, %endif.2.i ]		; <i32> [#uses=1]
+	%tmp.14.i1134.i.i = icmp sgt i32 %n_nodes.4, 1		; <i1> [#uses=2]
+	br i1 %tmp.14.i1134.i.i, label %no_exit.i12.i.i, label %fill_table.exit22.i.i
 
 no_exit.i12.i.i:		; preds = %no_exit.i12.i.i, %dealwithargs.exit
-	br bool false, label %fill_table.exit22.i.i, label %no_exit.i12.i.i
+	br i1 false, label %fill_table.exit22.i.i, label %no_exit.i12.i.i
 
 fill_table.exit22.i.i:		; preds = %no_exit.i12.i.i, %dealwithargs.exit
 	%cur_node.0.i8.1.i.i = phi %struct.node_t* [ undef, %dealwithargs.exit ], [ null, %no_exit.i12.i.i ]		; <%struct.node_t*> [#uses=0]
-	br bool %tmp.14.i1134.i.i, label %no_exit.i.preheader.i.i, label %make_tables.exit.i
+	br i1 %tmp.14.i1134.i.i, label %no_exit.i.preheader.i.i, label %make_tables.exit.i
 
 no_exit.i.preheader.i.i:		; preds = %fill_table.exit22.i.i
 	ret void