Remove llvm-upgrade and update tests.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47784 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Feature/testswitch.ll b/test/Feature/testswitch.ll
index 8664ace..417f56b 100644
--- a/test/Feature/testswitch.ll
+++ b/test/Feature/testswitch.ll
@@ -1,25 +1,26 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
+; RUN: llvm-as < %s | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-  %int = type int
+        %int = type i32
 
-implementation
+define i32 @squared(i32 %i0) {
+        switch i32 %i0, label %Default [
+                 i32 1, label %Case1
+                 i32 2, label %Case2
+                 i32 4, label %Case4
+        ]
 
-int "squared"(%int %i0)
-begin
-	switch int %i0, label %Default [ 
-		int 1, label %Case1
-		int 2, label %Case2
-		int 4, label %Case4 ]
+Default:                ; preds = %0
+        ret i32 -1
 
-Default:
-    ret int -1                      ; Unrecognized input value
+Case1:          ; preds = %0
+        ret i32 1
 
-Case1:
-    ret int 1
-Case2:
-    ret int 4
-Case4:
-    ret int 16
-end
+Case2:          ; preds = %0
+        ret i32 4
+
+Case4:          ; preds = %0
+        ret i32 16
+}
+