[llvm-commits] [llvm] r132776 - in /llvm/trunk: lib/CodeGen/CallingConvLower.cpp test/CodeGen/X86/byval-align.ll

[Eric Christopher]

Author: echristo
Date: Thu Jun  9 10:39:01 2011
New Revision: 132776

URL: http://llvm.org/viewvc/llvm-project?rev=132776&view=rev
Log:
Recommit r132764 since it didn't cause the windows buildbot failures.

Added:
    llvm/trunk/test/CodeGen/X86/byval-align.ll
      - copied unchanged from r132770, llvm/trunk/test/CodeGen/X86/byval-align.ll
Modified:
    llvm/trunk/lib/CodeGen/CallingConvLower.cpp

Modified: llvm/trunk/lib/CodeGen/CallingConvLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CallingConvLower.cpp?rev=132776&r1=132775&r2=132776&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/CallingConvLower.cpp (original)
+++ llvm/trunk/lib/CodeGen/CallingConvLower.cpp Thu Jun  9 10:39:01 2011
@@ -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));