1 files changed, 21 insertions, 24 deletions
diff --git a/test/Transforms/InstCombine/getelementptr-setcc.ll b/test/Transforms/InstCombine/getelementptr-setcc.ll
index 55102f49b2..0a6d720d74 100644
--- a/test/Transforms/InstCombine/getelementptr-setcc.ll
+++ b/test/Transforms/InstCombine/getelementptr-setcc.ll
@@ -1,34 +1,31 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:   not grep getelementptr
-; END.
 
-bool %test1(short* %P, int %I, int %J) {
-    %X = getelementptr short* %P, int %I
-    %Y = getelementptr short* %P, int %J
-
-    %C = setlt short* %X, %Y
-    ret bool %C
+define i1 @test1(i16* %P, i32 %I, i32 %J) {
+        %X = getelementptr i16* %P, i32 %I              ; <i16*> [#uses=1]
+        %Y = getelementptr i16* %P, i32 %J              ; <i16*> [#uses=1]
+        %C = icmp ult i16* %X, %Y               ; <i1> [#uses=1]
+        ret i1 %C
 }
 
-bool %test2(short* %P, int %I) {
-    %X = getelementptr short* %P, int %I
-
-    %C = setlt short* %X, %P
-    ret bool %C
+define i1 @test2(i16* %P, i32 %I) {
+        %X = getelementptr i16* %P, i32 %I              ; <i16*> [#uses=1]
+        %C = icmp ult i16* %X, %P               ; <i1> [#uses=1]
+        ret i1 %C
 }
 
-int %test3(int* %P, int %A, int %B) {
-        %tmp.4 = getelementptr int* %P, int %A          ; <int*> [#uses=1]
-        %tmp.9 = getelementptr int* %P, int %B          ; <int*> [#uses=1]
-        %tmp.10 = seteq int* %tmp.4, %tmp.9             ; <bool> [#uses=1]
-        %tmp.11 = cast bool %tmp.10 to int              ; <int> [#uses=1]
-        ret int %tmp.11
+define i32 @test3(i32* %P, i32 %A, i32 %B) {
+        %tmp.4 = getelementptr i32* %P, i32 %A          ; <i32*> [#uses=1]
+        %tmp.9 = getelementptr i32* %P, i32 %B          ; <i32*> [#uses=1]
+        %tmp.10 = icmp eq i32* %tmp.4, %tmp.9           ; <i1> [#uses=1]
+        %tmp.11 = zext i1 %tmp.10 to i32                ; <i32> [#uses=1]
+        ret i32 %tmp.11
 }
 
-int %test4(int* %P, int %A, int %B) {
-        %tmp.4 = getelementptr int* %P, int %A          ; <int*> [#uses=1]
-        %tmp.6 = seteq int* %tmp.4, %P          ; <bool> [#uses=1]
-        %tmp.7 = cast bool %tmp.6 to int                ; <int> [#uses=1]
-        ret int %tmp.7
+define i32 @test4(i32* %P, i32 %A, i32 %B) {
+        %tmp.4 = getelementptr i32* %P, i32 %A          ; <i32*> [#uses=1]
+        %tmp.6 = icmp eq i32* %tmp.4, %P                ; <i1> [#uses=1]
+        %tmp.7 = zext i1 %tmp.6 to i32          ; <i32> [#uses=1]
+        ret i32 %tmp.7
 }