[llvm] r320197 - [WebAssembly] Reapply r319186: "Support bitcasted function addresses with varargs."
Dan Gohman via llvm-commits
llvm-commits at lists.llvm.org
Fri Dec 8 13:27:00 PST 2017
Author: djg
Date: Fri Dec 8 13:27:00 2017
New Revision: 320197
URL: http://llvm.org/viewvc/llvm-project?rev=320197&view=rev
Log:
[WebAssembly] Reapply r319186: "Support bitcasted function addresses with varargs."
This puts the functionality under control of a command-line option which is
off by default to avoid breaking existing setups.
Added:
llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts-varargs.ll
Modified:
llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
llvm/trunk/test/CodeGen/WebAssembly/call.ll
llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts.ll
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp?rev=320197&r1=320196&r2=320197&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp Fri Dec 8 13:27:00 2017
@@ -199,7 +199,7 @@ bool FixFunctionBitcasts::runOnModule(Mo
// Bitcasted vararg functions occur in Emscripten's implementation of
// EM_ASM, so suppress wrappers for them for now.
- if (Ty->isVarArg() || F->isVarArg())
+ if (TemporaryWorkarounds && (Ty->isVarArg() || F->isVarArg()))
continue;
auto Pair = Wrappers.insert(std::make_pair(std::make_pair(F, Ty), nullptr));
Modified: llvm/trunk/test/CodeGen/WebAssembly/call.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/call.ll?rev=320197&r1=320196&r2=320197&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/call.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/call.ll Fri Dec 8 13:27:00 2017
@@ -1,5 +1,5 @@
-; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt | FileCheck %s
-; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt -fast-isel -fast-isel-abort=1 | FileCheck %s
+; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt -wasm-temporary-workarounds=false | FileCheck %s
+; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt -fast-isel -fast-isel-abort=1 -wasm-temporary-workarounds=false | FileCheck %s
; Test that basic call operations assemble as expected.
@@ -153,7 +153,7 @@ define void @coldcc_tail_call_void_nulla
; CHECK-LABEL: call_constexpr:
; CHECK-NEXT: i32.const $push[[L0:[0-9]+]]=, 2{{$}}
; CHECK-NEXT: i32.const $push[[L1:[0-9]+]]=, 3{{$}}
-; CHECK-NEXT: call vararg_func at FUNCTION, $pop[[L0]], $pop[[L1]]{{$}}
+; CHECK-NEXT: call .Lbitcast at FUNCTION, $pop[[L0]], $pop[[L1]]{{$}}
; CHECK-NEXT: call other_void_nullary at FUNCTION{{$}}
; CHECK-NEXT: call void_nullary at FUNCTION{{$}}
; CHECK-NEXT: return{{$}}
Added: llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts-varargs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts-varargs.ll?rev=320197&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts-varargs.ll (added)
+++ llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts-varargs.ll Fri Dec 8 13:27:00 2017
@@ -0,0 +1,31 @@
+; RUN: llc < %s -asm-verbose=false -wasm-temporary-workarounds=false | FileCheck %s
+
+; Test that function pointer casts casting away varargs are replaced with
+; wrappers.
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown-wasm"
+
+define void @callWithArgs() {
+entry:
+ call void bitcast (void (...)* @underspecified to void (i32, i32)*)(i32 0, i32 1)
+ call void(...) bitcast (void (i32, i32)* @specified to void (...)*)(i32 0, i32 1)
+ ret void
+}
+
+declare void @underspecified(...)
+declare void @specified(i32, i32)
+
+; CHECK: callWithArgs:
+; CHECK: i32.const $push1=, 0
+; CHECK-NEXT: i32.const $push0=, 1
+; CHECK-NEXT: call .Lbitcast at FUNCTION, $pop1, $pop0
+; CHECK: call .Lbitcast.1 at FUNCTION, $pop{{[0-9]+$}}
+
+; CHECK: .Lbitcast:
+; CHECK-NEXT: .param i32, i32{{$}}
+; CHECK: call underspecified at FUNCTION, $pop{{[0-9]+$}}
+
+; CHECK: .Lbitcast.1:
+; CHECK-NEXT: .param i32{{$}}
+; CHECK: call specified at FUNCTION, $pop{{[0-9]+}}, $pop{{[0-9]+$}}
Modified: llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts.ll?rev=320197&r1=320196&r2=320197&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/function-bitcasts.ll Fri Dec 8 13:27:00 2017
@@ -1,4 +1,4 @@
-; RUN: llc < %s -asm-verbose=false -disable-wasm-explicit-locals -enable-emscripten-cxx-exceptions | FileCheck %s
+; RUN: llc < %s -asm-verbose=false -disable-wasm-explicit-locals -enable-emscripten-cxx-exceptions -wasm-temporary-workarounds=false | FileCheck %s
; Test that function pointer casts are replaced with wrappers.
@@ -20,13 +20,13 @@ declare void @foo3()
; CHECK-NEXT: call .Lbitcast at FUNCTION{{$}}
; CHECK-NEXT: call .Lbitcast.1 at FUNCTION{{$}}
; CHECK-NEXT: i32.const $push[[L0:[0-9]+]]=, 0
-; CHECK-NEXT: call .Lbitcast.2 at FUNCTION, $pop[[L0]]{{$}}
+; CHECK-NEXT: call .Lbitcast.4 at FUNCTION, $pop[[L0]]{{$}}
; CHECK-NEXT: i32.const $push[[L1:[0-9]+]]=, 0
-; CHECK-NEXT: call .Lbitcast.2 at FUNCTION, $pop[[L1]]{{$}}
+; CHECK-NEXT: call .Lbitcast.4 at FUNCTION, $pop[[L1]]{{$}}
; CHECK-NEXT: i32.const $push[[L2:[0-9]+]]=, 0
-; CHECK-NEXT: call .Lbitcast.2 at FUNCTION, $pop[[L2]]{{$}}
+; CHECK-NEXT: call .Lbitcast.4 at FUNCTION, $pop[[L2]]{{$}}
; CHECK-NEXT: call foo0 at FUNCTION
-; CHECK-NEXT: i32.call $drop=, .Lbitcast.3 at FUNCTION{{$}}
+; CHECK-NEXT: i32.call $drop=, .Lbitcast.5 at FUNCTION{{$}}
; CHECK-NEXT: call foo2 at FUNCTION{{$}}
; CHECK-NEXT: call foo1 at FUNCTION{{$}}
; CHECK-NEXT: call foo3 at FUNCTION{{$}}
@@ -54,10 +54,10 @@ entry:
; CHECK-LABEL: test_varargs:
; CHECK: set_global
; CHECK: i32.const $push[[L3:[0-9]+]]=, 0{{$}}
-; CHECK-NEXT: call vararg at FUNCTION, $pop[[L3]]{{$}}
+; CHECK-NEXT: call .Lbitcast.2 at FUNCTION, $pop[[L3]]{{$}}
; CHECK-NEXT: i32.const $push[[L4:[0-9]+]]=, 0{{$}}
; CHECK-NEXT: i32.store 0($[[L5:[0-9]+]]), $pop[[L4]]{{$}}
-; CHECK-NEXT: call plain at FUNCTION, $[[L5]]{{$}}
+; CHECK-NEXT: call .Lbitcast.3 at FUNCTION, $[[L5]]{{$}}
define void @test_varargs() {
call void bitcast (void (...)* @vararg to void (i32)*)(i32 0)
call void (...) bitcast (void (i32)* @plain to void (...)*)(i32 0)
@@ -147,11 +147,19 @@ end:
; CHECK-NEXT: end_function
; CHECK-LABEL: .Lbitcast.2:
+; CHECK: call vararg at FUNCTION, $1{{$}}
+; CHECK: end_function
+
+; CHECK-LABEL: .Lbitcast.3:
+; CHECK: call plain at FUNCTION, $1{{$}}
+; CHECK: end_function
+
+; CHECK-LABEL: .Lbitcast.4:
; CHECK-NEXT: .param i32
; CHECK-NEXT: call foo0 at FUNCTION{{$}}
; CHECK-NEXT: end_function
-; CHECK-LABEL: .Lbitcast.3:
+; CHECK-LABEL: .Lbitcast.5:
; CHECK-NEXT: .result i32
; CHECK-NEXT: call foo1 at FUNCTION{{$}}
; CHECK-NEXT: copy_local $push0=, $0
More information about the llvm-commits
mailing list