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/casttest.ll b/test/Feature/casttest.ll
index 96f971a..d9c22ff 100644
--- a/test/Feature/casttest.ll
+++ b/test/Feature/casttest.ll
@@ -1,13 +1,12 @@
-; 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
 
-short "FunFunc"(long %x, sbyte %z)
-begin
-bb0:            ;;<label>
-        %cast110 = cast sbyte %z to short       ;;<short>:(signed operands)
-        %cast10 = cast long %x to short         ;;<short>
-        %reg109 = add short %cast110, %cast10   ;;<short>
-        ret short %reg109                       ;;<void>
-end
+define i16 @FunFunc(i64 %x, i8 %z) {
+bb0:
+        %cast110 = sext i8 %z to i16            ; <i16> [#uses=1]
+        %cast10 = trunc i64 %x to i16           ; <i16> [#uses=1]
+        %reg109 = add i16 %cast110, %cast10             ; <i16> [#uses=1]
+        ret i16 %reg109
+}