Skip to content

Commit b128abc

Browse files
committed
Remove a bunch of unnecessary casts to a target specific version of TII and TRI as we're working from a target specific STI.
llvm-svn: 294081
1 parent 0f7badc commit b128abc

File tree

1 file changed

+13
-26
lines changed

1 file changed

+13
-26
lines changed

Diff for: llvm/lib/Target/PowerPC/PPCFrameLowering.cpp

+13-26
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,7 @@ unsigned PPCFrameLowering::determineFrameLayout(MachineFunction &MF,
433433
unsigned MaxAlign = MFI.getMaxAlignment(); // algmt required by data in frame
434434
unsigned AlignMask = std::max(MaxAlign, TargetAlign) - 1;
435435

436-
const PPCRegisterInfo *RegInfo =
437-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
436+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
438437

439438
// If we are a leaf function, and use up to 224 bytes of stack space,
440439
// don't have a frame pointer, calls, or dynamic alloca then we do not need
@@ -519,8 +518,7 @@ void PPCFrameLowering::replaceFPWithRealFP(MachineFunction &MF) const {
519518
unsigned FPReg = is31 ? PPC::R31 : PPC::R1;
520519
unsigned FP8Reg = is31 ? PPC::X31 : PPC::X1;
521520

522-
const PPCRegisterInfo *RegInfo =
523-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
521+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
524522
bool HasBP = RegInfo->hasBasePointer(MF);
525523
unsigned BPReg = HasBP ? (unsigned) RegInfo->getBaseRegister(MF) : FPReg;
526524
unsigned BP8Reg = HasBP ? (unsigned) PPC::X30 : FPReg;
@@ -616,8 +614,7 @@ PPCFrameLowering::findScratchRegister(MachineBasicBlock *MBB,
616614
return true;
617615

618616
// Get the list of callee-saved registers for the target.
619-
const PPCRegisterInfo *RegInfo =
620-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
617+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
621618
const MCPhysReg *CSRegs = RegInfo->getCalleeSavedRegs(MBB->getParent());
622619

623620
// Get all the available registers in the block.
@@ -663,8 +660,7 @@ PPCFrameLowering::findScratchRegister(MachineBasicBlock *MBB,
663660
// and the stack frame is large, we need two scratch registers.
664661
bool
665662
PPCFrameLowering::twoUniqueScratchRegsRequired(MachineBasicBlock *MBB) const {
666-
const PPCRegisterInfo *RegInfo =
667-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
663+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
668664
MachineFunction &MF = *(MBB->getParent());
669665
bool HasBP = RegInfo->hasBasePointer(MF);
670666
unsigned FrameSize = determineFrameLayout(MF, false);
@@ -694,10 +690,8 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
694690
MachineBasicBlock &MBB) const {
695691
MachineBasicBlock::iterator MBBI = MBB.begin();
696692
MachineFrameInfo &MFI = MF.getFrameInfo();
697-
const PPCInstrInfo &TII =
698-
*static_cast<const PPCInstrInfo *>(Subtarget.getInstrInfo());
699-
const PPCRegisterInfo *RegInfo =
700-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
693+
const PPCInstrInfo &TII = *Subtarget.getInstrInfo();
694+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
701695

702696
MachineModuleInfo &MMI = MF.getMMI();
703697
const MCRegisterInfo *MRI = MMI.getContext().getRegisterInfo();
@@ -1221,10 +1215,8 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
12211215
if (MBBI != MBB.end())
12221216
dl = MBBI->getDebugLoc();
12231217

1224-
const PPCInstrInfo &TII =
1225-
*static_cast<const PPCInstrInfo *>(Subtarget.getInstrInfo());
1226-
const PPCRegisterInfo *RegInfo =
1227-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
1218+
const PPCInstrInfo &TII = *Subtarget.getInstrInfo();
1219+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
12281220

12291221
// Get alignment info so we know how to restore the SP.
12301222
const MachineFrameInfo &MFI = MF.getFrameInfo();
@@ -1550,8 +1542,7 @@ void PPCFrameLowering::createTailCallBranchInstr(MachineBasicBlock &MBB) const {
15501542
if (MBBI != MBB.end())
15511543
dl = MBBI->getDebugLoc();
15521544

1553-
const PPCInstrInfo &TII =
1554-
*static_cast<const PPCInstrInfo *>(Subtarget.getInstrInfo());
1545+
const PPCInstrInfo &TII = *Subtarget.getInstrInfo();
15551546

15561547
// Create branch instruction for pseudo tail call return instruction
15571548
unsigned RetOpcode = MBBI->getOpcode();
@@ -1589,8 +1580,7 @@ void PPCFrameLowering::determineCalleeSaves(MachineFunction &MF,
15891580
RegScavenger *RS) const {
15901581
TargetFrameLowering::determineCalleeSaves(MF, SavedRegs, RS);
15911582

1592-
const PPCRegisterInfo *RegInfo =
1593-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
1583+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
15941584

15951585
// Save and clear the LR state.
15961586
PPCFunctionInfo *FI = MF.getInfo<PPCFunctionInfo>();
@@ -1793,8 +1783,7 @@ void PPCFrameLowering::processFunctionBeforeFrameFinalized(MachineFunction &MF,
17931783
MFI.setObjectOffset(FI, LowerBound + MFI.getObjectOffset(FI));
17941784
}
17951785

1796-
const PPCRegisterInfo *RegInfo =
1797-
static_cast<const PPCRegisterInfo *>(Subtarget.getRegisterInfo());
1786+
const PPCRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
17981787
if (RegInfo->hasBasePointer(MF)) {
17991788
HasGPSaveArea = true;
18001789

@@ -1941,8 +1930,7 @@ PPCFrameLowering::spillCalleeSavedRegisters(MachineBasicBlock &MBB,
19411930
return false;
19421931

19431932
MachineFunction *MF = MBB.getParent();
1944-
const PPCInstrInfo &TII =
1945-
*static_cast<const PPCInstrInfo *>(Subtarget.getInstrInfo());
1933+
const PPCInstrInfo &TII = *Subtarget.getInstrInfo();
19461934
DebugLoc DL;
19471935
bool CRSpilled = false;
19481936
MachineInstrBuilder CRMIB;
@@ -2083,8 +2071,7 @@ PPCFrameLowering::restoreCalleeSavedRegisters(MachineBasicBlock &MBB,
20832071
return false;
20842072

20852073
MachineFunction *MF = MBB.getParent();
2086-
const PPCInstrInfo &TII =
2087-
*static_cast<const PPCInstrInfo *>(Subtarget.getInstrInfo());
2074+
const PPCInstrInfo &TII = *Subtarget.getInstrInfo();
20882075
bool CR2Spilled = false;
20892076
bool CR3Spilled = false;
20902077
bool CR4Spilled = false;

0 commit comments

Comments
 (0)