1 files changed, 28 insertions, 28 deletions
diff --git a/llvm/test/CodeGen/ARM/vargs2.ll b/llvm/test/CodeGen/ARM/vargs2.ll
index ae4ca5be562..fb0b8d8ef7c 100644
--- a/llvm/test/CodeGen/ARM/vargs2.ll
+++ b/llvm/test/CodeGen/ARM/vargs2.ll
@@ -1,36 +1,36 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
+; RUN: llvm-as < %s | llc -march=thumb
+; RUN: llvm-as < %s | llc -march=thumb | \
 ; RUN:   grep pop | count 2
 
-%str = internal constant [4 x sbyte] c"%d\0A\00"		; <[4 x sbyte]*> [#uses=1]
+@str = internal constant [4 x i8] c"%d\0A\00"           ; <[4 x i8]*> [#uses=1]
 
-implementation   ; Functions:
-
-void %f(int %a, ...) {
+define void @f(i32 %a, ...) {
 entry:
-	%va = alloca sbyte*, align 4		; <sbyte**> [#uses=4]
-	call void %llvm.va_start( sbyte** %va )
-	br label %bb
-
-bb:		; preds = %bb, %entry
-	%a_addr.0 = phi int [ %a, %entry ], [ %tmp5, %bb ]		; <int> [#uses=2]
-	%tmp = volatile load sbyte** %va		; <sbyte*> [#uses=2]
-	%tmp2 = getelementptr sbyte* %tmp, int 4		; <sbyte*> [#uses=1]
-	volatile store sbyte* %tmp2, sbyte** %va
-	%tmp5 = add int %a_addr.0, -1		; <int> [#uses=1]
-	%tmp = seteq int %a_addr.0, 1		; <bool> [#uses=1]
-	br bool %tmp, label %bb7, label %bb
-
-bb7:		; preds = %bb
-	%tmp3 = cast sbyte* %tmp to int*		; <int*> [#uses=1]
-	%tmp = load int* %tmp3		; <int> [#uses=1]
-	%tmp10 = call int (sbyte*, ...)* %printf( sbyte* getelementptr ([4 x sbyte]* %str, int 0, uint 0), int %tmp )		; <int> [#uses=0]
-	call void %llvm.va_end( sbyte** %va )
-	ret void
+        %va = alloca i8*, align 4               ; <i8**> [#uses=4]
+        %va.upgrd.1 = bitcast i8** %va to i8*           ; <i8*> [#uses=1]
+        call void @llvm.va_start( i8* %va.upgrd.1 )
+        br label %bb
+
+bb:             ; preds = %bb, %entry
+        %a_addr.0 = phi i32 [ %a, %entry ], [ %tmp5, %bb ]              ; <i32> [#uses=2]
+        %tmp = volatile load i8** %va           ; <i8*> [#uses=2]
+        %tmp2 = getelementptr i8* %tmp, i32 4           ; <i8*> [#uses=1]
+        volatile store i8* %tmp2, i8** %va
+        %tmp5 = add i32 %a_addr.0, -1           ; <i32> [#uses=1]
+        %tmp.upgrd.2 = icmp eq i32 %a_addr.0, 1         ; <i1> [#uses=1]
+        br i1 %tmp.upgrd.2, label %bb7, label %bb
+
+bb7:            ; preds = %bb
+        %tmp3 = bitcast i8* %tmp to i32*                ; <i32*> [#uses=1]
+        %tmp.upgrd.3 = load i32* %tmp3          ; <i32> [#uses=1]
+        %tmp10 = call i32 (i8*, ...)* @printf( i8* getelementptr ([4 x i8]* @str, i32 0, i64 0), i32 %tmp.upgrd.3 )                ; <i32> [#uses=0]
+        %va.upgrd.4 = bitcast i8** %va to i8*           ; <i8*> [#uses=1]
+        call void @llvm.va_end( i8* %va.upgrd.4 )
+        ret void
 }
 
-declare void %llvm.va_start(sbyte**)
+declare void @llvm.va_start(i8*)
 
-declare int %printf(sbyte*, ...)
+declare i32 @printf(i8*, ...)
 
-declare void %llvm.va_end(sbyte**)
+declare void @llvm.va_end(i8*)