summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/MachineFunction.cpp
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2012-09-20 16:59:57 +0000
committerBill Wendling <isanbard@gmail.com>2012-09-20 16:59:57 +0000
commitc727bacb38208be6af9c4701f12f0cd3008a7f22 (patch)
treed10eaa961d574429d0519980b250fef7f9ee749b /llvm/lib/CodeGen/MachineFunction.cpp
parentabac66150cd9b8a16865db399a930e823206b3b7 (diff)
downloadbcm5719-llvm-c727bacb38208be6af9c4701f12f0cd3008a7f22.tar.gz
bcm5719-llvm-c727bacb38208be6af9c4701f12f0cd3008a7f22.zip
Revert r164308 to fix buildbots.
llvm-svn: 164309
Diffstat (limited to 'llvm/lib/CodeGen/MachineFunction.cpp')
-rw-r--r--llvm/lib/CodeGen/MachineFunction.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp
index 304e39e1592..328722bad48 100644
--- a/llvm/lib/CodeGen/MachineFunction.cpp
+++ b/llvm/lib/CodeGen/MachineFunction.cpp
@@ -60,8 +60,8 @@ MachineFunction::MachineFunction(const Function *F, const TargetMachine &TM,
MFInfo = 0;
FrameInfo = new (Allocator) MachineFrameInfo(*TM.getFrameLowering());
if (Fn->hasFnAttr(Attribute::StackAlignment))
- FrameInfo->ensureMaxAlignment(Fn->getAttributes().
- getFnAttributes().getStackAlignment());
+ FrameInfo->ensureMaxAlignment(Attribute::getStackAlignmentFromAttrs(
+ Fn->getAttributes().getFnAttributes()));
ConstantPool = new (Allocator) MachineConstantPool(TM.getTargetData());
Alignment = TM.getTargetLowering()->getMinFunctionAlignment();
// FIXME: Shouldn't use pref alignment if explicit alignment is set on Fn.
OpenPOWER on IntegriCloud