diff options
| author | Jim Grosbach <grosbach@apple.com> | 2009-11-21 23:34:09 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2009-11-21 23:34:09 +0000 |
| commit | e09e95b35c1367ead8e0af22f6f97b7854651ff3 (patch) | |
| tree | 1845e390b93c8628b3e6611f7af7f1ad71751a82 /llvm/lib/Target/ARM | |
| parent | 042483efb1758774def289755d57b52a9faeae12 (diff) | |
| download | bcm5719-llvm-e09e95b35c1367ead8e0af22f6f97b7854651ff3.tar.gz bcm5719-llvm-e09e95b35c1367ead8e0af22f6f97b7854651ff3.zip | |
Revert 89562. We're being sneakier than I was giving us credit for, and this
isn't necessary.
llvm-svn: 89568
Diffstat (limited to 'llvm/lib/Target/ARM')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp index df458689733..19762ee5cfb 100644 --- a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp +++ b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp @@ -222,7 +222,6 @@ BitVector ARMBaseRegisterInfo::getReservedRegs(const MachineFunction &MF) const BitVector Reserved(getNumRegs()); Reserved.set(ARM::SP); Reserved.set(ARM::PC); - // FP is reserved on Darwin even if we're not using it in this function. if (STI.isTargetDarwin() || hasFP(MF)) Reserved.set(FramePtr); // Some targets reserve R9. @@ -240,7 +239,6 @@ bool ARMBaseRegisterInfo::isReservedReg(const MachineFunction &MF, return true; case ARM::R7: case ARM::R11: - // FP is reserved on Darwin even if we're not using it in this function. if (FramePtr == Reg && (STI.isTargetDarwin() || hasFP(MF))) return true; break; @@ -494,8 +492,7 @@ static unsigned calculateMaxStackAlignment(const MachineFrameInfo *FFI) { /// bool ARMBaseRegisterInfo::hasFP(const MachineFunction &MF) const { const MachineFrameInfo *MFI = MF.getFrameInfo(); - return ((STI.isTargetDarwin() && MFI->hasCalls()) || - NoFramePointerElim || + return (NoFramePointerElim || needsStackRealignment(MF) || MFI->hasVarSizedObjects() || MFI->isFrameAddressTaken()); |
