Remove llvm-upgrade and update tests.

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

1 files changed, 10 insertions, 9 deletions

diff --git a/test/Transforms/InstCombine/getelementptr_const.ll b/test/Transforms/InstCombine/getelementptr_const.ll
index e4265f4197..3de9ecec2d 100644
--- a/test/Transforms/InstCombine/getelementptr_const.ll
+++ b/test/Transforms/InstCombine/getelementptr_const.ll
@@ -1,14 +1,15 @@
 ; Test folding of constantexpr geps into normal geps.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | \
+; RUN: llvm-as < %s | opt -instcombine -gcse -instcombine | \
 ; RUN:    llvm-dis | not grep getelementptr
 
-%Array = external global [40 x int]
+@Array = external global [40 x i32]             ; <[40 x i32]*> [#uses=2]
 
-int %test(long %X) {
-	%A = getelementptr int* getelementptr ([40 x int]* %Array, long 0, long 0), long %X
-	%B = getelementptr [40 x int]* %Array, long 0, long %X
-	%a = cast int* %A to int
-	%b = cast int* %B to int
-	%c = sub int %a, %b
-	ret int %c
+define i32 @test(i64 %X) {
+        %A = getelementptr i32* getelementptr ([40 x i32]* @Array, i64 0, i64 0), i64 %X  ; <i32*> [#uses=1]
+        %B = getelementptr [40 x i32]* @Array, i64 0, i64 %X            ; <i32*> [#uses=1]
+        %a = ptrtoint i32* %A to i32            ; <i32> [#uses=1]
+        %b = ptrtoint i32* %B to i32            ; <i32> [#uses=1]
+        %c = sub i32 %a, %b             ; <i32> [#uses=1]
+        ret i32 %c
 }
+