Skip to content

Commit 0c84d71

Browse files
committed
[MC] Replace getSymA()->getSymbol() with getAddSym. NFC
We will replace the MCSymbolRefExpr member in MCValue with MCSymbol. This change reduces dependence on MCSymbolRefExpr.
1 parent d71ee7d commit 0c84d71

File tree

14 files changed

+29
-31
lines changed

14 files changed

+29
-31
lines changed

llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
128128
case AArch64MCExpr::VK_TPREL:
129129
case AArch64MCExpr::VK_TLSDESC:
130130
case AArch64MCExpr::VK_TLSDESC_AUTH:
131-
if (auto *S = Target.getSymA())
132-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
131+
if (auto *SA = Target.getAddSym())
132+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
133133
break;
134134
default:
135135
break;

llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target,
103103
case ARMMCExpr::VK_TLSLDM_FDPIC:
104104
case ARMMCExpr::VK_TLSLDO:
105105
case ARMMCExpr::VK_TPOFF:
106-
if (auto *S = Target.getSymA())
107-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
106+
if (auto *SA = Target.getAddSym())
107+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
108108
break;
109109
default:
110110
break;

llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ unsigned BPFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
5151
case FK_Data_8:
5252
return ELF::R_BPF_64_ABS64;
5353
case FK_Data_4:
54-
if (const MCSymbolRefExpr *A = Target.getSymA()) {
55-
const MCSymbol &Sym = A->getSymbol();
54+
if (const auto *A = Target.getAddSym()) {
55+
const MCSymbol &Sym = *A;
5656

5757
if (Sym.isDefined()) {
5858
MCSection &Section = Sym.getSection();

llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ unsigned CSKYELFObjectWriter::getRelocType(MCContext &Ctx,
5050
case CSKYMCExpr::VK_TLSGD:
5151
case CSKYMCExpr::VK_TLSLDM:
5252
case CSKYMCExpr::VK_TLSLDO:
53-
if (auto *S = Target.getSymA())
54-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
53+
if (auto *SA = Target.getAddSym())
54+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
5555
break;
5656
default:
5757
break;

llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ unsigned HexagonELFObjectWriter::getRelocType(MCContext &Ctx,
5151
case HexagonMCExpr::VK_IE:
5252
case HexagonMCExpr::VK_IE_GOT:
5353
case HexagonMCExpr::VK_TPREL:
54-
if (auto *S = Target.getSymA())
55-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
54+
if (auto *SA = Target.getAddSym())
55+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
5656
break;
5757
default:
5858
break;

llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ unsigned LoongArchELFObjectWriter::getRelocType(MCContext &Ctx,
6464
case LoongArchMCExpr::VK_TLS_LD_PCREL20_S2:
6565
case LoongArchMCExpr::VK_TLS_GD_PCREL20_S2:
6666
case LoongArchMCExpr::VK_TLS_DESC_PCREL20_S2:
67-
if (auto *S = Target.getSymA())
68-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
67+
if (auto *SA = Target.getAddSym())
68+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
6969
break;
7070
default:
7171
break;

llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ unsigned M68kELFObjectWriter::getRelocType(MCContext &Ctx,
7474
case M68kMCExpr::VK_TLSLD:
7575
case M68kMCExpr::VK_TLSLDM:
7676
case M68kMCExpr::VK_TPOFF:
77-
if (auto *S = Target.getSymA())
78-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
77+
if (auto *SA = Target.getAddSym())
78+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
7979
break;
8080
default:
8181
break;

llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ unsigned MipsELFObjectWriter::getRelocType(MCContext &Ctx,
171171
case MipsMCExpr::MEK_GOTTPREL:
172172
case MipsMCExpr::MEK_TPREL_HI:
173173
case MipsMCExpr::MEK_TPREL_LO:
174-
if (auto *S = Target.getSymA())
175-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
174+
if (auto *SA = Target.getAddSym())
175+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
176176
break;
177177
default:
178178
break;

llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
100100
case PPCMCExpr::VK_TPREL_HIGHEST:
101101
case PPCMCExpr::VK_TPREL_HIGHESTA:
102102
case PPCMCExpr::VK_TPREL_LO:
103-
if (auto *S = Target.getSymA())
104-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
103+
if (auto *SA = Target.getAddSym())
104+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
105105
break;
106106
default:
107107
break;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ unsigned RISCVELFObjectWriter::getRelocType(MCContext &Ctx,
5050
const MCValue &Target,
5151
const MCFixup &Fixup,
5252
bool IsPCRel) const {
53-
assert((!Target.getSymA() ||
53+
assert((!Target.getAddSym() ||
5454
Target.getSymSpecifier() == MCSymbolRefExpr::VK_None) &&
5555
"sym@specifier should have been rejected");
5656
const MCExpr *Expr = Fixup.getValue();
@@ -65,8 +65,8 @@ unsigned RISCVELFObjectWriter::getRelocType(MCContext &Ctx,
6565
case RISCVMCExpr::VK_TLS_GOT_HI:
6666
case RISCVMCExpr::VK_TLS_GD_HI:
6767
case RISCVMCExpr::VK_TLSDESC_HI:
68-
if (auto *S = Target.getSymA())
69-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
68+
if (auto *SA = Target.getAddSym())
69+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
7070
break;
7171
case RISCVMCExpr::VK_PLTPCREL:
7272
case RISCVMCExpr::VK_GOTPCREL:

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ const MCFixup *RISCVMCExpr::getPCRelHiFixup(const MCFragment **DFOut) const {
4848
if (!getSubExpr()->evaluateAsRelocatable(AUIPCLoc, nullptr))
4949
return nullptr;
5050

51-
const MCSymbolRefExpr *AUIPCSRE = AUIPCLoc.getSymA();
52-
if (!AUIPCSRE)
51+
const MCSymbol *AUIPCSymbol = AUIPCLoc.getAddSym();
52+
if (!AUIPCSymbol)
5353
return nullptr;
54-
55-
const MCSymbol *AUIPCSymbol = &AUIPCSRE->getSymbol();
5654
const auto *DF = dyn_cast_or_null<MCDataFragment>(AUIPCSymbol->getFragment());
5755

5856
if (!DF)

llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ unsigned SparcELFObjectWriter::getRelocType(MCContext &Ctx,
6363
case SparcMCExpr::VK_TLS_IE_ADD:
6464
case SparcMCExpr::VK_TLS_LE_HIX22:
6565
case SparcMCExpr::VK_TLS_LE_LOX10:
66-
if (auto *S = Target.getSymA())
67-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
66+
if (auto *SA = Target.getAddSym())
67+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
6868
break;
6969
default:
7070
break;

llvm/lib/Target/SystemZ/MCTargetDesc/SystemZELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ unsigned SystemZELFObjectWriter::getRelocType(MCContext &Ctx,
166166
case SystemZMCExpr::VK_TLSLD:
167167
case SystemZMCExpr::VK_TLSLDM:
168168
case SystemZMCExpr::VK_DTPOFF:
169-
if (auto *S = Target.getSymA())
170-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
169+
if (auto *SA = Target.getAddSym())
170+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
171171
break;
172172
default:
173173
break;

llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ unsigned VEELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
4545
case VEMCExpr::VK_TLS_GD_LO32:
4646
case VEMCExpr::VK_TPOFF_HI32:
4747
case VEMCExpr::VK_TPOFF_LO32:
48-
if (auto *S = Target.getSymA())
49-
cast<MCSymbolELF>(S->getSymbol()).setType(ELF::STT_TLS);
48+
if (auto *SA = Target.getAddSym())
49+
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
5050
break;
5151
default:
5252
break;

0 commit comments

Comments
 (0)