1 files changed, 21 insertions, 20 deletions
diff --git a/test/CodeGen/Generic/SwitchLowering.ll b/test/CodeGen/Generic/SwitchLowering.ll
index a8c14f1..9fdfd8d 100644
--- a/test/CodeGen/Generic/SwitchLowering.ll
+++ b/test/CodeGen/Generic/SwitchLowering.ll
@@ -1,27 +1,28 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | count 1
+; RUN: llvm-as < %s | llc -march=x86 | grep cmp | count 1
 ; PR964
 
-sbyte* %FindChar(sbyte* %CurPtr) {
+define i8* @FindChar(i8* %CurPtr) {
 entry:
-	br label %bb
+        br label %bb
 
-bb:		; preds = %bb, %entry
-	%indvar = phi uint [ 0, %entry ], [ %indvar.next, %bb ]		; <uint> [#uses=3]
-	%CurPtr_addr.0.rec = cast uint %indvar to int		; <int> [#uses=1]
-	%CurPtr_addr.0 = getelementptr sbyte* %CurPtr, uint %indvar		; <sbyte*> [#uses=1]
-	%tmp = load sbyte* %CurPtr_addr.0		; <sbyte> [#uses=2]
-	%tmp2.rec = add int %CurPtr_addr.0.rec, 1		; <int> [#uses=1]
-	%tmp2 = getelementptr sbyte* %CurPtr, int %tmp2.rec		; <sbyte*> [#uses=1]
-	%indvar.next = add uint %indvar, 1		; <uint> [#uses=1]
-	switch sbyte %tmp, label %bb [
-		 sbyte 0, label %bb7
-		 sbyte 120, label %bb7
-	]
+bb:             ; preds = %bb, %entry
+        %indvar = phi i32 [ 0, %entry ], [ %indvar.next, %bb ]          ; <i32> [#uses=3]
+        %CurPtr_addr.0.rec = bitcast i32 %indvar to i32         ; <i32> [#uses=1]
+        %gep.upgrd.1 = zext i32 %indvar to i64          ; <i64> [#uses=1]
+        %CurPtr_addr.0 = getelementptr i8* %CurPtr, i64 %gep.upgrd.1            ; <i8*> [#uses=1]
+        %tmp = load i8* %CurPtr_addr.0          ; <i8> [#uses=3]
+        %tmp2.rec = add i32 %CurPtr_addr.0.rec, 1               ; <i32> [#uses=1]
+        %tmp2 = getelementptr i8* %CurPtr, i32 %tmp2.rec                ; <i8*> [#uses=1]
+        %indvar.next = add i32 %indvar, 1               ; <i32> [#uses=1]
+        switch i8 %tmp, label %bb [
+                 i8 0, label %bb7
+                 i8 120, label %bb7
+        ]
 
-bb7:		; preds = %bb, %bb
-	%tmp = cast sbyte %tmp to ubyte		; <ubyte> [#uses=1]
-	tail call void %foo( ubyte %tmp )
-	ret sbyte* %tmp2
+bb7:            ; preds = %bb, %bb
+        tail call void @foo( i8 %tmp )
+        ret i8* %tmp2
 }
 
-declare void %foo(ubyte)
+declare void @foo(i8)
+