diff options
author | Jim Grosbach <grosbach@apple.com> | 2010-02-02 23:56:14 +0000 |
---|---|---|
committer | Jim Grosbach <grosbach@apple.com> | 2010-02-02 23:56:14 +0000 |
commit | d0a2f52f8fd1e59ede4d6a239e9ac7ac2f37dc80 (patch) | |
tree | 3ff64fc0a2179777eb39994d490ed73c23796360 /llvm | |
parent | 6f36a083ef84714dd8aeccccc253051fe8fa4f13 (diff) | |
download | bcm5719-llvm-d0a2f52f8fd1e59ede4d6a239e9ac7ac2f37dc80.tar.gz bcm5719-llvm-d0a2f52f8fd1e59ede4d6a239e9ac7ac2f37dc80.zip |
As of r79039, we still try to eliminate the frame pointer on leaf functions,
even when -disable-fp-elim is specified.
llvm-svn: 95161
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp index dec8a69be00..cb0bd1dbd24 100644 --- a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp +++ b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp @@ -478,7 +478,7 @@ ARMBaseRegisterInfo::UpdateRegAllocHint(unsigned Reg, unsigned NewReg, /// bool ARMBaseRegisterInfo::hasFP(const MachineFunction &MF) const { const MachineFrameInfo *MFI = MF.getFrameInfo(); - return (NoFramePointerElim || + return ((NoFramePointerElim && MFI->hasCalls())|| needsStackRealignment(MF) || MFI->hasVarSizedObjects() || MFI->isFrameAddressTaken()); |