1 files changed, 65 insertions, 49 deletions

diff --git a/llvm/test/CodeGen/WebAssembly/call.ll b/llvm/test/CodeGen/WebAssembly/call.ll
index d1cf69db24f..0d5ebb9289a 100644
--- a/llvm/test/CodeGen/WebAssembly/call.ll
+++ b/llvm/test/CodeGen/WebAssembly/call.ll
@@ -13,110 +13,126 @@ declare float @float_nullary()
 declare double @double_nullary()
 declare void @void_nullary()
 
-; CHECK-LABEL: (func $call_i32_nullary
-; CHECK-NEXT: (result i32)
-; CHECK-NEXT: (set_local @0 (call $i32_nullary))
-; CHECK-NEXT: (return @0)
+; CHECK-LABEL: call_i32_nullary:
+; CHECK-NEXT: .result i32
+; CHECK-NEXT: call $i32_nullary
+; CHECK-NEXT: set_local @0, pop
+; CHECK-NEXT: return @0
 define i32 @call_i32_nullary() {
   %r = call i32 @i32_nullary()
   ret i32 %r
 }
 
-; CHECK-LABEL: (func $call_i64_nullary
-; CHECK-NEXT: (result i64)
-; CHECK-NEXT: (set_local @0 (call $i64_nullary))
-; CHECK-NEXT: (return @0)
+; CHECK-LABEL: call_i64_nullary:
+; CHECK-NEXT: .result i64
+; CHECK-NEXT: call $i64_nullary
+; CHECK-NEXT: set_local @0, pop
+; CHECK-NEXT: return @0
 define i64 @call_i64_nullary() {
   %r = call i64 @i64_nullary()
   ret i64 %r
 }
 
-; CHECK-LABEL: (func $call_float_nullary
-; CHECK-NEXT: (result f32)
-; CHECK-NEXT: (set_local @0 (call $float_nullary))
-; CHECK-NEXT: (return @0)
+; CHECK-LABEL: call_float_nullary:
+; CHECK-NEXT: .result f32
+; CHECK-NEXT: call $float_nullary
+; CHECK-NEXT: set_local @0, pop
+; CHECK-NEXT: return @0
 define float @call_float_nullary() {
   %r = call float @float_nullary()
   ret float %r
 }
 
-; CHECK-LABEL: (func $call_double_nullary
-; CHECK-NEXT: (result f64)
-; CHECK-NEXT: (set_local @0 (call $double_nullary))
-; CHECK-NEXT: (return @0)
+; CHECK-LABEL: call_double_nullary:
+; CHECK-NEXT: .result f64
+; CHECK-NEXT: call $double_nullary
+; CHECK-NEXT: set_local @0, pop
+; CHECK-NEXT: return @0
 define double @call_double_nullary() {
   %r = call double @double_nullary()
   ret double %r
 }
 
-; CHECK-LABEL: (func $call_void_nullary
-; CHECK-NEXT: (call $void_nullary)
-; CHECK-NEXT: (return)
+; CHECK-LABEL: call_void_nullary:
+; CHECK-NEXT: call $void_nullary
+; CHECK-NEXT: return
 define void @call_void_nullary() {
   call void @void_nullary()
   ret void
 }
 
-; CHECK-LABEL: (func $call_i32_unary
-; CHECK-NEXT: (param i32) (result i32)
-; CHECK-NEXT: (set_local @0 (argument 0))
-; CHECK-NEXT: (set_local @1 (call $i32_unary @0))
-; CHECK-NEXT: (return @1)
+; CHECK-LABEL: call_i32_unary:
+; CHECK-NEXT: .param i32
+; CHECK-NEXT: .result i32
+; CHECK-NEXT: @0
+; CHECK-NEXT: set_local @1, pop
+; CHECK-NEXT: call $i32_unary, @1
+; CHECK-NEXT: set_local @2, pop
+; CHECK-NEXT: return @2
 define i32 @call_i32_unary(i32 %a) {
   %r = call i32 @i32_unary(i32 %a)
   ret i32 %r
 }
 
-; CHECK-LABEL: (func $call_i32_binary
-; CHECK-NEXT: (param i32) (param i32) (result i32)
-; CHECK-NEXT: (set_local @0 (argument 1))
-; CHECK-NEXT: (set_local @1 (argument 0))
-; CHECK-NEXT: (set_local @2 (call $i32_binary @1 @0))
-; CHECK-NEXT: (return @2)
+; CHECK-LABEL: call_i32_binary:
+; CHECK-NEXT: .param i32
+; CHECK-NEXT: .param i32
+; CHECK-NEXT: .result i32
+; CHECK-NEXT: @1
+; CHECK-NEXT: set_local @2, pop
+; CHECK-NEXT: @0
+; CHECK-NEXT: set_local @3, pop
+; CHECK-NEXT: call $i32_binary, @3, @2
+; CHECK-NEXT: set_local @4, pop
+; CHECK-NEXT: return @4
 define i32 @call_i32_binary(i32 %a, i32 %b) {
   %r = call i32 @i32_binary(i32 %a, i32 %b)
   ret i32 %r
 }
 
-; CHECK-LABEL: (func $call_indirect_void
-; CHECK-NEXT: (param i32)
-; CHECK-NEXT: (set_local @0 (argument 0))
-; CHECK-NEXT: (call_indirect @0)
-; CHECK-NEXT: (return)
+; CHECK-LABEL: call_indirect_void:
+; CHECK-NEXT: .param i32
+; CHECK-NEXT: @0
+; CHECK-NEXT: set_local @1, pop
+; CHECK-NEXT: call_indirect @1
+; CHECK-NEXT: return
 define void @call_indirect_void(void ()* %callee) {
   call void %callee()
   ret void
 }
 
-; CHECK-LABEL: (func $call_indirect_i32
-; CHECK-NEXT: (param i32)
-; CHECK-NEXT: (set_local @0 (argument 0))
-; CHECK-NEXT: (set_local @1 (call_indirect @0))
-; CHECK-NEXT: (return @1)
+; CHECK-LABEL: call_indirect_i32:
+; CHECK-NEXT: .param i32
+; CHECK-NEXT: .result i32
+; CHECK-NEXT: @0
+; CHECK-NEXT: set_local @1, pop
+; CHECK-NEXT: call_indirect @1
+; CHECK-NEXT: set_local @2, pop
+; CHECK-NEXT: return @2
 define i32 @call_indirect_i32(i32 ()* %callee) {
   %t = call i32 %callee()
   ret i32 %t
 }
 
-; CHECK-LABEL: (func $tail_call_void_nullary
-; CHECK-NEXT: (call $void_nullary)
-; CHECK-NEXT: (return)
+; CHECK-LABEL: tail_call_void_nullary:
+; CHECK-NEXT: call $void_nullary
+; CHECK-NEXT: return{{$}}
 define void @tail_call_void_nullary() {
   tail call void @void_nullary()
   ret void
 }
 
-; CHECK-LABEL: (func $fastcc_tail_call_void_nullary
-; CHECK-NEXT: (call $void_nullary)
-; CHECK-NEXT: (return)
+; CHECK-LABEL: fastcc_tail_call_void_nullary:
+; CHECK-NEXT: call $void_nullary
+; CHECK-NEXT: return{{$}}
 define void @fastcc_tail_call_void_nullary() {
   tail call fastcc void @void_nullary()
   ret void
 }
 
-; CHECK-LABEL: (func $coldcc_tail_call_void_nullary
-; CHECK-NEXT: (call $void_nullary)
-; CHECK-NEXT: (return)
+; CHECK-LABEL: coldcc_tail_call_void_nullary:
+; CHECK-NEXT: call $void_nullary
+; CHECK-NEXT: return{{$}}
 define void @coldcc_tail_call_void_nullary() {
   tail call coldcc void @void_nullary()
   ret void