Upgrade tests.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48536 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll b/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
index 0d9d2d4..cbc54be 100644
--- a/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
+++ b/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
@@ -1,28 +1,26 @@
-; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: llvm-as < %s | \
 ; RUN:   opt -predsimplify -instcombine -simplifycfg | llvm-dis | \
 ; RUN:   grep -v declare | grep pass | count 2
 
-int %test(int %x, int %y) {
+define i32 @test(i32 %x, i32 %y) {
 entry:
-        %tmp2 = setlt int %x, %y
-	%tmp = setne bool %tmp2, true
-	br bool %tmp, label %cond_true, label %return
-
+	%tmp2 = icmp slt i32 %x, %y		; <i1> [#uses=1]
+	%tmp = icmp ne i1 %tmp2, true		; <i1> [#uses=1]
+	br i1 %tmp, label %cond_true, label %return
 cond_true:		; preds = %entry
-	%tmp4 = seteq int %x, %y		; <bool> [#uses=1]
-	br bool %tmp4, label %cond_true5, label %cond_false
-
+	%tmp4 = icmp eq i32 %x, %y		; <i1> [#uses=1]
+	br i1 %tmp4, label %cond_true5, label %cond_false
 cond_true5:		; preds = %cond_true
-	%tmp6 = call int %pass1( )		; <int> [#uses=1]
-	ret int %tmp6
-
-cond_false:
-	%tmp8 = call int %pass2( )		; <int> [#uses=1]
-	ret int %tmp8
-
-return:		; preds = %cond_next7
-	ret int 0
+	%tmp6 = call i32 @pass1( )		; <i32> [#uses=1]
+	ret i32 %tmp6
+cond_false:		; preds = %cond_true
+	%tmp8 = call i32 @pass2( )		; <i32> [#uses=1]
+	ret i32 %tmp8
+return:		; preds = %entry
+	ret i32 0
 }
 
-declare int %pass1()
-declare int %pass2()
+declare i32 @pass1()
+
+declare i32 @pass2()
+