[RISCV] Remove Specifier::VK_Invalid

Author: MaskRay

llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp

@@ -2220,8 +2220,8 @@ ParseStatus RISCVAsmParser::parseOperandWithModifier(OperandVector &Operands) {
   if (getLexer().getKind() != AsmToken::Identifier)
     return Error(getLoc(), "expected valid identifier for operand modifier");
   StringRef Identifier = getParser().getTok().getIdentifier();
-  RISCVMCExpr::Specifier VK = RISCVMCExpr::getSpecifierForName(Identifier);
-  if (VK == RISCVMCExpr::VK_Invalid)
+  auto Spec = RISCVMCExpr::getSpecifierForName(Identifier);
+  if (!Spec)
     return Error(getLoc(), "unrecognized operand modifier");
 
   getParser().Lex(); // Eat the identifier
@@ -2232,7 +2232,7 @@ ParseStatus RISCVAsmParser::parseOperandWithModifier(OperandVector &Operands) {
   if (getParser().parseParenExpression(SubExpr, E))
     return ParseStatus::Failure;
 
-  const MCExpr *ModExpr = RISCVMCExpr::create(SubExpr, VK, getContext());
+  const MCExpr *ModExpr = RISCVMCExpr::create(SubExpr, *Spec, getContext());
   Operands.push_back(RISCVOperand::createImm(ModExpr, S, E, isRV64()));
   return ParseStatus::Success;
 }

llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCCodeEmitter.cpp

@@ -443,7 +443,6 @@ uint64_t RISCVMCCodeEmitter::getImmOpValue(const MCInst &MI, unsigned OpNo,
 
     switch (RVExpr->getSpecifier()) {
     case RISCVMCExpr::VK_None:
-    case RISCVMCExpr::VK_Invalid:
     case RISCVMCExpr::VK_32_PCREL:
       llvm_unreachable("Unhandled fixup kind!");
     case RISCVMCExpr::VK_TPREL_ADD:

llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp

@@ -102,8 +102,9 @@ void RISCVMCExpr::visitUsedExpr(MCStreamer &Streamer) const {
   Streamer.visitUsedExpr(*getSubExpr());
 }
 
-RISCVMCExpr::Specifier RISCVMCExpr::getSpecifierForName(StringRef name) {
-  return StringSwitch<RISCVMCExpr::Specifier>(name)
+std::optional<RISCVMCExpr::Specifier>
+RISCVMCExpr::getSpecifierForName(StringRef name) {
+  return StringSwitch<std::optional<RISCVMCExpr::Specifier>>(name)
       .Case("lo", VK_LO)
       .Case("hi", VK_HI)
       .Case("pcrel_lo", VK_PCREL_LO)
@@ -118,12 +119,11 @@ RISCVMCExpr::Specifier RISCVMCExpr::getSpecifierForName(StringRef name) {
       .Case("tlsdesc_load_lo", VK_TLSDESC_LOAD_LO)
       .Case("tlsdesc_add_lo", VK_TLSDESC_ADD_LO)
       .Case("tlsdesc_call", VK_TLSDESC_CALL)
-      .Default(VK_Invalid);
+      .Default(std::nullopt);
 }
 
 StringRef RISCVMCExpr::getSpecifierName(Specifier S) {
   switch (S) {
-  case VK_Invalid:
   case VK_None:
     llvm_unreachable("Invalid ELF symbol kind");
   case VK_LO:

llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.h

@@ -41,7 +41,6 @@ class RISCVMCExpr : public MCTargetExpr {
     VK_TLSDESC_LOAD_LO,
     VK_TLSDESC_ADD_LO,
     VK_TLSDESC_CALL,
-    VK_Invalid // Must be the last item
   };
 
 private:
@@ -82,7 +81,7 @@ class RISCVMCExpr : public MCTargetExpr {
     return E->getKind() == MCExpr::Target;
   }
 
-  static Specifier getSpecifierForName(StringRef name);
+  static std::optional<Specifier> getSpecifierForName(StringRef name);
   static StringRef getSpecifierName(Specifier Kind);
 };