summaryrefslogtreecommitdiffstats
path: root/lib/Target/ARM/ARMBaseRegisterInfo.cpp
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2010-02-02 23:56:14 +0000
committerJim Grosbach <grosbach@apple.com>2010-02-02 23:56:14 +0000
commit985d45dea357cbfe718b89cebd84b20b1298ab93 (patch)
tree1c08385792dd2311669a3fbdec93cc0a1ac6a333 /lib/Target/ARM/ARMBaseRegisterInfo.cpp
parent022d9e1cef7586a80a96446ae8691a37def9bbf4 (diff)
downloadexternal_llvm-985d45dea357cbfe718b89cebd84b20b1298ab93.zip
external_llvm-985d45dea357cbfe718b89cebd84b20b1298ab93.tar.gz
external_llvm-985d45dea357cbfe718b89cebd84b20b1298ab93.tar.bz2
As of r79039, we still try to eliminate the frame pointer on leaf functions,
even when -disable-fp-elim is specified. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95161 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMBaseRegisterInfo.cpp')
-rw-r--r--lib/Target/ARM/ARMBaseRegisterInfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/lib/Target/ARM/ARMBaseRegisterInfo.cpp
index dec8a69..cb0bd1d 100644
--- a/lib/Target/ARM/ARMBaseRegisterInfo.cpp
+++ b/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());