Move common flags

Author: MacDue

llvm/lib/Target/AArch64/AArch64PrologueEpilogue.cpp

@@ -1219,6 +1219,7 @@ AArch64EpilogueEmitter::AArch64EpilogueEmitter(MachineFunction &MF,
                                                const AArch64FrameLowering &AFL)
     : AArch64PrologueEpilogueCommon(MF, MBB, AFL) {
   EmitCFI = AFI->needsAsyncDwarfUnwindInfo(MF);
+  HomPrologEpilog = AFL.homogeneousPrologEpilog(MF, &MBB);
   SEHEpilogueStartI = MBB.end();
 }
 
@@ -1253,7 +1254,7 @@ void AArch64EpilogueEmitter::emitEpilogue() {
   if (MF.hasEHFunclets())
     AFI->setLocalStackSize(NumBytes - PrologueSaveSize);
 
-  if (AFL.homogeneousPrologEpilog(MF, &MBB)) {
+  if (HomPrologEpilog) {
     assert(!NeedsWinCFI);
     auto FirstHomogenousEpilogI = MBB.getFirstTerminator();
     if (FirstHomogenousEpilogI != MBB.begin()) {

llvm/lib/Target/AArch64/AArch64PrologueEpilogue.h

@@ -61,8 +61,13 @@ class AArch64PrologueEpilogueCommon {
   const AArch64FrameLowering &AFL;
   const AArch64RegisterInfo &RegInfo;
 
+  // Common flags. These generally should not change outside of the (possibly
+  // derived) constructor.
   bool HasFP = false;
-  bool NeedsWinCFI = false;
+  bool EmitCFI = false;     // Note: Set in derived constructors.
+  bool IsFunclet = false;   // Note: Set in derived constructors.
+  bool NeedsWinCFI = false; // Note: Can be changed in emitFramePointerSetup.
+  bool HomPrologEpilog = false; // Note: Set in derived constructors.
 
   // Note: "HasWinCFI" is mutable as it can change in any "emit" function.
   mutable bool HasWinCFI = false;
@@ -132,14 +137,9 @@ class AArch64PrologueEmitter final : public AArch64PrologueEpilogueCommon {
 #endif
 
   // Prologue flags. These generally should not change outside of the
-  // constructor. Two exceptions are "CombineSPBump" which is set in
-  // determineLocalsStackSize, and "NeedsWinCFI" which is set in
-  // emitFramePointerSetup.
-  bool EmitCFI = false;
+  // constructor.
   bool EmitAsyncCFI = false;
-  bool IsFunclet = false;
-  bool CombineSPBump = false;
-  bool HomPrologEpilog = false;
+  bool CombineSPBump = false; // Note: This is set in determineLocalsStackSize.
 };
 
 /// A helper class for emitting the epilogue. Substantial new functionality
@@ -178,13 +178,8 @@ class AArch64EpilogueEmitter final : public AArch64PrologueEpilogueCommon {
 
   void finalizeEpilogue() const;
 
-  // Epilogue flags. These generally should not change outside of the
-  // constructor (or early in emitEpilogue).
-  bool EmitCFI = false;
-  bool IsFunclet = false;
-
-  DebugLoc DL;
   MachineBasicBlock::iterator SEHEpilogueStartI;
+  DebugLoc DL;
 };
 
 } // namespace llvm