diff options
| author | Robert Lytton <robert@xmos.com> | 2013-11-12 10:11:35 +0000 |
|---|---|---|
| committer | Robert Lytton <robert@xmos.com> | 2013-11-12 10:11:35 +0000 |
| commit | 47a4349eb659e021899348f009650b9cadaf0de2 (patch) | |
| tree | f99219c5bd092d054ed1b6ae8d25910eda955222 | |
| parent | 092815ce4be4a57d1520e73fdaaa95933aa38f81 (diff) | |
| download | llvm-47a4349eb659e021899348f009650b9cadaf0de2.tar.gz llvm-47a4349eb659e021899348f009650b9cadaf0de2.tar.bz2 llvm-47a4349eb659e021899348f009650b9cadaf0de2.tar.xz | |
XCore target: fix bug in aligning 'byval i8*' on the stack
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194466 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/XCore/XCoreISelLowering.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/XCore/byVal.ll | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/Target/XCore/XCoreISelLowering.cpp b/lib/Target/XCore/XCoreISelLowering.cpp index 149652ff73..a382a189cf 100644 --- a/lib/Target/XCore/XCoreISelLowering.cpp +++ b/lib/Target/XCore/XCoreISelLowering.cpp @@ -1224,7 +1224,7 @@ XCoreTargetLowering::LowerCCCArguments(SDValue Chain, ArgDI != ArgDE; ++ArgDI) { if (ArgDI->Flags.isByVal() && ArgDI->Flags.getByValSize()) { unsigned Size = ArgDI->Flags.getByValSize(); - unsigned Align = ArgDI->Flags.getByValAlign(); + unsigned Align = std::max(StackSlotSize, ArgDI->Flags.getByValAlign()); // Create a new object on the stack and copy the pointee into it. int FI = MFI->CreateStackObject(Size, Align, false, false); SDValue FIN = DAG.getFrameIndex(FI, MVT::i32); diff --git a/test/CodeGen/XCore/byVal.ll b/test/CodeGen/XCore/byVal.ll index a5d25d2d95..e9612fd602 100644 --- a/test/CodeGen/XCore/byVal.ll +++ b/test/CodeGen/XCore/byVal.ll @@ -56,3 +56,18 @@ entry: call void @f2(i32 %i, %struct.st2* %s2) ret void } + +; CHECK-LABEL: f3Test +; CHECK: entsp 2 +; CHECK: ldc r1, 0 +; CHECK: ld8u r2, r0[r1] +; CHECK: ldaw r0, sp[1] +; CHECK: st8 r2, r0[r1] +; CHECK: bl f +; CHECK: retsp 2 +declare void @f3(i8*) nounwind +define void @f3Test(i8* byval %v) nounwind { +entry: + call void @f3(i8* %v) nounwind + ret void +} |