diff options
| author | Dan Gohman <dan433584@gmail.com> | 2015-09-09 01:52:45 +0000 |
|---|---|---|
| committer | Dan Gohman <dan433584@gmail.com> | 2015-09-09 01:52:45 +0000 |
| commit | e590b33bf88561c1a5b9ae76823562b16934d2cd (patch) | |
| tree | 9eb0f01f18b0a38fec109f551d9d8055055d53cb /llvm | |
| parent | 0d22f2d57eaa7f8807b88dab1efe45707a9a1827 (diff) | |
| download | bcm5719-llvm-e590b33bf88561c1a5b9ae76823562b16934d2cd.tar.gz bcm5719-llvm-e590b33bf88561c1a5b9ae76823562b16934d2cd.zip | |
[WebAssembly] Fix lowering of calls with more than one argument.
llvm-svn: 247118
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/call.ll | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp index f4c2e5bce0d..7e9e1b0e016 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp @@ -228,16 +228,19 @@ WebAssemblyTargetLowering::LowerCall(CallLoweringInfo &CLI, SmallVectorImpl<ISD::OutputArg> &Outs = CLI.Outs; SmallVectorImpl<SDValue> &OutVals = CLI.OutVals; + bool IsStructRet = (Outs.empty()) ? false : Outs[0].Flags.isSRet(); if (IsStructRet) fail(DL, DAG, "WebAssembly doesn't support struct return yet"); - if (Outs.size() > 1) - fail(DL, DAG, "WebAssembly doesn't support more than 1 returned value yet"); SmallVectorImpl<ISD::InputArg> &Ins = CLI.Ins; + if (Ins.size() > 1) + fail(DL, DAG, "WebAssembly doesn't support more than 1 returned value yet"); + bool IsVarArg = CLI.IsVarArg; if (IsVarArg) fail(DL, DAG, "WebAssembly doesn't support varargs yet"); + // Analyze operands of the call, assigning locations to each operand. SmallVector<CCValAssign, 16> ArgLocs; CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext()); diff --git a/llvm/test/CodeGen/WebAssembly/call.ll b/llvm/test/CodeGen/WebAssembly/call.ll index d0ad7fd3edf..d628ec09630 100644 --- a/llvm/test/CodeGen/WebAssembly/call.ll +++ b/llvm/test/CodeGen/WebAssembly/call.ll @@ -7,6 +7,7 @@ target triple = "wasm32-unknown-unknown" declare i32 @i32_nullary() declare i32 @i32_unary(i32) +declare i32 @i32_binary(i32, i32) declare i64 @i64_nullary() declare float @float_nullary() declare double @double_nullary() @@ -62,6 +63,18 @@ define i32 @call_i32_unary(i32 %a) { ret i32 %r } +; CHECK-LABEL: (func $call_i32_binary +; CHECK-NEXT: (param i32) (param i32) (result i32) +; CHECK-NEXT: (setlocal @0 (argument 1)) +; CHECK-NEXT: (setlocal @1 (argument 0)) +; CHECK-NEXT: (setlocal @2 (global $i32_binary)) +; CHECK-NEXT: (setlocal @3 (call @2 @1 @0)) +; CHECK-NEXT: (return @3) +define i32 @call_i32_binary(i32 %a, i32 %b) { + %r = call i32 @i32_binary(i32 %a, i32 %b) + ret i32 %r +} + ; FIXME test the following: ; - Functions without return. ; - More argument combinations. |
