|
@@ -191,7 +191,7 @@ MachineInstr *TargetInstrInfo::commuteInstructionImpl(MachineInstr &MI,
|
|
MachineInstr *CommutedMI = nullptr;
|
|
MachineInstr *CommutedMI = nullptr;
|
|
if (NewMI) {
|
|
if (NewMI) {
|
|
// Create a new instruction.
|
|
// Create a new instruction.
|
|
- MachineFunction &MF = *MI.getParent()->getParent();
|
|
|
|
|
|
+ MachineFunction &MF = *MI.getMF();
|
|
CommutedMI = MF.CloneMachineInstr(&MI);
|
|
CommutedMI = MF.CloneMachineInstr(&MI);
|
|
} else {
|
|
} else {
|
|
CommutedMI = &MI;
|
|
CommutedMI = &MI;
|
|
@@ -438,7 +438,7 @@ static const TargetRegisterClass *canFoldCopy(const MachineInstr &MI,
|
|
assert(TargetRegisterInfo::isVirtualRegister(FoldReg) &&
|
|
assert(TargetRegisterInfo::isVirtualRegister(FoldReg) &&
|
|
"Cannot fold physregs");
|
|
"Cannot fold physregs");
|
|
|
|
|
|
- const MachineRegisterInfo &MRI = MI.getParent()->getParent()->getRegInfo();
|
|
|
|
|
|
+ const MachineRegisterInfo &MRI = MI.getMF()->getRegInfo();
|
|
const TargetRegisterClass *RC = MRI.getRegClass(FoldReg);
|
|
const TargetRegisterClass *RC = MRI.getRegClass(FoldReg);
|
|
|
|
|
|
if (TargetRegisterInfo::isPhysicalRegister(LiveOp.getReg()))
|
|
if (TargetRegisterInfo::isPhysicalRegister(LiveOp.getReg()))
|
|
@@ -763,7 +763,7 @@ void TargetInstrInfo::reassociateOps(
|
|
SmallVectorImpl<MachineInstr *> &InsInstrs,
|
|
SmallVectorImpl<MachineInstr *> &InsInstrs,
|
|
SmallVectorImpl<MachineInstr *> &DelInstrs,
|
|
SmallVectorImpl<MachineInstr *> &DelInstrs,
|
|
DenseMap<unsigned, unsigned> &InstrIdxForVirtReg) const {
|
|
DenseMap<unsigned, unsigned> &InstrIdxForVirtReg) const {
|
|
- MachineFunction *MF = Root.getParent()->getParent();
|
|
|
|
|
|
+ MachineFunction *MF = Root.getMF();
|
|
MachineRegisterInfo &MRI = MF->getRegInfo();
|
|
MachineRegisterInfo &MRI = MF->getRegInfo();
|
|
const TargetInstrInfo *TII = MF->getSubtarget().getInstrInfo();
|
|
const TargetInstrInfo *TII = MF->getSubtarget().getInstrInfo();
|
|
const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();
|
|
const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();
|
|
@@ -846,7 +846,7 @@ void TargetInstrInfo::genAlternativeCodeSequence(
|
|
SmallVectorImpl<MachineInstr *> &InsInstrs,
|
|
SmallVectorImpl<MachineInstr *> &InsInstrs,
|
|
SmallVectorImpl<MachineInstr *> &DelInstrs,
|
|
SmallVectorImpl<MachineInstr *> &DelInstrs,
|
|
DenseMap<unsigned, unsigned> &InstIdxForVirtReg) const {
|
|
DenseMap<unsigned, unsigned> &InstIdxForVirtReg) const {
|
|
- MachineRegisterInfo &MRI = Root.getParent()->getParent()->getRegInfo();
|
|
|
|
|
|
+ MachineRegisterInfo &MRI = Root.getMF()->getRegInfo();
|
|
|
|
|
|
// Select the previous instruction in the sequence based on the input pattern.
|
|
// Select the previous instruction in the sequence based on the input pattern.
|
|
MachineInstr *Prev = nullptr;
|
|
MachineInstr *Prev = nullptr;
|
|
@@ -870,7 +870,7 @@ void TargetInstrInfo::genAlternativeCodeSequence(
|
|
|
|
|
|
bool TargetInstrInfo::isReallyTriviallyReMaterializableGeneric(
|
|
bool TargetInstrInfo::isReallyTriviallyReMaterializableGeneric(
|
|
const MachineInstr &MI, AliasAnalysis *AA) const {
|
|
const MachineInstr &MI, AliasAnalysis *AA) const {
|
|
- const MachineFunction &MF = *MI.getParent()->getParent();
|
|
|
|
|
|
+ const MachineFunction &MF = *MI.getMF();
|
|
const MachineRegisterInfo &MRI = MF.getRegInfo();
|
|
const MachineRegisterInfo &MRI = MF.getRegInfo();
|
|
|
|
|
|
// Remat clients assume operand 0 is the defined register.
|
|
// Remat clients assume operand 0 is the defined register.
|
|
@@ -948,7 +948,7 @@ bool TargetInstrInfo::isReallyTriviallyReMaterializableGeneric(
|
|
}
|
|
}
|
|
|
|
|
|
int TargetInstrInfo::getSPAdjust(const MachineInstr &MI) const {
|
|
int TargetInstrInfo::getSPAdjust(const MachineInstr &MI) const {
|
|
- const MachineFunction *MF = MI.getParent()->getParent();
|
|
|
|
|
|
+ const MachineFunction *MF = MI.getMF();
|
|
const TargetFrameLowering *TFI = MF->getSubtarget().getFrameLowering();
|
|
const TargetFrameLowering *TFI = MF->getSubtarget().getFrameLowering();
|
|
bool StackGrowsDown =
|
|
bool StackGrowsDown =
|
|
TFI->getStackGrowthDirection() == TargetFrameLowering::StackGrowsDown;
|
|
TFI->getStackGrowthDirection() == TargetFrameLowering::StackGrowsDown;
|