Commit 186dd631 authored by Benjamin Kramer's avatar Benjamin Kramer
Browse files

ArrayRef'ize restoreCalleeSavedRegisters. NFCI. 

restoreCalleeSavedRegisters can mutate the contents of the
CalleeSavedInfos, so use a MutableArrayRef.
parent d1536673

llvm/include/llvm/CodeGen/TargetFrameLowering.h

+5 −4
Original line number Diff line number Diff line
@@ -224,9 +224,10 @@ public: 
  /// If it returns true, and any of the registers in CSI is not restored,

  /// it sets the corresponding Restored flag in CSI to false.

  /// Returns false otherwise.

  virtual bool restoreCalleeSavedRegisters(MachineBasicBlock &MBB,

  virtual bool

  restoreCalleeSavedRegisters(MachineBasicBlock &MBB,

                              MachineBasicBlock::iterator MI,

                                           std::vector<CalleeSavedInfo> &CSI,

                              MutableArrayRef<CalleeSavedInfo> CSI,

                              const TargetRegisterInfo *TRI) const {

    return false;

  }

llvm/lib/Target/AArch64/AArch64FrameLowering.cpp

+1 −2
Original line number Diff line number Diff line
@@ -2257,8 +2257,7 @@ bool AArch64FrameLowering::spillCalleeSavedRegisters( 


bool AArch64FrameLowering::restoreCalleeSavedRegisters(

    MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,

    std::vector<CalleeSavedInfo> &CSI,

    const TargetRegisterInfo *TRI) const {

    MutableArrayRef<CalleeSavedInfo> CSI, const TargetRegisterInfo *TRI) const {

  MachineFunction &MF = *MBB.getParent();

  const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo();

  DebugLoc DL;

llvm/lib/Target/AArch64/AArch64FrameLowering.h

+5 −4
Original line number Diff line number Diff line
@@ -52,9 +52,10 @@ public: 
                                 ArrayRef<CalleeSavedInfo> CSI,

                                 const TargetRegisterInfo *TRI) const override;



  bool restoreCalleeSavedRegisters(MachineBasicBlock &MBB,

  bool

  restoreCalleeSavedRegisters(MachineBasicBlock &MBB,

                              MachineBasicBlock::iterator MI,

                                  std::vector<CalleeSavedInfo> &CSI,

                              MutableArrayRef<CalleeSavedInfo> CSI,

                              const TargetRegisterInfo *TRI) const override;



  /// Can this function use the red zone for local allocations.

llvm/lib/Target/AMDGPU/SILowerSGPRSpills.cpp

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void insertCSRSaves(MachineBasicBlock &SaveBlock, 


/// Insert restore code for the callee-saved registers used in the function.

static void insertCSRRestores(MachineBasicBlock &RestoreBlock,

                              std::vector<CalleeSavedInfo> &CSI,

                              MutableArrayRef<CalleeSavedInfo> CSI,

                              LiveIntervals *LIS) {

  MachineFunction &MF = *RestoreBlock.getParent();

  const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo();

llvm/lib/Target/ARC/ARCFrameLowering.cpp

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ bool ARCFrameLowering::spillCalleeSavedRegisters( 


bool ARCFrameLowering::restoreCalleeSavedRegisters(

    MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,

    std::vector<CalleeSavedInfo> &CSI, const TargetRegisterInfo *TRI) const {

    MutableArrayRef<CalleeSavedInfo> CSI, const TargetRegisterInfo *TRI) const {

  LLVM_DEBUG(dbgs() << "Restore callee saved registers: "

                    << MBB.getParent()->getName() << "\n");

  // There are routines for saving at least 3 registers (r13 to r15, etc.)