diff options
Diffstat (limited to 'llvm/lib/Target/MSP430/MSP430FrameLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/MSP430/MSP430FrameLowering.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp b/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp index 76d6e8a324ae..bc24b3239b43 100644 --- a/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp +++ b/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp @@ -14,6 +14,7 @@ #include "MSP430InstrInfo.h" #include "MSP430MachineFunctionInfo.h" #include "MSP430Subtarget.h" +#include "llvm/CodeGen/CFIInstBuilder.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineInstrBuilder.h" @@ -64,7 +65,7 @@ void MSP430FrameLowering::emitCalleeSavedFrameMoves( // Calculate offsets. for (const CalleeSavedInfo &I : CSI) { int64_t Offset = MFI.getObjectOffset(I.getFrameIdx()); - Register Reg = I.getReg(); + MCRegister Reg = I.getReg(); unsigned DwarfReg = MRI->getDwarfRegNum(Reg, true); if (IsPrologue) { @@ -324,7 +325,7 @@ bool MSP430FrameLowering::spillCalleeSavedRegisters( MFI->setCalleeSavedFrameSize(CSI.size() * 2); for (const CalleeSavedInfo &I : CSI) { - Register Reg = I.getReg(); + MCRegister Reg = I.getReg(); // Add the callee-saved register as live-in. It's killed at the spill. MBB.addLiveIn(Reg); BuildMI(MBB, MI, DL, TII.get(MSP430::PUSH16r)) @@ -406,9 +407,8 @@ MachineBasicBlock::iterator MSP430FrameLowering::eliminateCallFramePseudoInstr( .addReg(MSP430::SP) .addImm(CalleeAmt); if (!hasFP(MF)) { - DebugLoc DL = I->getDebugLoc(); - BuildCFI(MBB, I, DL, - MCCFIInstruction::createAdjustCfaOffset(nullptr, CalleeAmt)); + CFIInstBuilder(MBB, I, MachineInstr::NoFlags) + .buildAdjustCFAOffset(CalleeAmt); } // The SRW implicit def is dead. New->getOperand(3).setIsDead(); |