diff options
Diffstat (limited to 'contrib/llvm-project/llvm/lib/Target/Mips/MipsRegisterBankInfo.cpp')
-rw-r--r-- | contrib/llvm-project/llvm/lib/Target/Mips/MipsRegisterBankInfo.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsRegisterBankInfo.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsRegisterBankInfo.cpp index 6325e513f9f8..3101820d476e 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsRegisterBankInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsRegisterBankInfo.cpp @@ -716,10 +716,10 @@ void MipsRegisterBankInfo::setRegBank(MachineInstr &MI, static void combineAwayG_UNMERGE_VALUES(LegalizationArtifactCombiner &ArtCombiner, - MachineInstr &MI, GISelObserverWrapper &Observer) { + MachineInstr &MI, GISelChangeObserver &Observer) { SmallVector<Register, 4> UpdatedDefs; SmallVector<MachineInstr *, 2> DeadInstrs; - ArtCombiner.tryCombineMerges(MI, DeadInstrs, UpdatedDefs, Observer); + ArtCombiner.tryCombineUnmergeValues(MI, DeadInstrs, UpdatedDefs, Observer); for (MachineInstr *DeadMI : DeadInstrs) DeadMI->eraseFromParent(); } @@ -728,14 +728,13 @@ void MipsRegisterBankInfo::applyMappingImpl( const OperandsMapper &OpdMapper) const { MachineInstr &MI = OpdMapper.getMI(); InstListTy NewInstrs; - MachineIRBuilder B(MI); MachineFunction *MF = MI.getMF(); MachineRegisterInfo &MRI = OpdMapper.getMRI(); const LegalizerInfo &LegInfo = *MF->getSubtarget().getLegalizerInfo(); InstManager NewInstrObserver(NewInstrs); - GISelObserverWrapper WrapperObserver(&NewInstrObserver); - LegalizerHelper Helper(*MF, WrapperObserver, B); + MachineIRBuilder B(MI, NewInstrObserver); + LegalizerHelper Helper(*MF, NewInstrObserver, B); LegalizationArtifactCombiner ArtCombiner(B, MF->getRegInfo(), LegInfo); switch (MI.getOpcode()) { @@ -752,7 +751,7 @@ void MipsRegisterBankInfo::applyMappingImpl( // not be considered for regbank selection. RegBankSelect for mips // visits/makes corresponding G_MERGE first. Combine them here. if (NewMI->getOpcode() == TargetOpcode::G_UNMERGE_VALUES) - combineAwayG_UNMERGE_VALUES(ArtCombiner, *NewMI, WrapperObserver); + combineAwayG_UNMERGE_VALUES(ArtCombiner, *NewMI, NewInstrObserver); // This G_MERGE will be combined away when its corresponding G_UNMERGE // gets regBankSelected. else if (NewMI->getOpcode() == TargetOpcode::G_MERGE_VALUES) @@ -764,7 +763,7 @@ void MipsRegisterBankInfo::applyMappingImpl( return; } case TargetOpcode::G_UNMERGE_VALUES: - combineAwayG_UNMERGE_VALUES(ArtCombiner, MI, WrapperObserver); + combineAwayG_UNMERGE_VALUES(ArtCombiner, MI, NewInstrObserver); return; default: break; |