Use MachineFrameInfo::hasCalls instead of MipsFunctionInfo::hasCall to check if

a function has any function calls.

llvm-svn: 132140
This commit is contained in:
Akira Hatanaka 2011-05-26 20:30:31 +00:00
parent a77d692299
commit 71839b355d
3 changed files with 2 additions and 10 deletions

View File

@ -279,7 +279,6 @@ void MipsFrameLowering::
processFunctionBeforeCalleeSavedScan(MachineFunction &MF,
RegScavenger *RS) const {
MachineRegisterInfo& MRI = MF.getRegInfo();
MipsFunctionInfo *MipsFI = MF.getInfo<MipsFunctionInfo>();
// FIXME: remove this code if register allocator can correctly mark
// $fp and $ra used or unused.
@ -293,7 +292,7 @@ processFunctionBeforeCalleeSavedScan(MachineFunction &MF,
// instructions to save/restore $ra unless there is a function call.
// To correct this, $ra is explicitly marked unused if there is no
// function call.
if (MipsFI->hasCall())
if (MF.getFrameInfo()->hasCalls())
MRI.setPhysRegUsed(Mips::RA);
else
MRI.setPhysRegUnused(Mips::RA);

View File

@ -1171,8 +1171,6 @@ MipsTargetLowering::LowerCall(SDValue Chain, SDValue Callee,
SmallVector<std::pair<unsigned, SDValue>, 16> RegsToPass;
SmallVector<SDValue, 8> MemOpChains;
MipsFI->setHasCall();
// If this is the first call, create a stack frame object that points to
// a location to which .cprestore saves $gp. The offset of this frame object
// is set to 0, since we know nothing about the size of the argument area at

View File

@ -47,14 +47,12 @@ private:
// LowerCall except for the frame object for restoring $gp.
std::pair<int, int> InArgFIRange, OutArgFIRange;
int GPFI; // Index of the frame object for restoring $gp
bool HasCall; // True if function has a function call.
unsigned MaxCallFrameSize;
public:
MipsFunctionInfo(MachineFunction& MF)
: SRetReturnReg(0), GlobalBaseReg(0),
VarArgsFrameIndex(0), InArgFIRange(std::make_pair(-1, 0)),
OutArgFIRange(std::make_pair(-1, 0)), GPFI(0), HasCall(false),
MaxCallFrameSize(0)
OutArgFIRange(std::make_pair(-1, 0)), GPFI(0), MaxCallFrameSize(0)
{}
bool isInArgFI(int FI) const {
@ -86,9 +84,6 @@ public:
int getVarArgsFrameIndex() const { return VarArgsFrameIndex; }
void setVarArgsFrameIndex(int Index) { VarArgsFrameIndex = Index; }
bool hasCall() const { return HasCall; }
void setHasCall() { HasCall = true; }
unsigned getMaxCallFrameSize() const { return MaxCallFrameSize; }
void setMaxCallFrameSize(unsigned S) { MaxCallFrameSize = S; }
};