[llvm] 0c84d71 - [MC] Replace getSymA()->getSymbol() with getAddSym. NFC
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sat Apr 5 13:40:09 PDT 2025
Author: Fangrui Song
Date: 2025-04-05T13:40:04-07:00
New Revision: 0c84d71eda538b5ac73811f241d4a0555ff49099
URL: https://github.com/llvm/llvm-project/commit/0c84d71eda538b5ac73811f241d4a0555ff49099
DIFF: https://github.com/llvm/llvm-project/commit/0c84d71eda538b5ac73811f241d4a0555ff49099.diff
LOG: [MC] Replace getSymA()->getSymbol() with getAddSym. NFC
We will replace the MCSymbolRefExpr member in MCValue with MCSymbol.
This change reduces dependence on MCSymbolRefExpr.
Added:
Modified:
llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp
llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp
llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZELFObjectWriter.cpp
llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
index 4763fdf8deb05..ee230a41242f6 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
@@ -128,8 +128,8 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
case AArch64MCExpr::VK_TPREL:
case AArch64MCExpr::VK_TLSDESC:
case AArch64MCExpr::VK_TLSDESC_AUTH:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
index d88d3bdd39378..f9c8f5f820e6f 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
@@ -103,8 +103,8 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target,
case ARMMCExpr::VK_TLSLDM_FDPIC:
case ARMMCExpr::VK_TLSLDO:
case ARMMCExpr::VK_TPOFF:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp b/llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp
index 7c0c23a86de8d..73ea49cc0ee92 100644
--- a/llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp
+++ b/llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp
@@ -51,8 +51,8 @@ unsigned BPFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
case FK_Data_8:
return ELF::R_BPF_64_ABS64;
case FK_Data_4:
- if (const MCSymbolRefExpr *A = Target.getSymA()) {
- const MCSymbol &Sym = A->getSymbol();
+ if (const auto *A = Target.getAddSym()) {
+ const MCSymbol &Sym = *A;
if (Sym.isDefined()) {
MCSection &Section = Sym.getSection();
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp
index 6adeb53731fde..af02631d051be 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp
@@ -50,8 +50,8 @@ unsigned CSKYELFObjectWriter::getRelocType(MCContext &Ctx,
case CSKYMCExpr::VK_TLSGD:
case CSKYMCExpr::VK_TLSLDM:
case CSKYMCExpr::VK_TLSLDO:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
index b9e0ea5960f31..039e4c981890d 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
@@ -51,8 +51,8 @@ unsigned HexagonELFObjectWriter::getRelocType(MCContext &Ctx,
case HexagonMCExpr::VK_IE:
case HexagonMCExpr::VK_IE_GOT:
case HexagonMCExpr::VK_TPREL:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp
index 7af832647f657..ca1eb665132e7 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp
@@ -64,8 +64,8 @@ unsigned LoongArchELFObjectWriter::getRelocType(MCContext &Ctx,
case LoongArchMCExpr::VK_TLS_LD_PCREL20_S2:
case LoongArchMCExpr::VK_TLS_GD_PCREL20_S2:
case LoongArchMCExpr::VK_TLS_DESC_PCREL20_S2:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp b/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
index 4a08591629e35..192bc5f4ae602 100644
--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
+++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
@@ -74,8 +74,8 @@ unsigned M68kELFObjectWriter::getRelocType(MCContext &Ctx,
case M68kMCExpr::VK_TLSLD:
case M68kMCExpr::VK_TLSLDM:
case M68kMCExpr::VK_TPOFF:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
index 526190263fbb8..c7801476a2b61 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
@@ -171,8 +171,8 @@ unsigned MipsELFObjectWriter::getRelocType(MCContext &Ctx,
case MipsMCExpr::MEK_GOTTPREL:
case MipsMCExpr::MEK_TPREL_HI:
case MipsMCExpr::MEK_TPREL_LO:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
index 1964f1b70957d..845c590478e5c 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
@@ -100,8 +100,8 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
case PPCMCExpr::VK_TPREL_HIGHEST:
case PPCMCExpr::VK_TPREL_HIGHESTA:
case PPCMCExpr::VK_TPREL_LO:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
index 77a55eceaf68e..586440f407d71 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
@@ -50,7 +50,7 @@ unsigned RISCVELFObjectWriter::getRelocType(MCContext &Ctx,
const MCValue &Target,
const MCFixup &Fixup,
bool IsPCRel) const {
- assert((!Target.getSymA() ||
+ assert((!Target.getAddSym() ||
Target.getSymSpecifier() == MCSymbolRefExpr::VK_None) &&
"sym at specifier should have been rejected");
const MCExpr *Expr = Fixup.getValue();
@@ -65,8 +65,8 @@ unsigned RISCVELFObjectWriter::getRelocType(MCContext &Ctx,
case RISCVMCExpr::VK_TLS_GOT_HI:
case RISCVMCExpr::VK_TLS_GD_HI:
case RISCVMCExpr::VK_TLSDESC_HI:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
case RISCVMCExpr::VK_PLTPCREL:
case RISCVMCExpr::VK_GOTPCREL:
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
index 73c24aa8a60bb..a48dca7be0d28 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
@@ -48,11 +48,9 @@ const MCFixup *RISCVMCExpr::getPCRelHiFixup(const MCFragment **DFOut) const {
if (!getSubExpr()->evaluateAsRelocatable(AUIPCLoc, nullptr))
return nullptr;
- const MCSymbolRefExpr *AUIPCSRE = AUIPCLoc.getSymA();
- if (!AUIPCSRE)
+ const MCSymbol *AUIPCSymbol = AUIPCLoc.getAddSym();
+ if (!AUIPCSymbol)
return nullptr;
-
- const MCSymbol *AUIPCSymbol = &AUIPCSRE->getSymbol();
const auto *DF = dyn_cast_or_null<MCDataFragment>(AUIPCSymbol->getFragment());
if (!DF)
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp b/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
index 2a39d991e2985..2cb7fa8233949 100644
--- a/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
+++ b/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
@@ -63,8 +63,8 @@ unsigned SparcELFObjectWriter::getRelocType(MCContext &Ctx,
case SparcMCExpr::VK_TLS_IE_ADD:
case SparcMCExpr::VK_TLS_LE_HIX22:
case SparcMCExpr::VK_TLS_LE_LOX10:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZELFObjectWriter.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZELFObjectWriter.cpp
index e5c51b0bdba8f..d6e0e15bec358 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZELFObjectWriter.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZELFObjectWriter.cpp
@@ -166,8 +166,8 @@ unsigned SystemZELFObjectWriter::getRelocType(MCContext &Ctx,
case SystemZMCExpr::VK_TLSLD:
case SystemZMCExpr::VK_TLSLDM:
case SystemZMCExpr::VK_DTPOFF:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
index 5f2e6160075ca..727ed56aac26f 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
@@ -45,8 +45,8 @@ unsigned VEELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
case VEMCExpr::VK_TLS_GD_LO32:
case VEMCExpr::VK_TPOFF_HI32:
case VEMCExpr::VK_TPOFF_LO32:
- if (auto *S = Target.getSymA())
- cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
+ if (auto *SA = Target.getAddSym())
+ cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
default:
break;
More information about the llvm-commits
mailing list