Remove llvm-upgrade and update tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47296 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/Generic/badlive.ll b/test/CodeGen/Generic/badlive.ll
index 8c08153..0114fb0 100644
--- a/test/CodeGen/Generic/badlive.ll
+++ b/test/CodeGen/Generic/badlive.ll
@@ -1,30 +1,28 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-as < %s | llc
-implementation
-
-int "main"()
-begin
+define i32 @main() {
bb0:
- %reg109 = malloc int, uint 100
- br label %bb2
+ %reg109 = malloc i32, i32 100 ; <i32*> [#uses=2]
+ br label %bb2
-bb2:
- %cann-indvar1 = phi int [ 0, %bb0 ], [ %add1-indvar1, %bb2 ]
- %reg127 = mul int %cann-indvar1, 2
- %add1-indvar1 = add int %cann-indvar1, 1
- store int 999, int * %reg109
- %cond1015 = setle int 1, 99
- %reg128 = add int %reg127, 2
- br bool %cond1015, label %bb2, label %bb4
+bb2: ; preds = %bb2, %bb0
+ %cann-indvar1 = phi i32 [ 0, %bb0 ], [ %add1-indvar1, %bb2 ] ; <i32> [#uses=2]
+ %reg127 = mul i32 %cann-indvar1, 2 ; <i32> [#uses=1]
+ %add1-indvar1 = add i32 %cann-indvar1, 1 ; <i32> [#uses=1]
+ store i32 999, i32* %reg109
+ %cond1015 = icmp sle i32 1, 99 ; <i1> [#uses=1]
+ %reg128 = add i32 %reg127, 2 ; <i32> [#uses=0]
+ br i1 %cond1015, label %bb2, label %bb4
-bb4: ;[#uses=3]
- %cann-indvar = phi uint [ %add1-indvar, %bb4 ], [ 0, %bb2 ]
- %add1-indvar = add uint %cann-indvar, 1 ; <uint> [#uses=1]
- store int 333, int * %reg109
- %reg131 = add uint %add1-indvar, 3 ; <int> [#uses=1]
- %cond1017 = setle uint %reg131, 99 ; <bool> [#uses=1]
- br bool %cond1017, label %bb4, label %bb5
+bb4: ; preds = %bb4, %bb2
+ %cann-indvar = phi i32 [ %add1-indvar, %bb4 ], [ 0, %bb2 ] ; <i32> [#uses=1]
+ %add1-indvar = add i32 %cann-indvar, 1 ; <i32> [#uses=2]
+ store i32 333, i32* %reg109
+ %reg131 = add i32 %add1-indvar, 3 ; <i32> [#uses=1]
+ %cond1017 = icmp ule i32 %reg131, 99 ; <i1> [#uses=1]
+ br i1 %cond1017, label %bb4, label %bb5
-bb5:
- ret int 0
-end
+bb5: ; preds = %bb4
+ ret i32 0
+}
+