Author: Daniel Hoekwater Date: 2024-10-04T10:32:49-04:00 New Revision: 92b4baaa5d8ce3aad74c070ae7f1bdc393fae751
URL: https://github.com/llvm/llvm-project/commit/92b4baaa5d8ce3aad74c070ae7f1bdc393fae751 DIFF: https://github.com/llvm/llvm-project/commit/92b4baaa5d8ce3aad74c070ae7f1bdc393fae751.diff LOG: Revert "[CFIFixup] Factor CFI remember/restore insertion into a helper (NFC) …" This reverts commit 47c8b95daeec8e6cb012344ed037024528a73295. Added: Modified: llvm/lib/CodeGen/CFIFixup.cpp Removed: ################################################################################ diff --git a/llvm/lib/CodeGen/CFIFixup.cpp b/llvm/lib/CodeGen/CFIFixup.cpp index e881a62522f0cb..61888a42666524 100644 --- a/llvm/lib/CodeGen/CFIFixup.cpp +++ b/llvm/lib/CodeGen/CFIFixup.cpp @@ -116,32 +116,6 @@ findPrologueEnd(MachineFunction &MF, MachineBasicBlock::iterator &PrologueEnd) { return nullptr; } -// Inserts a `.cfi_remember_state` instruction before PrologueEnd and a -// `.cfi_restore_state` instruction before DstInsertPt. Returns an iterator -// to the first instruction after the inserted `.cfi_restore_state` instruction. -static MachineBasicBlock::iterator -insertRememberRestorePair(MachineBasicBlock::iterator RememberInsertPt, - MachineBasicBlock::iterator RestoreInsertPt) { - MachineBasicBlock *RememberMBB = RememberInsertPt->getParent(); - MachineBasicBlock *RestoreMBB = RestoreInsertPt->getParent(); - MachineFunction &MF = *RememberMBB->getParent(); - const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo(); - - // Insert the `.cfi_remember_state` instruction. - unsigned CFIIndex = - MF.addFrameInst(MCCFIInstruction::createRememberState(nullptr)); - BuildMI(*RememberMBB, RememberInsertPt, DebugLoc(), - TII.get(TargetOpcode::CFI_INSTRUCTION)) - .addCFIIndex(CFIIndex); - - // Insert the `.cfi_restore_state` instruction. - CFIIndex = MF.addFrameInst(MCCFIInstruction::createRestoreState(nullptr)); - BuildMI(*RestoreMBB, RestoreInsertPt, DebugLoc(), - TII.get(TargetOpcode::CFI_INSTRUCTION)) - .addCFIIndex(CFIIndex); - return RestoreInsertPt; -} - bool CFIFixup::runOnMachineFunction(MachineFunction &MF) { const TargetFrameLowering &TFL = *MF.getSubtarget().getFrameLowering(); if (!TFL.enableCFIFixup(MF)) @@ -200,10 +174,12 @@ bool CFIFixup::runOnMachineFunction(MachineFunction &MF) { // Every block inherits the frame state (as recorded in the unwind tables) // of the previous block. If the intended frame state is diff erent, insert // compensating CFI instructions. + const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo(); bool Change = false; // `InsertPt` always points to the point in a preceding block where we have to // insert a `.cfi_remember_state`, in the case that the current block needs a // `.cfi_restore_state`. + MachineBasicBlock *InsertMBB = PrologueBlock; MachineBasicBlock::iterator InsertPt = PrologueEnd; assert(InsertPt != PrologueBlock->begin() && @@ -234,10 +210,20 @@ bool CFIFixup::runOnMachineFunction(MachineFunction &MF) { if (!Info.StrongNoFrameOnEntry && Info.HasFrameOnEntry && !HasFrame) { // Reset to the "after prologue" state. - // There's an earlier block known to have a stack frame. Insert a - // `.cfi_remember_state` instruction into that block and a - // `.cfi_restore_state` instruction at the beginning of the current block. - InsertPt = insertRememberRestorePair(InsertPt, CurrBB->begin()); + // Insert a `.cfi_remember_state` into the last block known to have a + // stack frame. + unsigned CFIIndex = + MF.addFrameInst(MCCFIInstruction::createRememberState(nullptr)); + BuildMI(*InsertMBB, InsertPt, DebugLoc(), + TII.get(TargetOpcode::CFI_INSTRUCTION)) + .addCFIIndex(CFIIndex); + // Insert a `.cfi_restore_state` at the beginning of the current block. + CFIIndex = MF.addFrameInst(MCCFIInstruction::createRestoreState(nullptr)); + InsertPt = BuildMI(*CurrBB, CurrBB->begin(), DebugLoc(), + TII.get(TargetOpcode::CFI_INSTRUCTION)) + .addCFIIndex(CFIIndex); + ++InsertPt; + InsertMBB = &*CurrBB; Change = true; } else if ((Info.StrongNoFrameOnEntry || !Info.HasFrameOnEntry) && HasFrame) { _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
