From c67e6e8e8203be62da647832842edd7d90c4c585 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Tue, 15 Jan 2008 03:14:05 +0000 Subject: [PATCH] ByVal stack slot alignment should be at least as large as pointer ABI alignment. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45995 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SelectionDAG/CallingConvLower.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/CodeGen/SelectionDAG/CallingConvLower.cpp b/lib/CodeGen/SelectionDAG/CallingConvLower.cpp index b8bc484e3bc..522ad7399e2 100644 --- a/lib/CodeGen/SelectionDAG/CallingConvLower.cpp +++ b/lib/CodeGen/SelectionDAG/CallingConvLower.cpp @@ -15,6 +15,7 @@ #include "llvm/CodeGen/CallingConvLower.h" #include "llvm/CodeGen/SelectionDAGNodes.h" #include "llvm/Target/MRegisterInfo.h" +#include "llvm/Target/TargetData.h" #include "llvm/Target/TargetMachine.h" using namespace llvm; @@ -31,11 +32,12 @@ CCState::CCState(unsigned CC, bool isVarArg, const TargetMachine &tm, void CCState::HandleStruct(unsigned ValNo, MVT::ValueType ValVT, MVT::ValueType LocVT, CCValAssign::LocInfo LocInfo, unsigned ArgFlags) { + unsigned MinAlign = TM.getTargetData()->getPointerABIAlignment(); unsigned Align = 1 << ((ArgFlags & ISD::ParamFlags::ByValAlign) >> ISD::ParamFlags::ByValAlignOffs); unsigned Size = (ArgFlags & ISD::ParamFlags::ByValSize) >> ISD::ParamFlags::ByValSizeOffs; - unsigned Offset = AllocateStack(Size, Align); + unsigned Offset = AllocateStack(Size, std::max(MinAlign, Align)); addLoc(CCValAssign::getMem(ValNo, ValVT, Offset, LocVT, LocInfo)); } -- 2.34.1