Remove llvm-upgrade and update tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47227 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 8 insertions, 31 deletions

diff --git a/test/Assembler/2007-02-07-UpgradeCSRETCC.ll b/test/Assembler/2007-02-07-UpgradeCSRETCC.ll
deleted file mode 100644
index da6faa6..0000000
--- a/test/Assembler/2007-02-07-UpgradeCSRETCC.ll
+++ /dev/null
@@ -1,23 +0,0 @@
-; RUN: llvm-upgrade < %s > /dev/null
-; PR1187
-
-%mystruct = type { int, double }
-%glob = global %mystruct { int 3, double 42.0 }
-%fptr = external global void (i32)*
-
-implementation
-
-csretcc void %nada(%mystruct * %ptr, int %val) {
-  ret void
-}
-
-int %main(int %argc, ubyte** %argv) {
-  %astr = alloca %mystruct
-  call void %nada(%mystruct* %astr, i32 7)
-  %fptr = alloca void (%mystruct*, i32)*
-  %f = load void (%mystruct*, i32)**%fptr
-  call csretcc void %f(%mystruct* %astr, i32 7)
-  store void (%mystruct* , i32)* %nada, void (%mystruct*, i32)** %fptr
-
-  ret int 0
-}
diff --git a/test/Assembler/ConstantExprFoldCast.llx b/test/Assembler/ConstantExprFoldCast.llx
index abc9316..0ce6e84 100644
--- a/test/Assembler/ConstantExprFoldCast.llx
+++ b/test/Assembler/ConstantExprFoldCast.llx
@@ -1,14 +1,14 @@
 ; This test checks to make sure that constant exprs fold in some simple situations
 
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep cast
+; RUN: llvm-as < %s | llvm-dis | not grep cast
 
-%A = global int* cast (sbyte* null to int*)  ; Cast null -> fold
-%B = global int** cast (int** %A to int**)   ; Cast to same type -> fold
-%C = global int cast (long 42 to int)        ; Integral casts
-%D = global int* cast(float* cast (int* %C to float*) to int*)  ; cast of cast ptr->ptr
-%E = global int cast(float* cast (sbyte 5 to float*) to int)  ; int -> ptr -> int
+@A = global i32* bitcast (i8* null to i32*)  ; Cast null -> fold
+@B = global i32** bitcast (i32** @A to i32**)   ; Cast to same type -> fold
+@C = global i32 trunc (i64 42 to i32)        ; Integral casts
+@D = global i32* bitcast(float*  bitcast (i32* @C to float*) to i32*)  ; cast of cast ptr->ptr
+@E = global i32 ptrtoint(float* inttoptr (i8 5 to float*) to i32)  ; i32 -> ptr -> i32
 
 ; Test folding of binary instrs
-%F = global int* cast(int add (int 5, int -5) to int*)
-%G = global int* cast(int sub (int 5, int 5) to int*)
+@F = global i32* inttoptr (i32 add (i32 5, i32 -5) to i32*)
+@G = global i32* inttoptr (i32 sub (i32 5, i32 5) to i32*)