aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAnton Korobeynikov <asl@math.spbu.ru>2008-04-23 18:23:50 +0000
committerAnton Korobeynikov <asl@math.spbu.ru>2008-04-23 18:23:50 +0000
commitfe60726a94153c08c0d0c0899bc9c2b8a9fdd5cf (patch)
treeddde6daec0842f874fc0caaa48f0bbb893f2aab7 /lib
parent8c912895587b1de59a4018ac4b19659b6453e76f (diff)
downloadexternal_llvm-fe60726a94153c08c0d0c0899bc9c2b8a9fdd5cf.tar.gz
external_llvm-fe60726a94153c08c0d0c0899bc9c2b8a9fdd5cf.tar.bz2
external_llvm-fe60726a94153c08c0d0c0899bc9c2b8a9fdd5cf.zip
Only allow increase of max alignment value
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50168 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/X86/X86RegisterInfo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 0d528f7258..8dd609c3fa 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);
}