From: Anton Korobeynikov <asl@math.spbu.ru>
Date: Wed, 23 Apr 2008 18:23:50 +0000 (+0000)
Subject: Only allow increase of max alignment value
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dc28bd43d3b9fa52aa1063a29b75536171b58c3c;p=oota-llvm.git

Only allow increase of max alignment value


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

diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 0d528f72583..8dd609c3fac 100644
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -417,7 +417,8 @@ X86RegisterInfo::processFunctionBeforeCalleeSavedScan(MachineFunction &MF,
 
   // Calculate and set max stack object alignment early, so we can decide
   // whether we will need stack realignment (and thus FP).
-  unsigned MaxAlign = calculateMaxStackAlignment(FFI);
+  unsigned MaxAlign = std::max(FFI->getMaxAlignment(),
+                               calculateMaxStackAlignment(FFI));
 
   FFI->setMaxAlignment(MaxAlign);
 }