diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2011-05-06 20:34:06 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2011-05-06 20:34:06 +0000 |
| commit | fc5d305597ea6336d75bd7f3b741e8d57d6a5105 (patch) | |
| tree | 74cae16e5f701b7d0bc679d547c4fe85f91be3a7 /lib/CodeGen/MachineFunction.cpp | |
| parent | 8265e6ab4fb5ff178266d960c5d894f5828bb8ce (diff) | |
| download | llvm-fc5d305597ea6336d75bd7f3b741e8d57d6a5105.tar.gz llvm-fc5d305597ea6336d75bd7f3b741e8d57d6a5105.tar.bz2 llvm-fc5d305597ea6336d75bd7f3b741e8d57d6a5105.tar.xz | |
Make the logic for determining function alignment more explicit. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131012 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/MachineFunction.cpp')
| -rw-r--r-- | lib/CodeGen/MachineFunction.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index 2dde6adbaa..50750a50ab 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -65,7 +65,11 @@ MachineFunction::MachineFunction(const Function *F, const TargetMachine &TM, FrameInfo->setMaxAlignment(Attribute::getStackAlignmentFromAttrs( Fn->getAttributes().getFnAttributes())); ConstantPool = new (Allocator) MachineConstantPool(TM.getTargetData()); - Alignment = TM.getTargetLowering()->getFunctionAlignment(F); + Alignment = TM.getTargetLowering()->getMinFunctionAlignment(); + // FIXME: Shouldn't use pref alignment if explicit alignment is set on Fn. + if (!Fn->hasFnAttr(Attribute::OptimizeForSize)) + Alignment = std::max(Alignment, + TM.getTargetLowering()->getPrefFunctionAlignment()); FunctionNumber = FunctionNum; JumpTableInfo = 0; } |