Change eliminateCallFramePseudoInstr() to return an iterator

zmodem · zmodem · commit e1a2e90ffadd · 2016-03-31T18:33:38.000Z
This will become necessary in a subsequent change to make this method merge adjacent stack adjustments, i.e. it might erase the previous and/or next instruction. It also greatly simplifies the calls to this function from Prolog- EpilogInserter. Previously, that had a bunch of logic to resume iteration after the call; now it just continues with the returned iterator. Note that this changes the behaviour of PEI a little. Previously, it attempted to re-visit the new instruction created by eliminateCallFramePseudoInstr(). That code was added in r36625, but I can't see any reason for it: the new instructions will obviously not be pseudo instructions, they will not have FrameIndex operands, and we have already accounted for the stack adjustment. Differential Revision: http://reviews.llvm.org/D18627 llvm-svn: 265036
diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst
@@ -52,6 +52,10 @@ Non-comprehensive list of changes in this release
 * The C API function LLVMGetDataLayout is deprecated
   in favor of LLVMGetDataLayoutStr.
 
+* ``TargetFrameLowering::eliminateCallFramePseudoInstr`` now returns an
+  iterator to the next instruction instead of ``void``. Targets that previously
+  did ``MBB.erase(I); return;`` now probably want ``return MBB.erase(I);``.
+
 .. NOTE
    For small 1-3 sentence descriptions, just add an entry at the end of
    this list. If your description won't fit comfortably in one bullet
diff --git a/llvm/include/llvm/Target/TargetFrameLowering.h b/llvm/include/llvm/Target/TargetFrameLowering.h
@@ -273,14 +273,13 @@ class TargetFrameLowering {
     report_fatal_error("WinEH not implemented for this target");
   }
 
-  /// eliminateCallFramePseudoInstr - This method is called during prolog/epilog
-  /// code insertion to eliminate call frame setup and destroy pseudo
-  /// instructions (but only if the Target is using them).  It is responsible
-  /// for eliminating these instructions, replacing them with concrete
-  /// instructions.  This method need only be implemented if using call frame
-  /// setup/destroy pseudo instructions.
-  ///
-  virtual void
+  /// This method is called during prolog/epilog code insertion to eliminate
+  /// call frame setup and destroy pseudo instructions (but only if the Target
+  /// is using them).  It is responsible for eliminating these instructions,
+  /// replacing them with concrete instructions.  This method need only be
+  /// implemented if using call frame setup/destroy pseudo instructions.
+  /// Returns an iterator pointing to the instruction after the replaced one.
+  virtual MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF,
                                 MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator MI) const {
diff --git a/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/llvm/lib/CodeGen/PrologEpilogInserter.cpp
@@ -891,15 +891,7 @@ void PEI::replaceFrameIndices(MachineBasicBlock *BB, MachineFunction &Fn,
       InsideCallSequence = (I->getOpcode() == FrameSetupOpcode);
       SPAdj += TII.getSPAdjust(I);
 
-      MachineBasicBlock::iterator PrevI = BB->end();
-      if (I != BB->begin()) PrevI = std::prev(I);
-      TFI->eliminateCallFramePseudoInstr(Fn, *BB, I);
-
-      // Visit the instructions created by eliminateCallFramePseudoInstr().
-      if (PrevI == BB->end())
-        I = BB->begin();     // The replaced instr was the first in the block.
-      else
-        I = std::next(PrevI);
+      I = TFI->eliminateCallFramePseudoInstr(Fn, *BB, I);
       continue;
     }
 
diff --git a/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp b/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
@@ -153,7 +153,7 @@ AArch64FrameLowering::hasReservedCallFrame(const MachineFunction &MF) const {
   return !MF.getFrameInfo()->hasVarSizedObjects();
 }
 
-void AArch64FrameLowering::eliminateCallFramePseudoInstr(
+MachineBasicBlock::iterator AArch64FrameLowering::eliminateCallFramePseudoInstr(
     MachineFunction &MF, MachineBasicBlock &MBB,
     MachineBasicBlock::iterator I) const {
   const AArch64InstrInfo *TII =
@@ -196,7 +196,7 @@ void AArch64FrameLowering::eliminateCallFramePseudoInstr(
     emitFrameOffset(MBB, I, DL, AArch64::SP, AArch64::SP, -CalleePopAmount,
                     TII);
   }
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 void AArch64FrameLowering::emitCalleeSavedFrameMoves(
diff --git a/llvm/lib/Target/AArch64/AArch64FrameLowering.h b/llvm/lib/Target/AArch64/AArch64FrameLowering.h
@@ -27,9 +27,9 @@ class AArch64FrameLowering : public TargetFrameLowering {
   void emitCalleeSavedFrameMoves(MachineBasicBlock &MBB,
                                  MachineBasicBlock::iterator MBBI) const;
 
-  void eliminateCallFramePseudoInstr(MachineFunction &MF,
-                                  MachineBasicBlock &MBB,
-                                  MachineBasicBlock::iterator I) const override;
+  MachineBasicBlock::iterator
+  eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                                MachineBasicBlock::iterator I) const override;
 
   /// emitProlog/emitEpilog - These methods insert prolog and epilog code into
   /// the function.
diff --git a/llvm/lib/Target/ARM/ARMFrameLowering.cpp b/llvm/lib/Target/ARM/ARMFrameLowering.cpp
@@ -1726,10 +1726,9 @@ void ARMFrameLowering::determineCalleeSaves(MachineFunction &MF,
   }
 }
 
-
-void ARMFrameLowering::
-eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
-                              MachineBasicBlock::iterator I) const {
+MachineBasicBlock::iterator ARMFrameLowering::eliminateCallFramePseudoInstr(
+    MachineFunction &MF, MachineBasicBlock &MBB,
+    MachineBasicBlock::iterator I) const {
   const ARMBaseInstrInfo &TII =
       *static_cast<const ARMBaseInstrInfo *>(MF.getSubtarget().getInstrInfo());
   if (!hasReservedCallFrame(MF)) {
@@ -1769,7 +1768,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
       }
     }
   }
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 /// Get the minimum constant for ARM that is greater than or equal to the
diff --git a/llvm/lib/Target/ARM/ARMFrameLowering.h b/llvm/lib/Target/ARM/ARMFrameLowering.h
@@ -74,7 +74,7 @@ class ARMFrameLowering : public TargetFrameLowering {
                    bool(*Func)(unsigned, bool),
                    unsigned NumAlignedDPRCS2Regs) const;
 
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF,
                                 MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator MI) const override;
diff --git a/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp b/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp
@@ -49,7 +49,7 @@ emitSPUpdate(MachineBasicBlock &MBB,
 }
 
 
-void Thumb1FrameLowering::
+MachineBasicBlock::iterator Thumb1FrameLowering::
 eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                               MachineBasicBlock::iterator I) const {
   const Thumb1InstrInfo &TII =
@@ -80,7 +80,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
       }
     }
   }
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 void Thumb1FrameLowering::emitPrologue(MachineFunction &MF,
diff --git a/llvm/lib/Target/ARM/Thumb1FrameLowering.h b/llvm/lib/Target/ARM/Thumb1FrameLowering.h
@@ -41,7 +41,7 @@ class Thumb1FrameLowering : public ARMFrameLowering {
 
   bool hasReservedCallFrame(const MachineFunction &MF) const override;
 
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF,
                                 MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator MI) const override;
diff --git a/llvm/lib/Target/BPF/BPFFrameLowering.h b/llvm/lib/Target/BPF/BPFFrameLowering.h
@@ -31,10 +31,10 @@ class BPFFrameLowering : public TargetFrameLowering {
   void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs,
                             RegScavenger *RS) const override;
 
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator MI) const override {
-    MBB.erase(MI);
+    return MBB.erase(MI);
   }
 };
 }
diff --git a/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp b/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp
@@ -1060,15 +1060,15 @@ bool HexagonFrameLowering::insertCSRRestoresInBlock(MachineBasicBlock &MBB,
   return true;
 }
 
-
-void HexagonFrameLowering::eliminateCallFramePseudoInstr(MachineFunction &MF,
-      MachineBasicBlock &MBB, MachineBasicBlock::iterator I) const {
+MachineBasicBlock::iterator HexagonFrameLowering::eliminateCallFramePseudoInstr(
+    MachineFunction &MF, MachineBasicBlock &MBB,
+    MachineBasicBlock::iterator I) const {
   MachineInstr &MI = *I;
   unsigned Opc = MI.getOpcode();
   (void)Opc; // Silence compiler warning.
   assert((Opc == Hexagon::ADJCALLSTACKDOWN || Opc == Hexagon::ADJCALLSTACKUP) &&
          "Cannot handle this call frame pseudo instruction");
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 
diff --git a/llvm/lib/Target/Hexagon/HexagonFrameLowering.h b/llvm/lib/Target/Hexagon/HexagonFrameLowering.h
@@ -42,8 +42,9 @@ class HexagonFrameLowering : public TargetFrameLowering {
     return true;
   }
 
-  void eliminateCallFramePseudoInstr(MachineFunction &MF,
-      MachineBasicBlock &MBB, MachineBasicBlock::iterator I) const override;
+  MachineBasicBlock::iterator
+  eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                                MachineBasicBlock::iterator I) const override;
   void processFunctionBeforeFrameFinalized(MachineFunction &MF,
       RegScavenger *RS = nullptr) const override;
   void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs,
diff --git a/llvm/lib/Target/Lanai/LanaiFrameLowering.cpp b/llvm/lib/Target/Lanai/LanaiFrameLowering.cpp
@@ -139,11 +139,11 @@ void LanaiFrameLowering::emitPrologue(MachineFunction &MF,
     replaceAdjDynAllocPseudo(MF);
 }
 
-void LanaiFrameLowering::eliminateCallFramePseudoInstr(
+MachineBasicBlock::iterator LanaiFrameLowering::eliminateCallFramePseudoInstr(
     MachineFunction &MF, MachineBasicBlock &MBB,
     MachineBasicBlock::iterator I) const {
   // Discard ADJCALLSTACKDOWN, ADJCALLSTACKUP instructions.
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 // The function epilogue should not depend on the current stack pointer!
diff --git a/llvm/lib/Target/Lanai/LanaiFrameLowering.h b/llvm/lib/Target/Lanai/LanaiFrameLowering.h
@@ -42,7 +42,7 @@ class LanaiFrameLowering : public TargetFrameLowering {
   void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
   void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
 
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator I) const override;
 
diff --git a/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp b/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp
@@ -224,9 +224,9 @@ MSP430FrameLowering::restoreCalleeSavedRegisters(MachineBasicBlock &MBB,
   return true;
 }
 
-void MSP430FrameLowering::
-eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
-                              MachineBasicBlock::iterator I) const {
+MachineBasicBlock::iterator MSP430FrameLowering::eliminateCallFramePseudoInstr(
+    MachineFunction &MF, MachineBasicBlock &MBB,
+    MachineBasicBlock::iterator I) const {
   const MSP430InstrInfo &TII =
       *static_cast<const MSP430InstrInfo *>(MF.getSubtarget().getInstrInfo());
   unsigned StackAlign = getStackAlignment();
@@ -283,7 +283,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
     }
   }
 
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 void
diff --git a/llvm/lib/Target/MSP430/MSP430FrameLowering.h b/llvm/lib/Target/MSP430/MSP430FrameLowering.h
@@ -30,9 +30,9 @@ class MSP430FrameLowering : public TargetFrameLowering {
   void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
   void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
 
-  void eliminateCallFramePseudoInstr(MachineFunction &MF,
-                                  MachineBasicBlock &MBB,
-                                  MachineBasicBlock::iterator I) const override;
+  MachineBasicBlock::iterator
+  eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                                MachineBasicBlock::iterator I) const override;
 
   bool spillCalleeSavedRegisters(MachineBasicBlock &MBB,
                                  MachineBasicBlock::iterator MI,
diff --git a/llvm/lib/Target/Mips/MipsFrameLowering.cpp b/llvm/lib/Target/Mips/MipsFrameLowering.cpp
@@ -143,7 +143,7 @@ uint64_t MipsFrameLowering::estimateStackSize(const MachineFunction &MF) const {
 }
 
 // Eliminate ADJCALLSTACKDOWN, ADJCALLSTACKUP pseudo instructions
-void MipsFrameLowering::
+MachineBasicBlock::iterator MipsFrameLowering::
 eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                               MachineBasicBlock::iterator I) const {
   unsigned SP = STI.getABI().IsN64() ? Mips::SP_64 : Mips::SP;
@@ -156,5 +156,5 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
     STI.getInstrInfo()->adjustStackPtr(SP, Amount, MBB, I);
   }
 
-  MBB.erase(I);
+  return MBB.erase(I);
 }
diff --git a/llvm/lib/Target/Mips/MipsFrameLowering.h b/llvm/lib/Target/Mips/MipsFrameLowering.h
@@ -36,7 +36,7 @@ class MipsFrameLowering : public TargetFrameLowering {
 
   bool isFPCloseToIncomingSP() const override { return false; }
 
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF,
                                 MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator I) const override;
diff --git a/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp b/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp
@@ -70,10 +70,10 @@ void NVPTXFrameLowering::emitEpilogue(MachineFunction &MF,
 
 // This function eliminates ADJCALLSTACKDOWN,
 // ADJCALLSTACKUP pseudo instructions
-void NVPTXFrameLowering::eliminateCallFramePseudoInstr(
+MachineBasicBlock::iterator NVPTXFrameLowering::eliminateCallFramePseudoInstr(
     MachineFunction &MF, MachineBasicBlock &MBB,
     MachineBasicBlock::iterator I) const {
   // Simply discard ADJCALLSTACKDOWN,
   // ADJCALLSTACKUP instructions.
-  MBB.erase(I);
+  return MBB.erase(I);
 }
diff --git a/llvm/lib/Target/NVPTX/NVPTXFrameLowering.h b/llvm/lib/Target/NVPTX/NVPTXFrameLowering.h
@@ -26,7 +26,7 @@ class NVPTXFrameLowering : public TargetFrameLowering {
   void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
   void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
 
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator I) const override;
 };
diff --git a/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp b/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
@@ -1770,7 +1770,7 @@ restoreCRs(bool isPPC64, bool is31,
                .addReg(MoveReg, getKillRegState(true)));
 }
 
-void PPCFrameLowering::
+MachineBasicBlock::iterator PPCFrameLowering::
 eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                               MachineBasicBlock::iterator I) const {
   const TargetInstrInfo &TII = *Subtarget.getInstrInfo();
@@ -1807,7 +1807,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
     }
   }
   // Simply discard ADJCALLSTACKDOWN, ADJCALLSTACKUP instructions.
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 bool
diff --git a/llvm/lib/Target/PowerPC/PPCFrameLowering.h b/llvm/lib/Target/PowerPC/PPCFrameLowering.h
@@ -93,9 +93,9 @@ class PPCFrameLowering: public TargetFrameLowering {
                                  const std::vector<CalleeSavedInfo> &CSI,
                                  const TargetRegisterInfo *TRI) const override;
 
-  void eliminateCallFramePseudoInstr(MachineFunction &MF,
-                                  MachineBasicBlock &MBB,
-                                  MachineBasicBlock::iterator I) const override;
+  MachineBasicBlock::iterator
+  eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                                MachineBasicBlock::iterator I) const override;
 
   bool restoreCalleeSavedRegisters(MachineBasicBlock &MBB,
                                   MachineBasicBlock::iterator MI,
diff --git a/llvm/lib/Target/Sparc/SparcFrameLowering.cpp b/llvm/lib/Target/Sparc/SparcFrameLowering.cpp
@@ -183,7 +183,7 @@ void SparcFrameLowering::emitPrologue(MachineFunction &MF,
   }
 }
 
-void SparcFrameLowering::
+MachineBasicBlock::iterator SparcFrameLowering::
 eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                               MachineBasicBlock::iterator I) const {
   if (!hasReservedCallFrame(MF)) {
@@ -195,7 +195,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
     if (Size)
       emitSPAdjustment(MF, MBB, I, Size, SP::ADDrr, SP::ADDri);
   }
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 
diff --git a/llvm/lib/Target/Sparc/SparcFrameLowering.h b/llvm/lib/Target/Sparc/SparcFrameLowering.h
@@ -29,7 +29,7 @@ class SparcFrameLowering : public TargetFrameLowering {
   void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
   void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
 
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF,
                                 MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator I) const override;
diff --git a/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp b/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp
@@ -511,7 +511,7 @@ SystemZFrameLowering::hasReservedCallFrame(const MachineFunction &MF) const {
   return true;
 }
 
-void SystemZFrameLowering::
+MachineBasicBlock::iterator SystemZFrameLowering::
 eliminateCallFramePseudoInstr(MachineFunction &MF,
                               MachineBasicBlock &MBB,
                               MachineBasicBlock::iterator MI) const {
@@ -520,7 +520,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF,
   case SystemZ::ADJCALLSTACKUP:
     assert(hasReservedCallFrame(MF) &&
            "ADJSTACKDOWN and ADJSTACKUP should be no-ops");
-    MBB.erase(MI);
+    return MBB.erase(MI);
     break;
 
   default:
diff --git a/llvm/lib/Target/SystemZ/SystemZFrameLowering.h b/llvm/lib/Target/SystemZ/SystemZFrameLowering.h
@@ -46,10 +46,9 @@ class SystemZFrameLowering : public TargetFrameLowering {
   int getFrameIndexReference(const MachineFunction &MF, int FI,
                              unsigned &FrameReg) const override;
   bool hasReservedCallFrame(const MachineFunction &MF) const override;
-  void eliminateCallFramePseudoInstr(MachineFunction &MF,
-                                     MachineBasicBlock &MBB,
-                                     MachineBasicBlock::iterator MI) const
-    override;
+  MachineBasicBlock::iterator
+  eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                                MachineBasicBlock::iterator MI) const override;
 
   // Return the number of bytes in the callee-allocated part of the frame.
   uint64_t getAllocatedStackSize(const MachineFunction &MF) const;
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.cpp
@@ -100,7 +100,8 @@ static void writeSPToMemory(unsigned SrcReg, MachineFunction &MF,
   MF.getInfo<WebAssemblyFunctionInfo>()->stackifyVReg(SPAddr);
 }
 
-void WebAssemblyFrameLowering::eliminateCallFramePseudoInstr(
+MachineBasicBlock::iterator
+WebAssemblyFrameLowering::eliminateCallFramePseudoInstr(
     MachineFunction &MF, MachineBasicBlock &MBB,
     MachineBasicBlock::iterator I) const {
   assert(!I->getOperand(0).getImm() && hasFP(MF) &&
@@ -111,7 +112,7 @@ void WebAssemblyFrameLowering::eliminateCallFramePseudoInstr(
     DebugLoc DL = I->getDebugLoc();
     writeSPToMemory(WebAssembly::SP32, MF, MBB, I, I, DL);
   }
-  MBB.erase(I);
+  return MBB.erase(I);
 }
 
 void WebAssemblyFrameLowering::emitPrologue(MachineFunction &MF,
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h b/llvm/lib/Target/WebAssembly/WebAssemblyFrameLowering.h
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyPEI.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyPEI.cpp
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp
diff --git a/llvm/lib/Target/X86/X86FrameLowering.h b/llvm/lib/Target/X86/X86FrameLowering.h
diff --git a/llvm/lib/Target/XCore/XCoreFrameLowering.cpp b/llvm/lib/Target/XCore/XCoreFrameLowering.cpp
diff --git a/llvm/lib/Target/XCore/XCoreFrameLowering.h b/llvm/lib/Target/XCore/XCoreFrameLowering.h

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ AArch64FrameLowering::hasReservedCallFrame(const MachineFunction &MF) const {`
`153`	`153`	`return !MF.getFrameInfo()->hasVarSizedObjects();`
`154`	`154`	`}`
`155`	`155`
`156`		`-void AArch64FrameLowering::eliminateCallFramePseudoInstr(`
	`156`	`+MachineBasicBlock::iterator AArch64FrameLowering::eliminateCallFramePseudoInstr(`
`157`	`157`	`MachineFunction &MF, MachineBasicBlock &MBB,`
`158`	`158`	`MachineBasicBlock::iterator I) const {`
`159`	`159`	`const AArch64InstrInfo *TII =`
`@@ -196,7 +196,7 @@ void AArch64FrameLowering::eliminateCallFramePseudoInstr(`
`196`	`196`	`emitFrameOffset(MBB, I, DL, AArch64::SP, AArch64::SP, -CalleePopAmount,`
`197`	`197`	`TII);`
`198`	`198`	`}`
`199`		`- MBB.erase(I);`
	`199`	`+ return MBB.erase(I);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`void AArch64FrameLowering::emitCalleeSavedFrameMoves(`
Original file line number	Diff line number	Diff line change
`@@ -1726,10 +1726,9 @@ void ARMFrameLowering::determineCalleeSaves(MachineFunction &MF,`
`1726`	`1726`	`}`
`1727`	`1727`	`}`
`1728`	`1728`
`1729`		`-`
`1730`		`-void ARMFrameLowering::`
`1731`		`-eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`1732`		`- MachineBasicBlock::iterator I) const {`
	`1729`	`+MachineBasicBlock::iterator ARMFrameLowering::eliminateCallFramePseudoInstr(`
	`1730`	`+ MachineFunction &MF, MachineBasicBlock &MBB,`
	`1731`	`+ MachineBasicBlock::iterator I) const {`
`1733`	`1732`	`const ARMBaseInstrInfo &TII =`
`1734`	`1733`	`static_cast<const ARMBaseInstrInfo >(MF.getSubtarget().getInstrInfo());`
`1735`	`1734`	`if (!hasReservedCallFrame(MF)) {`
`@@ -1769,7 +1768,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`1769`	`1768`	`}`
`1770`	`1769`	`}`
`1771`	`1770`	`}`
`1772`		`- MBB.erase(I);`
	`1771`	`+ return MBB.erase(I);`
`1773`	`1772`	`}`
`1774`	`1773`
`1775`	`1774`	`/// Get the minimum constant for ARM that is greater than or equal to the`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ emitSPUpdate(MachineBasicBlock &MBB,`
`49`	`49`	`}`
`50`	`50`
`51`	`51`
`52`		`-void Thumb1FrameLowering::`
	`52`	`+MachineBasicBlock::iterator Thumb1FrameLowering::`
`53`	`53`	`eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`54`	`54`	`MachineBasicBlock::iterator I) const {`
`55`	`55`	`const Thumb1InstrInfo &TII =`
`@@ -80,7 +80,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
`83`		`- MBB.erase(I);`
	`83`	`+ return MBB.erase(I);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`void Thumb1FrameLowering::emitPrologue(MachineFunction &MF,`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ class BPFFrameLowering : public TargetFrameLowering {`
`31`	`31`	`void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs,`
`32`	`32`	`RegScavenger *RS) const override;`
`33`	`33`
`34`		`- void`
	`34`	`+ MachineBasicBlock::iterator`
`35`	`35`	`eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`36`	`36`	`MachineBasicBlock::iterator MI) const override {`
`37`		`- MBB.erase(MI);`
	`37`	`+ return MBB.erase(MI);`
`38`	`38`	`}`
`39`	`39`	`};`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,11 +139,11 @@ void LanaiFrameLowering::emitPrologue(MachineFunction &MF,`
`139`	`139`	`replaceAdjDynAllocPseudo(MF);`
`140`	`140`	`}`
`141`	`141`
`142`		`-void LanaiFrameLowering::eliminateCallFramePseudoInstr(`
	`142`	`+MachineBasicBlock::iterator LanaiFrameLowering::eliminateCallFramePseudoInstr(`
`143`	`143`	`MachineFunction &MF, MachineBasicBlock &MBB,`
`144`	`144`	`MachineBasicBlock::iterator I) const {`
`145`	`145`	`// Discard ADJCALLSTACKDOWN, ADJCALLSTACKUP instructions.`
`146`		`- MBB.erase(I);`
	`146`	`+ return MBB.erase(I);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`// The function epilogue should not depend on the current stack pointer!`
Original file line number	Diff line number	Diff line change
`@@ -224,9 +224,9 @@ MSP430FrameLowering::restoreCalleeSavedRegisters(MachineBasicBlock &MBB,`
`224`	`224`	`return true;`
`225`	`225`	`}`
`226`	`226`
`227`		`-void MSP430FrameLowering::`
`228`		`-eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`229`		`- MachineBasicBlock::iterator I) const {`
	`227`	`+MachineBasicBlock::iterator MSP430FrameLowering::eliminateCallFramePseudoInstr(`
	`228`	`+ MachineFunction &MF, MachineBasicBlock &MBB,`
	`229`	`+ MachineBasicBlock::iterator I) const {`
`230`	`230`	`const MSP430InstrInfo &TII =`
`231`	`231`	`static_cast<const MSP430InstrInfo >(MF.getSubtarget().getInstrInfo());`
`232`	`232`	`unsigned StackAlign = getStackAlignment();`
`@@ -283,7 +283,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`286`		`- MBB.erase(I);`
	`286`	`+ return MBB.erase(I);`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`void`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ uint64_t MipsFrameLowering::estimateStackSize(const MachineFunction &MF) const {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`// Eliminate ADJCALLSTACKDOWN, ADJCALLSTACKUP pseudo instructions`
`146`		`-void MipsFrameLowering::`
	`146`	`+MachineBasicBlock::iterator MipsFrameLowering::`
`147`	`147`	`eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`148`	`148`	`MachineBasicBlock::iterator I) const {`
`149`	`149`	`unsigned SP = STI.getABI().IsN64() ? Mips::SP_64 : Mips::SP;`
`@@ -156,5 +156,5 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`156`	`156`	`STI.getInstrInfo()->adjustStackPtr(SP, Amount, MBB, I);`
`157`	`157`	`}`
`158`	`158`
`159`		`- MBB.erase(I);`
	`159`	`+ return MBB.erase(I);`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1770,7 +1770,7 @@ restoreCRs(bool isPPC64, bool is31,`
`1770`	`1770`	`.addReg(MoveReg, getKillRegState(true)));`
`1771`	`1771`	`}`
`1772`	`1772`
`1773`		`-void PPCFrameLowering::`
	`1773`	`+MachineBasicBlock::iterator PPCFrameLowering::`
`1774`	`1774`	`eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`1775`	`1775`	`MachineBasicBlock::iterator I) const {`
`1776`	`1776`	`const TargetInstrInfo &TII = *Subtarget.getInstrInfo();`
`@@ -1807,7 +1807,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`1807`	`1807`	`}`
`1808`	`1808`	`}`
`1809`	`1809`	`// Simply discard ADJCALLSTACKDOWN, ADJCALLSTACKUP instructions.`
`1810`		`- MBB.erase(I);`
	`1810`	`+ return MBB.erase(I);`
`1811`	`1811`	`}`
`1812`	`1812`
`1813`	`1813`	`bool`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ void SparcFrameLowering::emitPrologue(MachineFunction &MF,`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
`186`		`-void SparcFrameLowering::`
	`186`	`+MachineBasicBlock::iterator SparcFrameLowering::`
`187`	`187`	`eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`188`	`188`	`MachineBasicBlock::iterator I) const {`
`189`	`189`	`if (!hasReservedCallFrame(MF)) {`
`@@ -195,7 +195,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,`
`195`	`195`	`if (Size)`
`196`	`196`	`emitSPAdjustment(MF, MBB, I, Size, SP::ADDrr, SP::ADDri);`
`197`	`197`	`}`
`198`		`- MBB.erase(I);`
	`198`	`+ return MBB.erase(I);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ static void writeSPToMemory(unsigned SrcReg, MachineFunction &MF,`
`100`	`100`	`MF.getInfo<WebAssemblyFunctionInfo>()->stackifyVReg(SPAddr);`
`101`	`101`	`}`
`102`	`102`
`103`		`-void WebAssemblyFrameLowering::eliminateCallFramePseudoInstr(`
	`103`	`+MachineBasicBlock::iterator`
	`104`	`+WebAssemblyFrameLowering::eliminateCallFramePseudoInstr(`
`104`	`105`	`MachineFunction &MF, MachineBasicBlock &MBB,`
`105`	`106`	`MachineBasicBlock::iterator I) const {`
`106`	`107`	`assert(!I->getOperand(0).getImm() && hasFP(MF) &&`
`@@ -111,7 +112,7 @@ void WebAssemblyFrameLowering::eliminateCallFramePseudoInstr(`
`111`	`112`	`DebugLoc DL = I->getDebugLoc();`
`112`	`113`	`writeSPToMemory(WebAssembly::SP32, MF, MBB, I, I, DL);`
`113`	`114`	`}`
`114`		`- MBB.erase(I);`
	`115`	`+ return MBB.erase(I);`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`void WebAssemblyFrameLowering::emitPrologue(MachineFunction &MF,`