<div dir="ltr">Yes, this was reverted and then fixed. I git svn failed.</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 24, 2015 at 4:34 PM, Eric Christopher <span dir="ltr"><<a href="mailto:echristo@gmail.com" target="_blank">echristo@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><br><div class="gmail_quote"><span class=""><div dir="ltr">On Mon, Aug 24, 2015 at 3:01 PM JF Bastien via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jfb<br>
Date: Mon Aug 24 17:00:04 2015<br>
New Revision: 245883<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=245883&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=245883&view=rev</a><br>
Log:<br>
Missing print.<br>
<br></blockquote><div><br></div></span><div>Uh...</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>-eric</div></font></span><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Modified:<br>
llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp<br>
llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp<br>
llvm/trunk/test/CodeGen/WebAssembly/call.ll<br>
<br>
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp?rev=245883&r1=245882&r2=245883&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp?rev=245883&r1=245882&r2=245883&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp (original)<br>
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp Mon Aug 24 17:00:04 2015<br>
@@ -85,6 +85,7 @@ static SmallString<32> Name(const WebAss<br>
}<br>
<br>
void WebAssemblyAsmPrinter::EmitInstruction(const MachineInstr *MI) {<br>
+ DEBUG(dbgs() << "EmitInstruction: " << *MI << '\n');<br>
SmallString<128> Str;<br>
raw_svector_ostream OS(Str);<br>
<br>
<br>
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp?rev=245883&r1=245882&r2=245883&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp?rev=245883&r1=245882&r2=245883&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp (original)<br>
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp Mon Aug 24 17:00:04 2015<br>
@@ -209,7 +209,6 @@ WebAssemblyTargetLowering::LowerCall(Cal<br>
<br>
SmallVectorImpl<ISD::OutputArg> &Outs = CLI.Outs;<br>
SmallVectorImpl<SDValue> &OutVals = CLI.OutVals;<br>
- Type *retTy = CLI.RetTy;<br>
bool IsStructRet = (Outs.empty()) ? false : Outs[0].Flags.isSRet();<br>
if (IsStructRet)<br>
fail(DL, DAG, "WebAssembly doesn't support struct return yet");<br>
@@ -217,7 +216,6 @@ WebAssemblyTargetLowering::LowerCall(Cal<br>
fail(DL, DAG, "WebAssembly doesn't support more than 1 returned value yet");<br>
<br>
SmallVectorImpl<ISD::InputArg> &Ins = CLI.Ins;<br>
- ArgListTy &Args = CLI.getArgs();<br>
bool IsVarArg = CLI.IsVarArg;<br>
if (IsVarArg)<br>
fail(DL, DAG, "WebAssembly doesn't support varargs yet");<br>
@@ -227,27 +225,29 @@ WebAssemblyTargetLowering::LowerCall(Cal<br>
unsigned NumBytes = CCInfo.getNextStackOffset();<br>
<br>
auto PtrVT = getPointerTy(MF.getDataLayout());<br>
- auto Zero = DAG.getConstant(0, CLI.DL, PtrVT, true);<br>
- auto NB = DAG.getConstant(NumBytes, CLI.DL, PtrVT, true);<br>
- Chain = DAG.getCALLSEQ_START(Chain, NB, CLI.DL);<br>
+ auto Zero = DAG.getConstant(0, DL, PtrVT, true);<br>
+ auto NB = DAG.getConstant(NumBytes, DL, PtrVT, true);<br>
+ Chain = DAG.getCALLSEQ_START(Chain, NB, DL);<br>
<br>
SmallVector<SDValue, 16> Ops;<br>
Ops.push_back(Chain);<br>
- Ops.push_back(CLI.Callee);<br>
- Ops.append(CLI.OutVals.begin(), CLI.OutVals.end());<br>
+ Ops.push_back(Callee);<br>
+ Ops.append(OutVals.begin(), OutVals.end());<br>
<br>
SmallVector<EVT, 8> Tys;<br>
- for (const auto &In : CLI.Ins)<br>
+ for (const auto &In : Ins)<br>
Tys.push_back(In.VT);<br>
Tys.push_back(MVT::Other);<br>
- SDVTList TyList = CLI.DAG.getVTList(Tys);<br>
- SDValue Res = CLI.DAG.getNode(WebAssemblyISD::CALL, CLI.DL, TyList, Ops);<br>
- InVals.push_back(Res);<br>
- Chain = Res.getValue(1);<br>
+ SDVTList TyList = DAG.getVTList(Tys);<br>
+ SDValue Res = DAG.getNode(WebAssemblyISD::CALL, DL, TyList, Ops);<br>
+ if (!Ins.empty()) {<br>
+ InVals.push_back(Res);<br>
+ Chain = Res.getValue(1);<br>
+ }<br>
<br>
// FIXME: handle CLI.RetSExt and CLI.RetZExt?<br>
<br>
- Chain = CLI.DAG.getCALLSEQ_END(Chain, NB, Zero, SDValue(), CLI.DL);<br>
+ Chain = DAG.getCALLSEQ_END(Chain, NB, Zero, SDValue(), DL);<br>
<br>
return Chain;<br>
}<br>
<br>
Modified: llvm/trunk/test/CodeGen/WebAssembly/call.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/call.ll?rev=245883&r1=245882&r2=245883&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/call.ll?rev=245883&r1=245882&r2=245883&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/WebAssembly/call.ll (original)<br>
+++ llvm/trunk/test/CodeGen/WebAssembly/call.ll Mon Aug 24 17:00:04 2015<br>
@@ -5,13 +5,14 @@<br>
target datalayout = "e-p:32:32-i64:64-v128:8:128-n32:64-S128"<br>
target triple = "wasm32-unknown-unknown"<br>
<br>
-declare void @nullary()<br>
+declare void @void_nullary()<br>
+declare void @int32_nullary()<br>
<br>
-; CHECK-LABEL: call_nullary:<br>
+; CHECK-LABEL: call_void_nullary:<br>
; CHECK-NEXT: (call @foo)<br>
; CHECK-NEXT: (return)<br>
-define void @call_nullary() {<br>
- call void @nullary()<br>
+define void @call_void_nullary() {<br>
+ call void @void_nullary()<br>
ret void<br>
}<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div></div>
</blockquote></div><br></div>