[llvm] r261457 - [WebAssembly] Handle CopyToReg nodes with flag results in LowerCopyToReg.
Dan Gohman via llvm-commits
llvm-commits at lists.llvm.org
Sat Feb 20 15:09:44 PST 2016
Author: djg
Date: Sat Feb 20 17:09:44 2016
New Revision: 261457
URL: http://llvm.org/viewvc/llvm-project?rev=261457&view=rev
Log:
[WebAssembly] Handle CopyToReg nodes with flag results in LowerCopyToReg.
Modified:
llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
llvm/trunk/test/CodeGen/WebAssembly/userstack.ll
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp?rev=261457&r1=261456&r2=261457&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp Sat Feb 20 17:09:44 2016
@@ -558,16 +558,20 @@ SDValue WebAssemblyTargetLowering::Lower
// need to insert some kind of instruction that can take an FI operand and
// produces a value usable by CopyToReg (i.e. in a vreg). So insert a dummy
// copy_local between Op and its FI operand.
+ SDValue Chain = Op.getOperand(0);
SDLoc DL(Op);
+ unsigned Reg = cast<RegisterSDNode>(Op.getOperand(1))->getReg();
EVT VT = Src.getValueType();
SDValue Copy(
DAG.getMachineNode(VT == MVT::i32 ? WebAssembly::COPY_LOCAL_I32
: WebAssembly::COPY_LOCAL_I64,
DL, VT, Src),
0);
- return DAG.getCopyToReg(Op.getOperand(0), DL,
- cast<RegisterSDNode>(Op.getOperand(1))->getReg(),
- Copy);
+ return Op.getNode()->getNumValues() == 1
+ ? DAG.getCopyToReg(Chain, DL, Reg, Copy)
+ : DAG.getCopyToReg(Chain, DL, Reg, Copy, Op.getNumOperands() == 4
+ ? Op.getOperand(3)
+ : SDValue());
}
return SDValue();
}
Modified: llvm/trunk/test/CodeGen/WebAssembly/userstack.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/userstack.ll?rev=261457&r1=261456&r2=261457&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/userstack.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/userstack.ll Sat Feb 20 17:09:44 2016
@@ -217,4 +217,16 @@ define void @frameaddress_1() {
ret void
}
+; Test a stack address passed to an inline asm.
+; CHECK-LABEL: inline_asm:
+; CHECK: __stack_pointer
+; CHECK: #APP
+; CHECK-NEXT: # %{{[0-9]+}}{{$}}
+; CHECK-NEXT: #NO_APP
+define void @inline_asm() {
+ %tmp = alloca i8
+ call void asm sideeffect "# %0", "r"(i8* %tmp)
+ ret void
+}
+
; TODO: test over-aligned alloca
More information about the llvm-commits
mailing list