1 files changed, 55 insertions, 50 deletions

diff --git a/llvm/test/Transforms/InstCombine/getelementptr.ll b/llvm/test/Transforms/InstCombine/getelementptr.ll
index 7e8809220af..c2cb7208031 100644
--- a/llvm/test/Transforms/InstCombine/getelementptr.ll
+++ b/llvm/test/Transforms/InstCombine/getelementptr.ll
@@ -1,76 +1,81 @@
 ; The %A getelementptr instruction should be eliminated here
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:    grep -v %B | not grep getelementptr
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep foo1
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep foo1
 ; END.
 
-%Global = constant [10 x sbyte] c"helloworld"
+@Global = constant [10 x i8] c"helloworld"              ; <[10 x i8]*> [#uses=1]
 
-implementation
-
-int *%foo1(int* %I) { ; Test noop elimination
-	%A = getelementptr int* %I, long 0
-	ret int * %A
+; Test noop elimination
+define i32* @foo1(i32* %I) {
+        %A = getelementptr i32* %I, i64 0               ; <i32*> [#uses=1]
+        ret i32* %A
 }
 
-int* %foo2(int* %I) {  ; Test noop elimination
-	%A = getelementptr int* %I
-	ret int* %A
+; Test noop elimination
+define i32* @foo2(i32* %I) {
+        %A = getelementptr i32* %I              ; <i32*> [#uses=1]
+        ret i32* %A
 }
-int* %foo3(int * %I) { ; Test that two array indexing geps fold
-	%A = getelementptr int* %I, long 17
-	%B = getelementptr int* %A, long 4
-	ret int* %B
+
+; Test that two array indexing geps fold
+define i32* @foo3(i32* %I) {
+        %A = getelementptr i32* %I, i64 17              ; <i32*> [#uses=1]
+        %B = getelementptr i32* %A, i64 4               ; <i32*> [#uses=1]
+        ret i32* %B
 }
 
-int* %foo4({int} *%I) { ; Test that two getelementptr insts fold
-	%A = getelementptr {int}* %I, long 1
-	%B = getelementptr {int}* %A, long 0, uint 0
-	ret int* %B
+; Test that two getelementptr insts fold
+define i32* @foo4({ i32 }* %I) {
+        %A = getelementptr { i32 }* %I, i64 1           ; <{ i32 }*> [#uses=1]
+        %B = getelementptr { i32 }* %A, i64 0, i32 0            ; <i32*> [#uses=1]
+        ret i32* %B
 }
 
-void %foo5(sbyte %B) {
-	; This should be turned into a constexpr instead of being an instruction
-	%A = getelementptr [10 x sbyte]* %Global, long 0, long 4
-	store sbyte %B, sbyte* %A
-	ret void
+define void @foo5(i8 %B) {
+        ; This should be turned into a constexpr instead of being an instruction
+        %A = getelementptr [10 x i8]* @Global, i64 0, i64 4             ; <i8*> [#uses=1]
+        store i8 %B, i8* %A
+        ret void
 }
 
-int* %foo6() {
-	%M = malloc [4 x int]
-	%A = getelementptr [4 x int]* %M, long 0, long 0
-	%B = getelementptr int* %A, long 2
-	ret int* %B
+define i32* @foo6() {
+        %M = malloc [4 x i32]           ; <[4 x i32]*> [#uses=1]
+        %A = getelementptr [4 x i32]* %M, i64 0, i64 0          ; <i32*> [#uses=1]
+        %B = getelementptr i32* %A, i64 2               ; <i32*> [#uses=1]
+        ret i32* %B
 }
 
-int* %foo7(int* %I, long %C, long %D) {
-	%A = getelementptr int* %I, long %C
-	%B = getelementptr int* %A, long %D
-	ret int* %B
+define i32* @foo7(i32* %I, i64 %C, i64 %D) {
+        %A = getelementptr i32* %I, i64 %C              ; <i32*> [#uses=1]
+        %B = getelementptr i32* %A, i64 %D              ; <i32*> [#uses=1]
+        ret i32* %B
 }
 
-sbyte* %foo8([10 x int]* %X) {
-	%A = getelementptr [10 x int]* %X, long 0, long 0   ;; Fold into the cast.
-	%B = cast int* %A to sbyte*
-	ret sbyte * %B
+define i8* @foo8([10 x i32]* %X) {
+        ;; Fold into the cast.
+        %A = getelementptr [10 x i32]* %X, i64 0, i64 0         ; <i32*> [#uses=1]
+        %B = bitcast i32* %A to i8*             ; <i8*> [#uses=1]
+        ret i8* %B
 }
 
-int %test9() {
-	%A = getelementptr {int, double}* null, int 0, uint 1
-	%B = cast double* %A to int
-	ret int %B
+define i32 @test9() {
+        %A = getelementptr { i32, double }* null, i32 0, i32 1          ; <double*> [#uses=1]
+        %B = ptrtoint double* %A to i32         ; <i32> [#uses=1]
+        ret i32 %B
 }
 
-bool %test10({int, int} * %x, {int, int} * %y) {
-        %tmp.1 = getelementptr {int,int}* %x, int 0, uint 1
-        %tmp.3 = getelementptr {int,int}* %y, int 0, uint 1
-        %tmp.4 = seteq int* %tmp.1, %tmp.3    ;; seteq x, y
-        ret bool %tmp.4
+define i1 @test10({ i32, i32 }* %x, { i32, i32 }* %y) {
+        %tmp.1 = getelementptr { i32, i32 }* %x, i32 0, i32 1           ; <i32*> [#uses=1]
+        %tmp.3 = getelementptr { i32, i32 }* %y, i32 0, i32 1           ; <i32*> [#uses=1]
+        ;; seteq x, y
+        %tmp.4 = icmp eq i32* %tmp.1, %tmp.3            ; <i1> [#uses=1]
+        ret i1 %tmp.4
 }
 
-bool %test11({int,int} *%X) {
-	%P = getelementptr {int,int}* %X, int 0, uint 0
-	%Q = seteq int* %P, null
-	ret bool %Q
+define i1 @test11({ i32, i32 }* %X) {
+        %P = getelementptr { i32, i32 }* %X, i32 0, i32 0               ; <i32*> [#uses=1]
+        %Q = icmp eq i32* %P, null              ; <i1> [#uses=1]
+        ret i1 %Q
 }