Remove llvm-upgrade and update tests.

llvm-svn: 47784

1 files changed, 14 insertions, 22 deletions

diff --git a/llvm/test/Feature/globalvars.ll b/llvm/test/Feature/globalvars.ll
index 26259dad4c6..9a23775269b 100644
--- a/llvm/test/Feature/globalvars.ll
+++ b/llvm/test/Feature/globalvars.ll
@@ -1,26 +1,18 @@
-; 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
 
-
-%MyVar     = uninitialized global int
-%MyIntList = uninitialized global { \2 *, int }
-             external global int      ; int*:0
-
-%AConst    = constant int 123
-
-%AString   = constant [4 x ubyte] c"test"
-
-%ZeroInit  = global { [100 x int ], [40 x float ] } { [100 x int] zeroinitializer,
-                                                      [40  x float] zeroinitializer }
-
-implementation
-
-int "foo"(int %blah)
-begin
-	store int 5, int *%MyVar
-	%idx = getelementptr { \2 *, int } * %MyIntList, long 0, uint 1
-  	store int 12, int* %idx
-  	ret int %blah
-end
+@MyVar = external global i32            ; <i32*> [#uses=1]
+@MyIntList = external global { \2*, i32 }               ; <{ \2*, i32 }*> [#uses=1]
+external global i32             ; <i32*>:0 [#uses=0]
+@AConst = constant i32 123              ; <i32*> [#uses=0]
+@AString = constant [4 x i8] c"test"            ; <[4 x i8]*> [#uses=0]
+@ZeroInit = global { [100 x i32], [40 x float] } zeroinitializer                ; <{ [100 x i32], [40 x float] }*> [#uses=0]
+
+define i32 @foo(i32 %blah) {
+        store i32 5, i32* @MyVar
+        %idx = getelementptr { \2*, i32 }* @MyIntList, i64 0, i32 1             ; <i32*> [#uses=1]
+        store i32 12, i32* %idx
+        ret i32 %blah
+}