Sort fields by size for memory layout and move them to the end of the class definition

Author: Amirhossein Pashaeehir

llvm/include/llvm/DWARFCFIChecker/DWARFCFIAnalysis.h

@@ -85,10 +85,10 @@ class DWARFCFIAnalysis {
                     const SmallSet<DWARFRegNum, 4> &Writes);
 
 private:
+  DWARFCFIState State;
   MCContext *Context;
   MCInstrInfo const &MCII;
   MCRegisterInfo const *MCRI;
-  DWARFCFIState State;
   bool IsEH;
 };
 

llvm/include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameAnalyzer.h

@@ -27,10 +27,6 @@ namespace llvm {
 /// finishes without being started or if all the frames are not finished before
 /// this classes is destructured, the program fails through an assertion.
 class CFIFunctionFrameAnalyzer : public CFIFunctionFrameReceiver {
-private:
-  std::vector<DWARFCFIAnalysis> UIAs;
-  MCInstrInfo const &MCII;
-
 public:
   CFIFunctionFrameAnalyzer(MCContext &Context, const MCInstrInfo &MCII)
       : CFIFunctionFrameReceiver(Context), MCII(MCII) {}
@@ -42,6 +38,10 @@ class CFIFunctionFrameAnalyzer : public CFIFunctionFrameReceiver {
   emitInstructionAndDirectives(const MCInst &Inst,
                                ArrayRef<MCCFIInstruction> Directives) override;
   void finishFunctionFrame() override;
+
+private:
+  MCInstrInfo const &MCII;
+  std::vector<DWARFCFIAnalysis> UIAs;
 };
 
 } // namespace llvm

llvm/include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameReceiver.h

@@ -27,9 +27,6 @@ class MCInst;
 /// function frames information gathered from an `MCStreamer` using a pointer to
 /// an instance of this class for the whole program.
 class CFIFunctionFrameReceiver {
-private:
-  MCContext &Context;
-
 public:
   CFIFunctionFrameReceiver(const CFIFunctionFrameReceiver &) = delete;
   CFIFunctionFrameReceiver &
@@ -47,6 +44,9 @@ class CFIFunctionFrameReceiver {
   emitInstructionAndDirectives(const MCInst &Inst,
                                ArrayRef<MCCFIInstruction> Directives) {}
   virtual void finishFunctionFrame() {}
+
+private:
+  MCContext &Context;
 };
 
 } // namespace llvm

llvm/include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameStreamer.h

@@ -30,10 +30,6 @@ namespace llvm {
 /// instructions and CFI directives that are between `.cfi_startproc` and
 /// `.cfi_endproc` directives.
 class CFIFunctionFrameStreamer : public MCStreamer {
-private:
-  std::pair<unsigned, unsigned> updateDirectivesRange();
-  void updateReceiver();
-
 public:
   CFIFunctionFrameStreamer(MCContext &Context,
                            std::unique_ptr<CFIFunctionFrameReceiver> Receiver)
@@ -64,6 +60,10 @@ class CFIFunctionFrameStreamer : public MCStreamer {
   void emitCFIStartProcImpl(MCDwarfFrameInfo &Frame) override;
   void emitCFIEndProcImpl(MCDwarfFrameInfo &CurFrame) override;
 
+private:
+  std::pair<unsigned, unsigned> updateDirectivesRange();
+  void updateReceiver();
+
 private:
   std::vector<unsigned> FrameIndices;
   std::optional<MCInst> LastInstruction;

llvm/include/llvm/DWARFCFIChecker/DWARFCFIState.h

@@ -37,12 +37,13 @@ class DWARFCFIState {
   /// to the user, and the directive is ignored, leaving the state unchanged.
   void update(const MCCFIInstruction &Directive);
 
+private:
+  dwarf::CFIProgram convert(MCCFIInstruction Directive);
+
 private:
   dwarf::UnwindRow Row;
   MCContext *Context;
   bool IsInitiated;
-
-  dwarf::CFIProgram convert(MCCFIInstruction Directive);
 };
 
 } // namespace llvm

llvm/lib/DWARFCFIChecker/DWARFCFIAnalysis.cpp

@@ -83,8 +83,8 @@ getUnwindRuleRegSet(const dwarf::UnwindRow &UnwindRow, DWARFRegNum Reg) {
 DWARFCFIAnalysis::DWARFCFIAnalysis(MCContext *Context, MCInstrInfo const &MCII,
                                    bool IsEH,
                                    ArrayRef<MCCFIInstruction> Prologue)
-    : Context(Context), MCII(MCII), MCRI(Context->getRegisterInfo()),
-      State(Context), IsEH(IsEH) {
+    : State(Context), Context(Context), MCII(MCII),
+      MCRI(Context->getRegisterInfo()), IsEH(IsEH) {
 
   for (auto LLVMReg : getTrackingRegs(MCRI)) {
     if (MCRI->get(LLVMReg).IsArtificial || MCRI->get(LLVMReg).IsConstant)