caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MC: Remove unneeded MCSymbolRefExpr::VariantKind calls

Browse Source
This commit is contained in:
Fangrui Song
2025-06-27 09:47:53 -07:00
parent 74cabdb806
commit af2bf2e544
9 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/MC/MCCodeView.cpp
View File

@@ -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;

8
llvm/lib/MC/MCDwarf.cpp
View File

@@ -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;

5
llvm/lib/MC/MCObjectStreamer.cpp
View File

@@ -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;

5
llvm/lib/MC/MCPseudoProbe.cpp
View File

@@ -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;

3
llvm/lib/Target/ARC/ARCMCInstLower.cpp
View File

@@ -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);

6
llvm/lib/Target/AVR/MCTargetDesc/AVRMCELFStreamer.cpp
View File

@@ -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 {

6
llvm/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp
View File

@@ -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;
}

5
llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
View File

@@ -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;
}

4
llvm/lib/Target/XCore/XCoreMCInstLower.cpp
View File

@@ -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);