Flags was still a uint16 in a couple places

Author: amstrnad

llvm/include/llvm/CodeGen/MachineInstr.h

@@ -332,9 +332,9 @@ class MachineInstr
     Flags |= (MachineInstrFlags_t)Flag;
   }
 
-  void setFlags(unsigned flags) {
+  void setFlags(MachineInstrFlags_t flags) {
     // Filter out the automatically maintained flags.
-    unsigned Mask = BundledPred | BundledSucc;
+    MachineInstrFlags_t  Mask = BundledPred | BundledSucc;
     Flags = (Flags & Mask) | (flags & ~Mask);
   }
 
@@ -1648,7 +1648,7 @@ class MachineInstr
   /// not modify the MIFlags of this MachineInstr.
   MachineInstrFlags_t mergeFlagsWith(const MachineInstr& Other) const;
 
-  static uint16_t copyFlagsFromInstruction(const Instruction &I);
+  static MachineInstrFlags_t copyFlagsFromInstruction(const Instruction &I);
 
   /// Copy all flags to MachineInst MIFlags
   void copyIRFlags(const Instruction &I);

llvm/lib/CodeGen/MachineInstr.cpp

@@ -523,8 +523,8 @@ MachineInstrFlags_t MachineInstr::mergeFlagsWith(const MachineInstr &Other) cons
   return getFlags() | Other.getFlags();
 }
 
-uint16_t MachineInstr::copyFlagsFromInstruction(const Instruction &I) {
-  uint16_t MIFlags = 0;
+MachineInstrFlags_t MachineInstr::copyFlagsFromInstruction(const Instruction &I) {
+  MachineInstrFlags_t MIFlags = 0;
   // Copy the wrapping flags.
   if (const OverflowingBinaryOperator *OB =
           dyn_cast<OverflowingBinaryOperator>(&I)) {