From f3e629e3ec83d37069e423bceb41c4887cdcb40e Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Thu, 8 Dec 2016 00:15:51 +0000 Subject: [PATCH] LivePhysReg: Use reference instead of pointer in init(); NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@289002 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/LivePhysRegs.h | 7 +++---- lib/CodeGen/BranchFolding.cpp | 2 +- lib/CodeGen/ExecutionDepsFix.cpp | 2 +- lib/CodeGen/IfConversion.cpp | 10 +++++----- lib/CodeGen/StackMapLivenessAnalysis.cpp | 2 +- lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 2 +- lib/Target/SystemZ/SystemZShortenInst.cpp | 2 +- lib/Target/X86/X86FixupBWInsts.cpp | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/llvm/CodeGen/LivePhysRegs.h b/include/llvm/CodeGen/LivePhysRegs.h index 96660de7377c..15bdefb34b85 100644 --- a/include/llvm/CodeGen/LivePhysRegs.h +++ b/include/llvm/CodeGen/LivePhysRegs.h @@ -60,11 +60,10 @@ class LivePhysRegs { } /// \brief Clear and initialize the LivePhysRegs set. - void init(const TargetRegisterInfo *TRI) { - assert(TRI && "Invalid TargetRegisterInfo pointer."); - this->TRI = TRI; + void init(const TargetRegisterInfo &TRI) { + this->TRI = &TRI; LiveRegs.clear(); - LiveRegs.setUniverse(TRI->getNumRegs()); + LiveRegs.setUniverse(TRI.getNumRegs()); } /// \brief Clears the LivePhysRegs set. diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index 20c36a923df5..20dc88051500 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -353,7 +353,7 @@ void BranchFolder::computeLiveIns(MachineBasicBlock &MBB) { if (!UpdateLiveIns) return; - LiveRegs.init(TRI); + LiveRegs.init(*TRI); LiveRegs.addLiveOutsNoPristines(MBB); for (MachineInstr &MI : make_range(MBB.rbegin(), MBB.rend())) LiveRegs.stepBackward(MI); diff --git a/lib/CodeGen/ExecutionDepsFix.cpp b/lib/CodeGen/ExecutionDepsFix.cpp index 54164c94395c..e7c6b03f1a49 100644 --- a/lib/CodeGen/ExecutionDepsFix.cpp +++ b/lib/CodeGen/ExecutionDepsFix.cpp @@ -612,7 +612,7 @@ void ExeDepsFix::processUndefReads(MachineBasicBlock *MBB) { return; // Collect this block's live out register units. - LiveRegSet.init(TRI); + LiveRegSet.init(*TRI); // We do not need to care about pristine registers as they are just preserved // but not actually used in the function. LiveRegSet.addLiveOutsNoPristines(*MBB); diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp index e81af66c3b3b..56a25e0331d1 100644 --- a/lib/CodeGen/IfConversion.cpp +++ b/lib/CodeGen/IfConversion.cpp @@ -1517,13 +1517,13 @@ bool IfConverter::IfConvertSimple(BBInfo &BBI, IfcvtKind Kind) { // Initialize liveins to the first BB. These are potentiall redefined by // predicated instructions. - Redefs.init(TRI); + Redefs.init(*TRI); Redefs.addLiveIns(CvtMBB); Redefs.addLiveIns(NextMBB); // Compute a set of registers which must not be killed by instructions in // BB1: This is everything live-in to BB2. - DontKill.init(TRI); + DontKill.init(*TRI); DontKill.addLiveIns(NextMBB); if (CvtMBB.pred_size() > 1) { @@ -1621,7 +1621,7 @@ bool IfConverter::IfConvertTriangle(BBInfo &BBI, IfcvtKind Kind) { // Initialize liveins to the first BB. These are potentially redefined by // predicated instructions. - Redefs.init(TRI); + Redefs.init(*TRI); Redefs.addLiveIns(CvtMBB); Redefs.addLiveIns(NextMBB); @@ -1785,7 +1785,7 @@ bool IfConverter::IfConvertDiamondCommon( // - BB1 live-out regs need implicit uses before being redefined by BB2 // instructions. We start with BB1 live-ins so we have the live-out regs // after tracking the BB1 instructions. - Redefs.init(TRI); + Redefs.init(*TRI); Redefs.addLiveIns(MBB1); Redefs.addLiveIns(MBB2); @@ -1811,7 +1811,7 @@ bool IfConverter::IfConvertDiamondCommon( // Compute a set of registers which must not be killed by instructions in BB1: // This is everything used+live in BB2 after the duplicated instructions. We // can compute this set by simulating liveness backwards from the end of BB2. - DontKill.init(TRI); + DontKill.init(*TRI); for (const MachineInstr &MI : make_range(MBB2.rbegin(), ++DI2.getReverse())) DontKill.stepBackward(MI); diff --git a/lib/CodeGen/StackMapLivenessAnalysis.cpp b/lib/CodeGen/StackMapLivenessAnalysis.cpp index 546e63247d05..a5ef7c8229f5 100644 --- a/lib/CodeGen/StackMapLivenessAnalysis.cpp +++ b/lib/CodeGen/StackMapLivenessAnalysis.cpp @@ -125,7 +125,7 @@ bool StackMapLiveness::calculateLiveness(MachineFunction &MF) { // For all basic blocks in the function. for (auto &MBB : MF) { DEBUG(dbgs() << "****** BB " << MBB.getName() << " ******\n"); - LiveRegs.init(TRI); + LiveRegs.init(*TRI); // FIXME: This should probably be addLiveOuts(). LiveRegs.addLiveOutsNoPristines(MBB); bool HasStackMap = false; diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp index f638b94a2a9e..48ab491b5be9 100644 --- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp +++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp @@ -560,7 +560,7 @@ void ARMLoadStoreOpt::moveLiveRegsBefore(const MachineBasicBlock &MBB, MachineBasicBlock::const_iterator Before) { // Initialize if we never queried in this block. if (!LiveRegsValid) { - LiveRegs.init(TRI); + LiveRegs.init(*TRI); LiveRegs.addLiveOuts(MBB); LiveRegPos = MBB.end(); LiveRegsValid = true; diff --git a/lib/Target/SystemZ/SystemZShortenInst.cpp b/lib/Target/SystemZ/SystemZShortenInst.cpp index 43f01b0b68a0..83882fc0310a 100644 --- a/lib/Target/SystemZ/SystemZShortenInst.cpp +++ b/lib/Target/SystemZ/SystemZShortenInst.cpp @@ -275,7 +275,7 @@ bool SystemZShortenInst::runOnMachineFunction(MachineFunction &F) { const SystemZSubtarget &ST = F.getSubtarget(); TII = ST.getInstrInfo(); TRI = ST.getRegisterInfo(); - LiveRegs.init(TRI); + LiveRegs.init(*TRI); bool Changed = false; for (auto &MBB : F) diff --git a/lib/Target/X86/X86FixupBWInsts.cpp b/lib/Target/X86/X86FixupBWInsts.cpp index 345181cca74b..8bde4bf98d66 100644 --- a/lib/Target/X86/X86FixupBWInsts.cpp +++ b/lib/Target/X86/X86FixupBWInsts.cpp @@ -154,7 +154,7 @@ bool FixupBWInstPass::runOnMachineFunction(MachineFunction &MF) { TII = MF.getSubtarget().getInstrInfo(); OptForSize = MF.getFunction()->optForSize(); MLI = &getAnalysis(); - LiveRegs.init(&TII->getRegisterInfo()); + LiveRegs.init(TII->getRegisterInfo()); DEBUG(dbgs() << "Start X86FixupBWInsts\n";);