Upgrade tests to not use llvm-upgrade.

[oota-llvm.git] / test / Transforms / SimplifyCFG / branch-cond-merge.ll

diff --git a/test/Transforms/SimplifyCFG/branch-cond-merge.ll b/test/Transforms/SimplifyCFG/branch-cond-merge.ll
index 2a93057959298f27f425d1c2410ef341b2082c41..ae465036584fe81d581aa2667163d3bba0a20831 100644 (file)
--- a/test/Transforms/SimplifyCFG/branch-cond-merge.ll
+++ b/test/Transforms/SimplifyCFG/branch-cond-merge.ll
@@ -1,22 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -instcombine \
+; RUN: llvm-as < %s | opt -simplifycfg -instcombine \
 ; RUN:   -simplifycfg | llvm-dis | not grep call
 
-declare void %bar()
+declare void @bar()
 
-void %test(int %X, int %Y) {
+define void @test(i32 %X, i32 %Y) {
 entry:
-        %tmp.2 = setne int %X, %Y
-        br bool %tmp.2, label %shortcirc_next, label %UnifiedReturnBlock
-
-shortcirc_next:
-        %tmp.3 = setne int %X, %Y
-        br bool %tmp.3, label %UnifiedReturnBlock, label %then
-
-then:
-        call void %bar( )
+        %tmp.2 = icmp ne i32 %X, %Y             ; <i1> [#uses=1]
+        br i1 %tmp.2, label %shortcirc_next, label %UnifiedReturnBlock
+shortcirc_next:         ; preds = %entry
+        %tmp.3 = icmp ne i32 %X, %Y             ; <i1> [#uses=1]
+        br i1 %tmp.3, label %UnifiedReturnBlock, label %then
+then:           ; preds = %shortcirc_next
+        call void @bar( )
+        ret void
+UnifiedReturnBlock:             ; preds = %shortcirc_next, %entry
         ret void
-
-UnifiedReturnBlock:             ; preds = %entry, %shortcirc_next
-       ret void
 }