Skip to content

Commit 7cf8a62

Browse files
committed
[AArch64,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 46a2f41 commit 7cf8a62

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8220,10 +8220,10 @@ bool AArch64AsmParser::classifySymbolRef(const MCExpr *Expr,
82208220

82218221
// Treat expressions with an ELFSpec (like ":abs_g1:3", or
82228222
// ":abs_g1:x" where x is constant) as symbolic even if there is no symbol.
8223-
if (!Res.getSymA() && ELFSpec == AArch64MCExpr::VK_INVALID)
8223+
if (!Res.getAddSym() && ELFSpec == AArch64MCExpr::VK_INVALID)
82248224
return false;
82258225

8226-
if (Res.getSymA())
8226+
if (Res.getAddSym())
82278227
DarwinSpec = AArch64MCExpr::Specifier(Res.getSymSpecifier());
82288228
Addend = Res.getConstant();
82298229

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
116116
AArch64MCExpr::Specifier SymLoc = AArch64MCExpr::getSymbolLoc(RefKind);
117117
bool IsNC = AArch64MCExpr::isNotChecked(RefKind);
118118

119-
assert((!Target.getSymA() ||
119+
assert((!Target.getAddSym() ||
120120
Target.getSymSpecifier() == AArch64MCExpr::None ||
121121
Target.getSymSpecifier() == AArch64MCExpr::VK_PLT ||
122122
Target.getSymSpecifier() == AArch64MCExpr::VK_GOTPCREL) &&

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ namespace {
3434

3535
class AArch64MachObjectWriter : public MCMachObjectTargetWriter {
3636
bool getAArch64FixupKindMachOInfo(const MCFixup &Fixup, unsigned &RelocType,
37-
const MCSymbolRefExpr *Sym,
38-
unsigned &Log2Size, const MCAssembler &Asm);
37+
AArch64MCExpr::Specifier Spec,
38+
unsigned &Log2Size, const MCAssembler &Asm);
3939

4040
public:
4141
AArch64MachObjectWriter(uint32_t CPUType, uint32_t CPUSubtype, bool IsILP32)
@@ -49,7 +49,7 @@ class AArch64MachObjectWriter : public MCMachObjectTargetWriter {
4949
} // end anonymous namespace
5050

5151
bool AArch64MachObjectWriter::getAArch64FixupKindMachOInfo(
52-
const MCFixup &Fixup, unsigned &RelocType, const MCSymbolRefExpr *Sym,
52+
const MCFixup &Fixup, unsigned &RelocType, AArch64MCExpr::Specifier Spec,
5353
unsigned &Log2Size, const MCAssembler &Asm) {
5454
RelocType = unsigned(MachO::ARM64_RELOC_UNSIGNED);
5555
Log2Size = ~0U;
@@ -66,12 +66,12 @@ bool AArch64MachObjectWriter::getAArch64FixupKindMachOInfo(
6666
return true;
6767
case FK_Data_4:
6868
Log2Size = Log2_32(4);
69-
if (getSpecifier(Sym) == AArch64MCExpr::M_GOT)
69+
if (Spec == AArch64MCExpr::M_GOT)
7070
RelocType = unsigned(MachO::ARM64_RELOC_POINTER_TO_GOT);
7171
return true;
7272
case FK_Data_8:
7373
Log2Size = Log2_32(8);
74-
if (getSpecifier(Sym) == AArch64MCExpr::M_GOT)
74+
if (Spec == AArch64MCExpr::M_GOT)
7575
RelocType = unsigned(MachO::ARM64_RELOC_POINTER_TO_GOT);
7676
return true;
7777
case AArch64::fixup_aarch64_add_imm12:
@@ -81,7 +81,7 @@ bool AArch64MachObjectWriter::getAArch64FixupKindMachOInfo(
8181
case AArch64::fixup_aarch64_ldst_imm12_scale8:
8282
case AArch64::fixup_aarch64_ldst_imm12_scale16:
8383
Log2Size = Log2_32(4);
84-
switch (AArch64MCExpr::Specifier(getSpecifier(Sym))) {
84+
switch (Spec) {
8585
default:
8686
return false;
8787
case AArch64MCExpr::M_PAGEOFF:
@@ -97,7 +97,7 @@ bool AArch64MachObjectWriter::getAArch64FixupKindMachOInfo(
9797
case AArch64::fixup_aarch64_pcrel_adrp_imm21:
9898
Log2Size = Log2_32(4);
9999
// This encompasses the relocation for the whole 21-bit value.
100-
switch (getSpecifier(Sym)) {
100+
switch (Spec) {
101101
default:
102102
Asm.getContext().reportError(Fixup.getLoc(),
103103
"ADR/ADRP relocations must be GOT relative");
@@ -191,8 +191,9 @@ void AArch64MachObjectWriter::recordRelocation(
191191
return;
192192
}
193193

194-
if (!getAArch64FixupKindMachOInfo(Fixup, Type, Target.getSymA(), Log2Size,
195-
Asm)) {
194+
if (!getAArch64FixupKindMachOInfo(
195+
Fixup, Type, AArch64MCExpr::Specifier(Target.getSymSpecifier()),
196+
Log2Size, Asm)) {
196197
Asm.getContext().reportError(Fixup.getLoc(), "unknown AArch64 fixup kind!");
197198
return;
198199
}

0 commit comments

Comments
 (0)