[llvm] af2bf2e - MC: Remove unneeded MCSymbolRefExpr::VariantKind calls
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 27 09:47:58 PDT 2025
Author: Fangrui Song
Date: 2025-06-27T09:47:53-07:00
New Revision: af2bf2e544b5c2a8a3cc4fd2acab2cc83107af66
URL: https://github.com/llvm/llvm-project/commit/af2bf2e544b5c2a8a3cc4fd2acab2cc83107af66
DIFF: https://github.com/llvm/llvm-project/commit/af2bf2e544b5c2a8a3cc4fd2acab2cc83107af66.diff
LOG: MC: Remove unneeded MCSymbolRefExpr::VariantKind calls
Added:
Modified:
llvm/lib/MC/MCCodeView.cpp
llvm/lib/MC/MCDwarf.cpp
llvm/lib/MC/MCObjectStreamer.cpp
llvm/lib/MC/MCPseudoProbe.cpp
llvm/lib/Target/ARC/ARCMCInstLower.cpp
llvm/lib/Target/AVR/MCTargetDesc/AVRMCELFStreamer.cpp
llvm/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp
llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
llvm/lib/Target/XCore/XCoreMCInstLower.cpp
Removed:
################################################################################
diff --git a/llvm/lib/MC/MCCodeView.cpp b/llvm/lib/MC/MCCodeView.cpp
index e78f5a082925d..1407bc52e1c46 100644
--- a/llvm/lib/MC/MCCodeView.cpp
+++ b/llvm/lib/MC/MCCodeView.cpp
@@ -453,9 +453,8 @@ MCFragment *CodeViewContext::emitDefRange(
static unsigned computeLabelDiff(const MCAssembler &Asm, const MCSymbol *Begin,
const MCSymbol *End) {
MCContext &Ctx = Asm.getContext();
- MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
- const MCExpr *BeginRef = MCSymbolRefExpr::create(Begin, Variant, Ctx),
- *EndRef = MCSymbolRefExpr::create(End, Variant, Ctx);
+ const MCExpr *BeginRef = MCSymbolRefExpr::create(Begin, Ctx),
+ *EndRef = MCSymbolRefExpr::create(End, Ctx);
const MCExpr *AddrDelta =
MCBinaryExpr::create(MCBinaryExpr::Sub, EndRef, BeginRef, Ctx);
int64_t Result;
diff --git a/llvm/lib/MC/MCDwarf.cpp b/llvm/lib/MC/MCDwarf.cpp
index bb9bbd0a9e61b..83c156648fa4b 100644
--- a/llvm/lib/MC/MCDwarf.cpp
+++ b/llvm/lib/MC/MCDwarf.cpp
@@ -120,9 +120,8 @@ static inline const MCExpr *makeEndMinusStartExpr(MCContext &Ctx,
const MCSymbol &Start,
const MCSymbol &End,
int IntVal) {
- MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
- const MCExpr *Res = MCSymbolRefExpr::create(&End, Variant, Ctx);
- const MCExpr *RHS = MCSymbolRefExpr::create(&Start, Variant, Ctx);
+ const MCExpr *Res = MCSymbolRefExpr::create(&End, Ctx);
+ const MCExpr *RHS = MCSymbolRefExpr::create(&Start, Ctx);
const MCExpr *Res1 = MCBinaryExpr::create(MCBinaryExpr::Sub, Res, RHS, Ctx);
const MCExpr *Res2 = MCConstantExpr::create(IntVal, Ctx);
const MCExpr *Res3 = MCBinaryExpr::create(MCBinaryExpr::Sub, Res1, Res2, Ctx);
@@ -134,8 +133,7 @@ static inline const MCExpr *makeEndMinusStartExpr(MCContext &Ctx,
//
static inline const MCExpr *
makeStartPlusIntExpr(MCContext &Ctx, const MCSymbol &Start, int IntVal) {
- MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
- const MCExpr *LHS = MCSymbolRefExpr::create(&Start, Variant, Ctx);
+ const MCExpr *LHS = MCSymbolRefExpr::create(&Start, Ctx);
const MCExpr *RHS = MCConstantExpr::create(IntVal, Ctx);
const MCExpr *Res = MCBinaryExpr::create(MCBinaryExpr::Add, LHS, RHS, Ctx);
return Res;
diff --git a/llvm/lib/MC/MCObjectStreamer.cpp b/llvm/lib/MC/MCObjectStreamer.cpp
index e959a242dfcf5..4a179fcdf6d08 100644
--- a/llvm/lib/MC/MCObjectStreamer.cpp
+++ b/llvm/lib/MC/MCObjectStreamer.cpp
@@ -436,9 +436,8 @@ void MCObjectStreamer::emitDwarfLocDirective(unsigned FileNo, unsigned Line,
static const MCExpr *buildSymbolDiff(MCObjectStreamer &OS, const MCSymbol *A,
const MCSymbol *B, SMLoc Loc) {
MCContext &Context = OS.getContext();
- MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
- const MCExpr *ARef = MCSymbolRefExpr::create(A, Variant, Context);
- const MCExpr *BRef = MCSymbolRefExpr::create(B, Variant, Context);
+ const MCExpr *ARef = MCSymbolRefExpr::create(A, Context);
+ const MCExpr *BRef = MCSymbolRefExpr::create(B, Context);
const MCExpr *AddrDelta =
MCBinaryExpr::create(MCBinaryExpr::Sub, ARef, BRef, Context, Loc);
return AddrDelta;
diff --git a/llvm/lib/MC/MCPseudoProbe.cpp b/llvm/lib/MC/MCPseudoProbe.cpp
index 2a3761b2cfe71..8a9906df92975 100644
--- a/llvm/lib/MC/MCPseudoProbe.cpp
+++ b/llvm/lib/MC/MCPseudoProbe.cpp
@@ -41,9 +41,8 @@ int MCPseudoProbeTable::DdgPrintIndent = 0;
static const MCExpr *buildSymbolDiff(MCObjectStreamer *MCOS, const MCSymbol *A,
const MCSymbol *B) {
MCContext &Context = MCOS->getContext();
- MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
- const MCExpr *ARef = MCSymbolRefExpr::create(A, Variant, Context);
- const MCExpr *BRef = MCSymbolRefExpr::create(B, Variant, Context);
+ const MCExpr *ARef = MCSymbolRefExpr::create(A, Context);
+ const MCExpr *BRef = MCSymbolRefExpr::create(B, Context);
const MCExpr *AddrDelta =
MCBinaryExpr::create(MCBinaryExpr::Sub, ARef, BRef, Context);
return AddrDelta;
diff --git a/llvm/lib/Target/ARC/ARCMCInstLower.cpp b/llvm/lib/Target/ARC/ARCMCInstLower.cpp
index 50ba9fe752325..76087a2466cec 100644
--- a/llvm/lib/Target/ARC/ARCMCInstLower.cpp
+++ b/llvm/lib/Target/ARC/ARCMCInstLower.cpp
@@ -29,7 +29,6 @@ ARCMCInstLower::ARCMCInstLower(MCContext *C, AsmPrinter &AsmPrinter)
MCOperand ARCMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
MachineOperandType MOTy,
unsigned Offset) const {
- MCSymbolRefExpr::VariantKind Kind = MCSymbolRefExpr::VK_None;
const MCSymbol *Symbol;
switch (MOTy) {
@@ -60,7 +59,7 @@ MCOperand ARCMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
}
assert(Symbol && "Symbol creation failed.\n");
- const MCSymbolRefExpr *MCSym = MCSymbolRefExpr::create(Symbol, Kind, *Ctx);
+ const MCSymbolRefExpr *MCSym = MCSymbolRefExpr::create(Symbol, *Ctx);
if (!Offset)
return MCOperand::createExpr(MCSym);
diff --git a/llvm/lib/Target/AVR/MCTargetDesc/AVRMCELFStreamer.cpp b/llvm/lib/Target/AVR/MCTargetDesc/AVRMCELFStreamer.cpp
index 0644f422b328e..1f3a75c1492a8 100644
--- a/llvm/lib/Target/AVR/MCTargetDesc/AVRMCELFStreamer.cpp
+++ b/llvm/lib/Target/AVR/MCTargetDesc/AVRMCELFStreamer.cpp
@@ -36,10 +36,8 @@ void AVRMCELFStreamer::emitValueForModiferKind(
Kind = AVR::S_HI8;
else if (ModifierKind == AVR::S_HH8)
Kind = AVR::S_HH8;
- MCELFStreamer::emitValue(
- MCSymbolRefExpr::create(Sym, MCSymbolRefExpr::VariantKind(Kind),
- getContext()),
- SizeInBytes, Loc);
+ MCELFStreamer::emitValue(MCSymbolRefExpr::create(Sym, Kind, getContext()),
+ SizeInBytes, Loc);
}
namespace llvm {
diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp b/llvm/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp
index 89893b10f3846..83ff3ef327de3 100644
--- a/llvm/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp
+++ b/llvm/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp
@@ -42,11 +42,7 @@ static void printExpr(const MCExpr *Expr, raw_ostream &O) {
if (!SRE)
report_fatal_error("Unexpected MCExpr type.");
-#ifndef NDEBUG
- MCSymbolRefExpr::VariantKind Kind = SRE->getKind();
-
- assert(Kind == MCSymbolRefExpr::VK_None);
-#endif
+ assert(SRE->getSpecifier() == 0);
O << *Expr;
}
diff --git a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
index 566b71dc367c4..3e7d56a9d490b 100644
--- a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
+++ b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
@@ -377,10 +377,7 @@ static void printExpr(const MCExpr *Expr, raw_ostream &O) {
SRE = cast<MCSymbolRefExpr>(BE->getLHS());
else
SRE = cast<MCSymbolRefExpr>(Expr);
-
- MCSymbolRefExpr::VariantKind Kind = SRE->getKind();
-
- assert(Kind == MCSymbolRefExpr::VK_None);
+ assert(SRE->getSpecifier() == 0);
#endif
O << *Expr;
}
diff --git a/llvm/lib/Target/XCore/XCoreMCInstLower.cpp b/llvm/lib/Target/XCore/XCoreMCInstLower.cpp
index 6f5dcb291e6e5..8f5096117d94c 100644
--- a/llvm/lib/Target/XCore/XCoreMCInstLower.cpp
+++ b/llvm/lib/Target/XCore/XCoreMCInstLower.cpp
@@ -31,7 +31,6 @@ void XCoreMCInstLower::Initialize(MCContext *C) { Ctx = C; }
MCOperand XCoreMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
MachineOperandType MOTy,
unsigned Offset) const {
- MCSymbolRefExpr::VariantKind Kind = MCSymbolRefExpr::VK_None;
const MCSymbol *Symbol;
switch (MOTy) {
@@ -61,8 +60,7 @@ MCOperand XCoreMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
llvm_unreachable("<unknown operand type>");
}
- const MCSymbolRefExpr *MCSym = MCSymbolRefExpr::create(Symbol, Kind, *Ctx);
-
+ const MCSymbolRefExpr *MCSym = MCSymbolRefExpr::create(Symbol, *Ctx);
if (!Offset)
return MCOperand::createExpr(MCSym);
More information about the llvm-commits
mailing list