diff options
| author | Jacob Gravelle <jgravelle@google.com> | 2017-08-24 19:53:44 +0000 |
|---|---|---|
| committer | Jacob Gravelle <jgravelle@google.com> | 2017-08-24 19:53:44 +0000 |
| commit | 690b76e13df384e6b2feccb26655762be3644cb8 (patch) | |
| tree | d142c12a4ef5851f330afbc77099aee901c9546e | |
| parent | 6d0970f64ecf3fc9788e5d71771cbce1f520d938 (diff) | |
| download | bcm5719-llvm-690b76e13df384e6b2feccb26655762be3644cb8.tar.gz bcm5719-llvm-690b76e13df384e6b2feccb26655762be3644cb8.zip | |
[WebAssembly] FastISel : Bail to SelectionDAG for constexpr calls
Summary: Currently FastISel lowers constexpr calls as indirect calls.
We'd like those to direct calls, and falling back to SelectionDAGISel
handles that.
Reviewers: dschuff, sunfish
Subscribers: jfb, sbc100, llvm-commits, aheejin
Differential Revision: https://reviews.llvm.org/D37073
llvm-svn: 311693
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/call.ll | 21 |
2 files changed, 25 insertions, 1 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp index c980f4b87f9..f516a6b260d 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp @@ -700,9 +700,12 @@ bool WebAssemblyFastISel::selectCall(const Instruction *I) { if (Func && Func->isIntrinsic()) return false; + bool IsDirect = Func != nullptr; + if (!IsDirect && isa<ConstantExpr>(Call->getCalledValue())) + return false; + FunctionType *FuncTy = Call->getFunctionType(); unsigned Opc; - bool IsDirect = Func != nullptr; bool IsVoid = FuncTy->getReturnType()->isVoidTy(); unsigned ResultReg; if (IsVoid) { diff --git a/llvm/test/CodeGen/WebAssembly/call.ll b/llvm/test/CodeGen/WebAssembly/call.ll index 1cf42242a6c..dfa0cf5efe0 100644 --- a/llvm/test/CodeGen/WebAssembly/call.ll +++ b/llvm/test/CodeGen/WebAssembly/call.ll @@ -150,6 +150,27 @@ define void @coldcc_tail_call_void_nullary() { ret void } +; 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@FUNCTION, $pop[[L0]], $pop[[L1]]{{$}} +; CHECK-NEXT: call other_void_nullary@FUNCTION{{$}} +; CHECK-NEXT: call void_nullary@FUNCTION{{$}} +; CHECK-NEXT: return{{$}} +declare void @vararg_func(...) +declare void @other_void_nullary() +define void @call_constexpr() { +bb0: + call void bitcast (void (...)* @vararg_func to void (i32, i32)*)(i32 2, i32 3) + br label %bb1 +bb1: + call void select (i1 0, void ()* @void_nullary, void ()* @other_void_nullary)() + br label %bb2 +bb2: + call void inttoptr (i32 ptrtoint (void ()* @void_nullary to i32) to void ()*)() + ret void +} + ; TODO: test the following: ; - More argument combinations. ; - Tail call. |
