Remove llvm-upgrade and update tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48137 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
index 7f0a57c..5682ff4 100644
--- a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
@@ -1,24 +1,22 @@
; Basic block #2 should not be merged into BB #3!
;
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | \
; RUN: grep {br label}
;
-declare void %foo()
-implementation
-void "cprop_test12"(int* %data) {
+declare void @foo()
+
+define void @cprop_test12(i32* %data) {
bb0:
- %reg108 = load int* %data
- %cond218 = setne int %reg108, 5
- br bool %cond218, label %bb3, label %bb2
-
-bb2:
- call void %foo()
- br label %bb3
-
-bb3:
- %reg117 = phi int [ 110, %bb2 ], [ %reg108, %bb0 ]
- store int %reg117, int* %data
- ret void
+ %reg108 = load i32* %data ; <i32> [#uses=2]
+ %cond218 = icmp ne i32 %reg108, 5 ; <i1> [#uses=1]
+ br i1 %cond218, label %bb3, label %bb2
+bb2: ; preds = %bb0
+ call void @foo( )
+ br label %bb3
+bb3: ; preds = %bb2, %bb0
+ %reg117 = phi i32 [ 110, %bb2 ], [ %reg108, %bb0 ] ; <i32> [#uses=1]
+ store i32 %reg117, i32* %data
+ ret void
}