[llvm-commits] [llvm] r45995 - /llvm/trunk/lib/CodeGen/SelectionDAG/CallingConvLower.cpp

[Evan Cheng]

Author: evancheng
Date: Mon Jan 14 21:14:05 2008
New Revision: 45995

URL: http://llvm.org/viewvc/llvm-project?rev=45995&view=rev
Log:
ByVal stack slot alignment should be at least as large as pointer ABI alignment.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/CallingConvLower.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/CallingConvLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/CallingConvLower.cpp?rev=45995&r1=45994&r2=45995&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/CallingConvLower.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/CallingConvLower.cpp Mon Jan 14 21:14:05 2008
@@ -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 @@
 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));
 }