commit 622ab4ab505a8f07d648d7e15016a56bacdaddd1
author Eric Christopher <echristo@apple.com> Thu Jun 09 15:39:01 2011 +0000
committer Eric Christopher <echristo@apple.com> Thu Jun 09 15:39:01 2011 +0000
tree 087b5ccf8e0772a99b4de4ed2f7ce2b94ebc1c72
parent d896d418510d16f47f8236f1956c3784e1520017

Recommit r132764 since it didn't cause the windows buildbot failures.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132776 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CallingConvLower.cpp

diff --git a/lib/CodeGen/CallingConvLower.cpp b/lib/CodeGen/CallingConvLower.cpp
index dac2fef..bc61ec8 100644
--- a/lib/CodeGen/CallingConvLower.cpp
+++ b/lib/CodeGen/CallingConvLower.cpp
@@ -49,6 +49,8 @@
     Size = MinSize;
   if (MinAlign > (int)Align)
     Align = MinAlign;
+  if (MF.getFrameInfo()->getMaxAlignment() < Align)
+    MF.getFrameInfo()->setMaxAlignment(Align);
   TM.getTargetLowering()->HandleByVal(const_cast<CCState*>(this), Size);
   unsigned Offset = AllocateStack(Size, Align);
   addLoc(CCValAssign::getMem(ValNo, ValVT, Offset, LocVT, LocInfo));