Remove llvm-upgrade and update tests.

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

1 files changed, 11 insertions, 12 deletions

diff --git a/test/CodeGen/Generic/nested-select.ll b/test/CodeGen/Generic/nested-select.ll
index 192d29f93b..a723a4d742 100644
--- a/test/CodeGen/Generic/nested-select.ll
+++ b/test/CodeGen/Generic/nested-select.ll
@@ -1,20 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -o /dev/null -f
+; RUN: llvm-as < %s | llc -o /dev/null -f
 
 ; Test that select of a select works
 
 %typedef.tree = type opaque
 
-implementation
+define i32 @ic_test(double %p.0.2.0.val, double %p.0.2.1.val, double %p.0.2.2.val, %typedef.tree* %t) {
+        %result.1.0 = zext i1 false to i32              ; <i32> [#uses=1]
+        %tmp.55 = fcmp oge double 0.000000e+00, 1.000000e+00            ; <i1> [#uses=1]
+        %tmp.66 = fdiv double 0.000000e+00, 0.000000e+00                ; <double> [#uses=1]
+        br label %N
 
-int %ic_test(double %p.0.2.0.val, double %p.0.2.1.val, double %p.0.2.2.val, %typedef.tree* %t) {
-        %result.1.0 = cast bool false to int            ; <int> [#uses=1]
-        %tmp.55 = setge double 0.000000e+00, 1.000000e+00               ; <bool> [#uses=1]
-        %tmp.66 = div double 0.000000e+00, 0.000000e+00         ; <double> [#uses=1]
-	br label %N
-N:
-        %result.1.1 = select bool %tmp.55, int 0, int %result.1.0               ; <int> [#uses=1]
-        %tmp.75 = setge double %tmp.66, 1.000000e+00            ; <bool> [#uses=1]
-        %retval1 = select bool %tmp.75, int 0, int %result.1.1          ; <int> [#uses=1]
-        ret int %retval1
+N:              ; preds = %0
+        %result.1.1 = select i1 %tmp.55, i32 0, i32 %result.1.0         ; <i32> [#uses=1]
+        %tmp.75 = fcmp oge double %tmp.66, 1.000000e+00         ; <i1> [#uses=1]
+        %retval1 = select i1 %tmp.75, i32 0, i32 %result.1.1            ; <i32> [#uses=1]
+        ret i32 %retval1
 }