Remove llvm-upgrade and update tests.

llvm-svn: 48103

1 files changed, 14 insertions, 12 deletions

diff --git a/llvm/test/Transforms/InstCombine/call-intrinsics.ll b/llvm/test/Transforms/InstCombine/call-intrinsics.ll
index e8549981e1d..e1c60570f14 100644
--- a/llvm/test/Transforms/InstCombine/call-intrinsics.ll
+++ b/llvm/test/Transforms/InstCombine/call-intrinsics.ll
@@ -1,17 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis
 
-declare void %llvm.memmove.i32(sbyte*, sbyte*, uint, uint)
-declare void %llvm.memcpy.i32(sbyte*, sbyte*, uint, uint)
-declare void %llvm.memset.i32(sbyte*, ubyte, uint, uint)
+@X = global i8 0                ; <i8*> [#uses=3]
+@Y = global i8 12               ; <i8*> [#uses=2]
 
-%X = global sbyte 0
-%Y = global sbyte 12
+declare void @llvm.memmove.i32(i8*, i8*, i32, i32)
 
-void %zero_byte_test() {
-  ; These process zero bytes, so they are a noop.
-  call void %llvm.memmove.i32(sbyte* %X, sbyte* %Y, uint 0, uint 100)
-  call void %llvm.memcpy.i32(sbyte* %X, sbyte* %Y, uint 0, uint 100)
-  call void %llvm.memset.i32(sbyte* %X, ubyte 123, uint 0, uint 100)
-  ret void
+declare void @llvm.memcpy.i32(i8*, i8*, i32, i32)
+
+declare void @llvm.memset.i32(i8*, i8, i32, i32)
+
+define void @zero_byte_test() {
+        ; These process zero bytes, so they are a noop.
+        call void @llvm.memmove.i32( i8* @X, i8* @Y, i32 0, i32 100 )
+        call void @llvm.memcpy.i32( i8* @X, i8* @Y, i32 0, i32 100 )
+        call void @llvm.memset.i32( i8* @X, i8 123, i32 0, i32 100 )
+        ret void
 }