Remove llvm-upgrade and update tests.

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

1 files changed, 48 insertions, 53 deletions

diff --git a/test/Feature/recursivetype.ll b/test/Feature/recursivetype.ll
index 9ea3484..43db5f0 100644
--- a/test/Feature/recursivetype.ll
+++ b/test/Feature/recursivetype.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
+; RUN: llvm-as < %s | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
@@ -37,72 +37,67 @@
 ;   if (FindData(MyList, 700)) foundIt();
 ; }
 
-%list = type { %list*, int }
+%list = type { %list*, i32 }
 
-declare sbyte *"malloc"(uint)
+declare i8* @malloc(i32)
 
-;;**********************
-implementation
-;;**********************
-
-void "InsertIntoListTail"(%list** %L, int %Data)
-begin
+define void @InsertIntoListTail(%list** %L, i32 %Data) {
 bb1:
-        %reg116 = load %list** %L                               ;;<%list*>
-        %cast1004 = cast ulong 0 to %list*                      ;;<%list*>
-        %cond1000 = seteq %list* %reg116, %cast1004             ;;<bool>
-        br bool %cond1000, label %bb3, label %bb2
+        %reg116 = load %list** %L               ; <%list*> [#uses=1]
+        %cast1004 = inttoptr i64 0 to %list*            ; <%list*> [#uses=1]
+        %cond1000 = icmp eq %list* %reg116, %cast1004           ; <i1> [#uses=1]
+        br i1 %cond1000, label %bb3, label %bb2
 
-bb2:
-        %reg117 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]   ;;<%list**>
-        %cast1010 = cast %list** %reg117 to %list***            ;;<%list***>
-        %reg118 = load %list*** %cast1010                       ;;<%list**>
-        %reg109 = load %list** %reg118                          ;;<%list*>
-        %cast1005 = cast ulong 0 to %list*                      ;;<%list*>
-        %cond1001 = setne %list* %reg109, %cast1005             ;;<bool>
-        br bool %cond1001, label %bb2, label %bb3
+bb2:            ; preds = %bb2, %bb1
+        %reg117 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]           ; <%list**> [#uses=1]
+        %cast1010 = bitcast %list** %reg117 to %list***         ; <%list***> [#uses=1]
+        %reg118 = load %list*** %cast1010               ; <%list**> [#uses=3]
+        %reg109 = load %list** %reg118          ; <%list*> [#uses=1]
+        %cast1005 = inttoptr i64 0 to %list*            ; <%list*> [#uses=1]
+        %cond1001 = icmp ne %list* %reg109, %cast1005           ; <i1> [#uses=1]
+        br i1 %cond1001, label %bb2, label %bb3
 
-bb3:
-        %reg119 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]   ;;<%list**>
-        %cast1006 = cast %list** %reg119 to sbyte**             ;;<sbyte**>
-        %reg111 = call sbyte* %malloc(uint 16)                  ;;<sbyte*>
-        store sbyte* %reg111, sbyte** %cast1006                 ;;<void>
-	%reg111 = cast sbyte* %reg111 to ulong
-	%reg1002 = add ulong %reg111, 8
-        %reg1002 = cast ulong %reg1002 to sbyte*             ;;<sbyte*>
-        %cast1008 = cast sbyte* %reg1002 to int*                ;;<int*>
-        store int %Data, int* %cast1008                         ;;<void>
-        %cast1003 = cast ulong 0 to ulong*                      ;;<ulong*>
-        %cast1009 = cast sbyte* %reg111 to ulong**              ;;<ulong**>
-        store ulong* %cast1003, ulong** %cast1009               ;;<void>
+bb3:            ; preds = %bb2, %bb1
+        %reg119 = phi %list** [ %reg118, %bb2 ], [ %L, %bb1 ]           ; <%list**> [#uses=1]
+        %cast1006 = bitcast %list** %reg119 to i8**             ; <i8**> [#uses=1]
+        %reg111 = call i8* @malloc( i32 16 )            ; <i8*> [#uses=3]
+        store i8* %reg111, i8** %cast1006
+        %reg111.upgrd.1 = ptrtoint i8* %reg111 to i64           ; <i64> [#uses=1]
+        %reg1002 = add i64 %reg111.upgrd.1, 8           ; <i64> [#uses=1]
+        %reg1002.upgrd.2 = inttoptr i64 %reg1002 to i8*         ; <i8*> [#uses=1]
+        %cast1008 = bitcast i8* %reg1002.upgrd.2 to i32*                ; <i32*> [#uses=1]
+        store i32 %Data, i32* %cast1008
+        %cast1003 = inttoptr i64 0 to i64*              ; <i64*> [#uses=1]
+        %cast1009 = bitcast i8* %reg111 to i64**                ; <i64**> [#uses=1]
+        store i64* %cast1003, i64** %cast1009
         ret void
-end
+}
 
-%list* "FindData"(%list* %L, int %Data)
-begin
+define %list* @FindData(%list* %L, i32 %Data) {
 bb1:
         br label %bb2
 
-bb2:
-        %reg115 = phi %list* [ %reg116, %bb6 ], [ %L, %bb1 ]    ;;<%list*>
-        %cast1014 = cast ulong 0 to %list*                      ;;<%list*>
-        %cond1011 = setne %list* %reg115, %cast1014             ;;<bool>
-        br bool %cond1011, label %bb4, label %bb3
+bb2:            ; preds = %bb6, %bb1
+        %reg115 = phi %list* [ %reg116, %bb6 ], [ %L, %bb1 ]            ; <%list*> [#uses=4]
+        %cast1014 = inttoptr i64 0 to %list*            ; <%list*> [#uses=1]
+        %cond1011 = icmp ne %list* %reg115, %cast1014           ; <i1> [#uses=1]
+        br i1 %cond1011, label %bb4, label %bb3
 
-bb3:
+bb3:            ; preds = %bb2
         ret %list* null
 
-bb4:
-	%idx = getelementptr %list* %reg115, long 0, uint 1                  ;;<int>
-        %reg111 = load int* %idx
-        %cond1013 = setne int %reg111, %Data                    ;;<bool>
-        br bool %cond1013, label %bb6, label %bb5
+bb4:            ; preds = %bb2
+        %idx = getelementptr %list* %reg115, i64 0, i32 1               ; <i32*> [#uses=1]
+        %reg111 = load i32* %idx                ; <i32> [#uses=1]
+        %cond1013 = icmp ne i32 %reg111, %Data          ; <i1> [#uses=1]
+        br i1 %cond1013, label %bb6, label %bb5
 
-bb5:
+bb5:            ; preds = %bb4
         ret %list* %reg115
 
-bb6:
-	%idx2 = getelementptr %list* %reg115, long 0, uint 0                  ;;<%list*>
-        %reg116 = load %list** %idx2
+bb6:            ; preds = %bb4
+        %idx2 = getelementptr %list* %reg115, i64 0, i32 0              ; <%list**> [#uses=1]
+        %reg116 = load %list** %idx2            ; <%list*> [#uses=1]
         br label %bb2
-end
+}
+