[llvm-branch-commits] [llvm] [RISC-V][MC] Drop redundant RISCVOperand::RegOp struct. NFC (PR #241445)
Alexander Richardson via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Nov 13 17:15:24 PST 2026
https://github.com/arichardson updated https://github.com/llvm/llvm-project/pull/241445
>From f55cdf364c768d16d1680d5c82e80a4578c4eec9 Mon Sep 17 00:00:00 2001
From: Alex Richardson <alexrichardson at google.com>
Date: Wed, 11 Nov 2026 11:07:06 -0800
Subject: [PATCH] [nspr] initial commit
---
.../Target/RISCV/AsmParser/RISCVAsmParser.cpp | 30 ++++++++-----------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
index ab37556e10438..5be91a6690eec 100644
--- a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
+++ b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
@@ -371,10 +371,6 @@ struct RISCVOperand final : public MCParsedAsmOperand {
RegReg,
} Kind;
- struct RegOp {
- MCRegister Reg;
- };
-
struct ExprOp {
const MCExpr *Expr;
bool IsRV64;
@@ -424,7 +420,7 @@ struct RISCVOperand final : public MCParsedAsmOperand {
SMLoc StartLoc, EndLoc;
union {
StringRef Tok;
- RegOp Reg;
+ MCRegister Reg;
ExprOp Expr;
FPImmOp FPImm;
SysRegOp SysReg;
@@ -487,19 +483,17 @@ struct RISCVOperand final : public MCParsedAsmOperand {
bool isToken() const override { return Kind == KindTy::Token; }
bool isReg() const override { return Kind == KindTy::Register; }
bool isExpr() const { return Kind == KindTy::Expression; }
- bool isV0Reg() const {
- return Kind == KindTy::Register && Reg.Reg == RISCV::V0;
- }
+ bool isV0Reg() const { return Kind == KindTy::Register && Reg == RISCV::V0; }
bool isAnyReg() const {
return Kind == KindTy::Register &&
- (getRISCVMCRegisterClass(RISCV::GPRRegClassID).contains(Reg.Reg) ||
- getRISCVMCRegisterClass(RISCV::FPR64RegClassID).contains(Reg.Reg) ||
- getRISCVMCRegisterClass(RISCV::VRRegClassID).contains(Reg.Reg));
+ (getRISCVMCRegisterClass(RISCV::GPRRegClassID).contains(Reg) ||
+ getRISCVMCRegisterClass(RISCV::FPR64RegClassID).contains(Reg) ||
+ getRISCVMCRegisterClass(RISCV::VRRegClassID).contains(Reg));
}
bool isAnyRegC() const {
return Kind == KindTy::Register &&
- (getRISCVMCRegisterClass(RISCV::GPRCRegClassID).contains(Reg.Reg) ||
- getRISCVMCRegisterClass(RISCV::FPR64CRegClassID).contains(Reg.Reg));
+ (getRISCVMCRegisterClass(RISCV::GPRCRegClassID).contains(Reg) ||
+ getRISCVMCRegisterClass(RISCV::FPR64CRegClassID).contains(Reg));
}
bool isImm() const override { return isExpr(); }
bool isMem() const override { return false; }
@@ -513,7 +507,7 @@ struct RISCVOperand final : public MCParsedAsmOperand {
bool isGPR() const {
return Kind == KindTy::Register &&
- getRISCVMCRegisterClass(RISCV::GPRRegClassID).contains(Reg.Reg);
+ getRISCVMCRegisterClass(RISCV::GPRRegClassID).contains(Reg);
}
bool isGPRForFP(const MCSubtargetInfo &STI) const {
@@ -533,7 +527,7 @@ struct RISCVOperand final : public MCParsedAsmOperand {
}
bool isEvenGPRForFP64(const MCSubtargetInfo &STI) const {
- return isGPR() && (Reg.Reg - RISCV::X0) % 2 == 0 &&
+ return isGPR() && (Reg - RISCV::X0) % 2 == 0 &&
!STI.hasFeature(RISCV::Feature64Bit) &&
!STI.hasFeature(RISCV::FeatureStdExtF);
}
@@ -1029,7 +1023,7 @@ struct RISCVOperand final : public MCParsedAsmOperand {
MCRegister getReg() const override {
assert(Kind == KindTy::Register && "Invalid type access!");
- return Reg.Reg;
+ return Reg;
}
StringRef getSysReg() const {
@@ -1091,7 +1085,7 @@ struct RISCVOperand final : public MCParsedAsmOperand {
OS << "<fpimm: " << FPImm.Val << ">";
break;
case KindTy::Register:
- OS << "<reg: " << RegName(Reg.Reg) << " (" << Reg.Reg.id() << ")>";
+ OS << "<reg: " << RegName(Reg) << " (" << Reg.id() << ")>";
break;
case KindTy::Token:
OS << "'" << getToken() << "'";
@@ -1147,7 +1141,7 @@ struct RISCVOperand final : public MCParsedAsmOperand {
static std::unique_ptr<RISCVOperand> createReg(MCRegister Reg, SMLoc S,
SMLoc E) {
auto Op = std::make_unique<RISCVOperand>(KindTy::Register);
- Op->Reg.Reg = Reg;
+ Op->Reg = Reg;
Op->StartLoc = S;
Op->EndLoc = E;
return Op;
More information about the llvm-branch-commits
mailing list