[llvm] r245883 - Missing print.

[David Blaikie via llvm-commits]

another rather terse commit message

On Mon, Aug 24, 2015 at 3:00 PM, JF Bastien via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: jfb
> Date: Mon Aug 24 17:00:04 2015
> New Revision: 245883
>
> URL: http://llvm.org/viewvc/llvm-project?rev=245883&view=rev
> Log:
> Missing print.
>
> Modified:
>     llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
>     llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
>     llvm/trunk/test/CodeGen/WebAssembly/call.ll
>
> Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp?rev=245883&r1=245882&r2=245883&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp (original)
> +++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp Mon Aug 24
> 17:00:04 2015
> @@ -85,6 +85,7 @@ static SmallString<32> Name(const WebAss
>  }
>
>  void WebAssemblyAsmPrinter::EmitInstruction(const MachineInstr *MI) {
> +  DEBUG(dbgs() << "EmitInstruction: " << *MI << '\n');
>    SmallString<128> Str;
>    raw_svector_ostream OS(Str);
>
>
> Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp?rev=245883&r1=245882&r2=245883&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
> (original)
> +++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp Mon Aug
> 24 17:00:04 2015
> @@ -209,7 +209,6 @@ WebAssemblyTargetLowering::LowerCall(Cal
>
>    SmallVectorImpl<ISD::OutputArg> &Outs = CLI.Outs;
>    SmallVectorImpl<SDValue> &OutVals = CLI.OutVals;
> -  Type *retTy = CLI.RetTy;
>    bool IsStructRet = (Outs.empty()) ? false : Outs[0].Flags.isSRet();
>    if (IsStructRet)
>      fail(DL, DAG, "WebAssembly doesn't support struct return yet");
> @@ -217,7 +216,6 @@ WebAssemblyTargetLowering::LowerCall(Cal
>      fail(DL, DAG, "WebAssembly doesn't support more than 1 returned value
> yet");
>
>    SmallVectorImpl<ISD::InputArg> &Ins = CLI.Ins;
> -  ArgListTy &Args = CLI.getArgs();
>    bool IsVarArg = CLI.IsVarArg;
>    if (IsVarArg)
>      fail(DL, DAG, "WebAssembly doesn't support varargs yet");
> @@ -227,27 +225,29 @@ WebAssemblyTargetLowering::LowerCall(Cal
>    unsigned NumBytes = CCInfo.getNextStackOffset();
>
>    auto PtrVT = getPointerTy(MF.getDataLayout());
> -  auto Zero = DAG.getConstant(0, CLI.DL, PtrVT, true);
> -  auto NB = DAG.getConstant(NumBytes, CLI.DL, PtrVT, true);
> -  Chain = DAG.getCALLSEQ_START(Chain, NB, CLI.DL);
> +  auto Zero = DAG.getConstant(0, DL, PtrVT, true);
> +  auto NB = DAG.getConstant(NumBytes, DL, PtrVT, true);
> +  Chain = DAG.getCALLSEQ_START(Chain, NB, DL);
>
>    SmallVector<SDValue, 16> Ops;
>    Ops.push_back(Chain);
> -  Ops.push_back(CLI.Callee);
> -  Ops.append(CLI.OutVals.begin(), CLI.OutVals.end());
> +  Ops.push_back(Callee);
> +  Ops.append(OutVals.begin(), OutVals.end());
>
>    SmallVector<EVT, 8> Tys;
> -  for (const auto &In : CLI.Ins)
> +  for (const auto &In : Ins)
>      Tys.push_back(In.VT);
>    Tys.push_back(MVT::Other);
> -  SDVTList TyList = CLI.DAG.getVTList(Tys);
> -  SDValue Res = CLI.DAG.getNode(WebAssemblyISD::CALL, CLI.DL, TyList,
> Ops);
> -  InVals.push_back(Res);
> -  Chain = Res.getValue(1);
> +  SDVTList TyList = DAG.getVTList(Tys);
> +  SDValue Res = DAG.getNode(WebAssemblyISD::CALL, DL, TyList, Ops);
> +  if (!Ins.empty()) {
> +    InVals.push_back(Res);
> +    Chain = Res.getValue(1);
> +  }
>
>    // FIXME: handle CLI.RetSExt and CLI.RetZExt?
>
> -  Chain = CLI.DAG.getCALLSEQ_END(Chain, NB, Zero, SDValue(), CLI.DL);
> +  Chain = DAG.getCALLSEQ_END(Chain, NB, Zero, SDValue(), DL);
>
>    return Chain;
>  }
>
> Modified: llvm/trunk/test/CodeGen/WebAssembly/call.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/call.ll?rev=245883&r1=245882&r2=245883&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/CodeGen/WebAssembly/call.ll (original)
> +++ llvm/trunk/test/CodeGen/WebAssembly/call.ll Mon Aug 24 17:00:04 2015
> @@ -5,13 +5,14 @@
>  target datalayout = "e-p:32:32-i64:64-v128:8:128-n32:64-S128"
>  target triple = "wasm32-unknown-unknown"
>
> -declare void @nullary()
> +declare void @void_nullary()
> +declare void @int32_nullary()
>
> -; CHECK-LABEL: call_nullary:
> +; CHECK-LABEL: call_void_nullary:
>  ; CHECK-NEXT: (call @foo)
>  ; CHECK-NEXT: (return)
> -define void @call_nullary() {
> -  call void @nullary()
> +define void @call_void_nullary() {
> +  call void @void_nullary()
>    ret void
>  }
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150824/096d71ef/attachment.html>