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, 19 insertions, 24 deletions

diff --git a/test/Feature/forwardreftest.ll b/test/Feature/forwardreftest.ll
index edb1f281eb..26d214ae88 100644
--- a/test/Feature/forwardreftest.ll
+++ b/test/Feature/forwardreftest.ll
@@ -1,34 +1,29 @@
-; 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
 
-  %myty = type int 
-  %myfn = type float (int,double,uint,short)
-  type int(%myfn*)
-  type int(int)
-  type int(int(int)*)
+%myty = type i32 
+%myfn = type float (i32,double,i32,i16)
+type i32(%myfn*)
+type i32(i32)
+type i32(i32(i32)*)
 
-  %thisfuncty = type int (int) *
-implementation
+  %thisfuncty = type i32 (i32) *
 
-declare void %F(%thisfuncty, %thisfuncty, %thisfuncty)
+declare void @F(%thisfuncty, %thisfuncty, %thisfuncty)
 
-; This function always returns zero
-int %zarro(int %Func)
-begin
+define i32 @zarro(i32 %Func) {
 Startup:
-    add int 0, 10
-    ret int 0 
-end
+        add i32 0, 10           ; <i32>:0 [#uses=0]
+        ret i32 0
+}
 
-int %test(int) 
-begin
-    call void %F(%thisfuncty %zarro, %thisfuncty %test, %thisfuncty %foozball)
-    ret int 0
-end
+define i32 @test(i32) {
+        call void @F( %thisfuncty @zarro, %thisfuncty @test, %thisfuncty @foozball )
+        ret i32 0
+}
 
-int %foozball(int)
-begin
-    ret int 0
-end
+define i32 @foozball(i32) {
+        ret i32 0
+}