SmallString, std::optional, enum : uint8_t

Author: optimisan

llvm/include/llvm/CodeGen/MIRParser/MIParser.h

@@ -37,7 +37,7 @@ class TargetRegisterClass;
 class TargetSubtargetInfo;
 
 struct VRegInfo {
-  enum uint8_t {
+  enum : uint8_t {
     UNKNOWN, NORMAL, GENERIC, REGBANK
   } Kind = UNKNOWN;
   bool Explicit = false; ///< VReg was explicitly specified in the .mir file.
@@ -47,7 +47,7 @@ struct VRegInfo {
   } D;
   Register VReg;
   Register PreferredReg;
-  std::vector<::uint8_t> Flags;
+  std::vector<uint8_t> Flags;
 };
 
 using Name2RegClassMap = StringMap<const TargetRegisterClass *>;

llvm/include/llvm/CodeGen/TargetRegisterInfo.h

@@ -1214,11 +1214,11 @@ class TargetRegisterInfo : public MCRegisterInfo {
     return false;
   }
 
-  virtual std::pair<bool, uint8_t> getVRegFlagValue(StringRef Name) const {
-    return {false, 0};
+  virtual std::optional<uint8_t> getVRegFlagValue(StringRef Name) const {
+    return {};
   }
 
-  virtual SmallVector<std::string>
+  virtual SmallVector<SmallString<8>>
   getVRegFlagsOfReg(Register Reg, const MachineFunction &MF) const {
     return {};
   }

llvm/lib/CodeGen/MIRParser/MIParser.cpp

@@ -130,11 +130,10 @@ bool PerTargetMIParsingState::getRegisterByName(StringRef RegName,
 bool PerTargetMIParsingState::getVRegFlagValue(StringRef FlagName,
                                                uint8_t &FlagValue) const {
   const auto *TRI = Subtarget.getRegisterInfo();
-  assert(TRI && "Expected target register info");
-  auto [HasVReg, FV] = TRI->getVRegFlagValue(FlagName);
-  if (!HasVReg)
+  auto FV = TRI->getVRegFlagValue(FlagName);
+  if (!FV.has_value())
     return true;
-  FlagValue = FV;
+  FlagValue = FV.value();
   return false;
 }
 

llvm/lib/CodeGen/MIRPrinter.cpp

@@ -320,9 +320,9 @@ static void printRegFlags(Register Reg,
                           std::vector<yaml::FlowStringValue> &RegisterFlags,
                           const MachineFunction &MF,
                           const TargetRegisterInfo *TRI) {
-  SmallVector<std::string> FlagValues = TRI->getVRegFlagsOfReg(Reg, MF);
+  auto FlagValues = TRI->getVRegFlagsOfReg(Reg, MF);
   for (auto &Flag : FlagValues) {
-    RegisterFlags.push_back(yaml::FlowStringValue(Flag));
+    RegisterFlags.push_back(yaml::FlowStringValue(Flag.str().str()));
   }
 }