Remove llvm-upgrade and update tests.

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

1 files changed, 32 insertions, 29 deletions

diff --git a/test/Feature/callingconventions.ll b/test/Feature/callingconventions.ll
index 5617f9f26f..d2e9de404f 100644
--- a/test/Feature/callingconventions.ll
+++ b/test/Feature/callingconventions.ll
@@ -1,47 +1,50 @@
-; 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
 
-fastcc void %foo() {
-  ret void
+define fastcc void @foo() {
+        ret void
 }
 
-coldcc void %bar() {
-  call fastcc void %foo()
-  ret void
+define coldcc void @bar() {
+        call fastcc void @foo( )
+        ret void
 }
 
-csretcc void %structret({sbyte}* %P) {
-  call csretcc void %structret({sbyte}* %P)
-  ret void
+define void @structret({ i8 }* sret  %P) {
+        call void @structret( { i8 }* sret  %P )
+        ret void
 }
 
-
-cc0 void %foo2() {
-  ret void
+define void @foo2() {
+        ret void
 }
 
-coldcc void %bar2() {
-  call fastcc void %foo()
-  ret void
+define coldcc void @bar2() {
+        call fastcc void @foo( )
+        ret void
 }
 
-cc42 void %bar3() {
-  invoke fastcc void %foo() to label %Ok unwind label %U
-Ok:
-  ret void
-U:
-  unwind
-}
+define cc42 void @bar3() {
+        invoke fastcc void @foo( )
+                        to label %Ok unwind label %U
 
+Ok:             ; preds = %0
+        ret void
 
-void %bar4() {
-  call cc42 void %bar()
-  invoke cc42 void %bar3() to label %Ok unwind label %U
-Ok:
-  ret void
-U:
-  unwind
+U:              ; preds = %0
+        unwind
 }
 
+define void @bar4() {
+        call cc42 void @bar( )
+        invoke cc42 void @bar3( )
+                        to label %Ok unwind label %U
+
+Ok:             ; preds = %0
+        ret void
+
+U:              ; preds = %0
+        unwind
+}