[llvm] 601b8a0 - GlobalISel: Move LegalizerHelper members around

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2020-06-10T13:56:53-04:00
New Revision: 601b8a0dc9cd43a0a4c8efb90ec8dc5f62b4a882

URL: https://github.com/llvm/llvm-project/commit/601b8a0dc9cd43a0a4c8efb90ec8dc5f62b4a882
DIFF: https://github.com/llvm/llvm-project/commit/601b8a0dc9cd43a0a4c8efb90ec8dc5f62b4a882.diff

LOG: GlobalISel: Move LegalizerHelper members around

MIRBuilder was in the middle of of a bunch of methods and not group
with the other member variables, which made it harder to see what
state this carries around. Move these to the top as is the usual
convention.

Added: 
    

Modified: 
    llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h b/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
index d3f2edaee286..c6b3a7af3951 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
@@ -34,6 +34,17 @@ class MachineRegisterInfo;
 class GISelChangeObserver;
 
 class LegalizerHelper {
+public:
+  /// Expose MIRBuilder so clients can set their own RecordInsertInstruction
+  /// functions
+  MachineIRBuilder &MIRBuilder;
+
+private:
+  MachineRegisterInfo &MRI;
+  const LegalizerInfo &LI;
+  /// To keep track of changes made by the LegalizerHelper.
+  GISelChangeObserver &Observer;
+
 public:
   enum LegalizeResult {
     /// Instruction was already legal and no change was made to the
@@ -48,6 +59,9 @@ class LegalizerHelper {
     UnableToLegalize,
   };
 
+  /// Expose LegalizerInfo so the clients can re-use.
+  const LegalizerInfo &getLegalizerInfo() const { return LI; }
+
   LegalizerHelper(MachineFunction &MF, GISelChangeObserver &Observer,
                   MachineIRBuilder &B);
   LegalizerHelper(MachineFunction &MF, const LegalizerInfo &LI,
@@ -91,13 +105,6 @@ class LegalizerHelper {
   LegalizeResult moreElementsVector(MachineInstr &MI, unsigned TypeIdx,
                                     LLT MoreTy);
 
-  /// Expose MIRBuilder so clients can set their own RecordInsertInstruction
-  /// functions
-  MachineIRBuilder &MIRBuilder;
-
-  /// Expose LegalizerInfo so the clients can re-use.
-  const LegalizerInfo &getLegalizerInfo() const { return LI; }
-
   /// Cast the given value to an LLT::scalar with an equivalent size. Returns
   /// the register to use if an instruction was inserted. Returns the original
   /// register if no coercion was necessary.
@@ -309,12 +316,6 @@ class LegalizerHelper {
   LegalizeResult lowerBswap(MachineInstr &MI);
   LegalizeResult lowerBitreverse(MachineInstr &MI);
   LegalizeResult lowerReadWriteRegister(MachineInstr &MI);
-
-private:
-  MachineRegisterInfo &MRI;
-  const LegalizerInfo &LI;
-  /// To keep track of changes made by the LegalizerHelper.
-  GISelChangeObserver &Observer;
 };
 
 /// Helper function that creates a libcall to the given \p Name using the given