Remove llvm-upgrade and update tests.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47297 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Other/2004-08-20-PackedControlFlow.ll b/test/Other/2004-08-20-PackedControlFlow.ll
index d2566b1..49aa606 100644
--- a/test/Other/2004-08-20-PackedControlFlow.ll
+++ b/test/Other/2004-08-20-PackedControlFlow.ll
@@ -1,23 +1,22 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as > /dev/null
+; RUN: llvm-as < %s | llvm-dis | llvm-as > /dev/null
 
-%v4f = type <4 x float>
+        %v4f = type <4 x float>
+@foo = external global %v4f             ; <%v4f*> [#uses=1]
+@bar = external global %v4f             ; <%v4f*> [#uses=1]
 
-%foo = uninitialized global %v4f
-%bar = uninitialized global %v4f
+define void @main() {
+        br label %A
 
-implementation   ; Functions:
+C:              ; preds = %B
+        store %v4f %t2, %v4f* @bar
+        ret void
 
-void %main() {
-	br label %A
-C:
-	store %v4f %t2, %v4f* %bar  
-	ret void
+B:              ; preds = %A
+        %t2 = add %v4f %t0, %t0         ; <%v4f> [#uses=1]
+        br label %C
 
-B:
-	%t2 = add %v4f %t0, %t0
-	br label %C
-
-A:
-	%t0 = load %v4f* %foo
-	br label %B
+A:              ; preds = %0
+        %t0 = load %v4f* @foo           ; <%v4f> [#uses=2]
+        br label %B
 }
+