Upgrade tests to not use llvm-upgrade.

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

1 files changed, 16 insertions, 17 deletions

diff --git a/test/Transforms/SimplifyCFG/PhiBlockMerge.ll b/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
index 7b24426..f3844f7 100644
--- a/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
@@ -1,23 +1,22 @@
 ; Test merging of blocks that only have PHI nodes in them
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | not grep N:
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep N:
 ;
 
-int %test(bool %a, bool %b) {
-        br bool %a, label %M, label %O
-
-O:
-	br bool %b, label %N, label %Q
-Q:
-	br label %N
-N:
-	%Wp = phi int [0, %O], [1, %Q]
-	; This block should be foldable into M
-	br label %M
-
-M:
-	%W = phi int [%Wp, %N], [2, %0]
-	%R = add int %W, 1
-	ret int %R
+define i32 @test(i1 %a, i1 %b) {
+; <label>:0
+        br i1 %a, label %M, label %O
+O:              ; preds = %0
+        br i1 %b, label %N, label %Q
+Q:              ; preds = %O
+        br label %N
+N:              ; preds = %Q, %O
+        ; This block should be foldable into M
+        %Wp = phi i32 [ 0, %O ], [ 1, %Q ]              ; <i32> [#uses=1]
+        br label %M
+M:              ; preds = %N, %0
+        %W = phi i32 [ %Wp, %N ], [ 2, %0 ]             ; <i32> [#uses=1]
+        %R = add i32 %W, 1              ; <i32> [#uses=1]
+        ret i32 %R
 }