@@ -715,37 +715,32 @@ void AArch64PrologueEmitter::emitPrologue() {
715715 StackOffset SVECalleeSavesSize = PPRCalleeSavesSize + ZPRCalleeSavesSize;
716716 StackOffset PPRLocalsSize = AFL.getPPRStackSize (MF) - PPRCalleeSavesSize;
717717 StackOffset ZPRLocalsSize = AFL.getZPRStackSize (MF) - ZPRCalleeSavesSize;
718- std::optional<MachineBasicBlock::iterator> ZPRCalleeSavesBegin,
719- ZPRCalleeSavesEnd, PPRCalleeSavesBegin, PPRCalleeSavesEnd;
720718
721719 StackOffset CFAOffset =
722720 StackOffset::getFixed ((int64_t )MFI.getStackSize () - NumBytes);
723721 MachineBasicBlock::iterator AfterSVESavesI = AfterGPRSavesI;
724722 if (!FPAfterSVECalleeSaves) {
725723 // Process the SVE callee-saves to find the starts/ends of the ZPR and PPR
726724 // areas.
727- PPRCalleeSavesBegin = AfterGPRSavesI;
728725 if (PPRCalleeSavesSize) {
729726 LLVM_DEBUG (dbgs () << " PPRCalleeSavedStackSize = "
730727 << PPRCalleeSavesSize.getScalable () << " \n " );
731728
732- assert (isPartOfPPRCalleeSaves (*PPRCalleeSavesBegin ) &&
729+ assert (isPartOfPPRCalleeSaves (AfterSVESavesI ) &&
733730 " Unexpected instruction" );
734731 while (isPartOfPPRCalleeSaves (AfterSVESavesI) &&
735732 AfterSVESavesI != MBB.getFirstTerminator ())
736733 ++AfterSVESavesI;
737734 }
738- PPRCalleeSavesEnd = ZPRCalleeSavesBegin = AfterSVESavesI;
739735 if (ZPRCalleeSavesSize) {
740736 LLVM_DEBUG (dbgs () << " ZPRCalleeSavedStackSize = "
741737 << ZPRCalleeSavesSize.getScalable () << " \n " );
742- assert (isPartOfZPRCalleeSaves (*ZPRCalleeSavesBegin ) &&
738+ assert (isPartOfZPRCalleeSaves (AfterSVESavesI ) &&
743739 " Unexpected instruction" );
744740 while (isPartOfZPRCalleeSaves (AfterSVESavesI) &&
745741 AfterSVESavesI != MBB.getFirstTerminator ())
746742 ++AfterSVESavesI;
747743 }
748- ZPRCalleeSavesEnd = AfterSVESavesI;
749744 }
750745
751746 if (EmitAsyncCFI)
0 commit comments