MCValue: Replace getRefKind with getSpecifier
diff --git a/llvm/include/llvm/MC/MCValue.h b/llvm/include/llvm/MC/MCValue.h
index fd6da99..abed825 100644
--- a/llvm/include/llvm/MC/MCValue.h
+++ b/llvm/include/llvm/MC/MCValue.h
@@ -42,7 +42,6 @@
friend class MCExpr;
MCValue() = default;
int64_t getConstant() const { return Cst; }
- uint32_t getRefKind() const { return Specifier; }
uint32_t getSpecifier() const { return Specifier; }
void setSpecifier(uint32_t S) { Specifier = S; }
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index bf78a84..934bdb4 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -122,7 +122,7 @@
if (!Expr->evaluateAsRelocatable(V, nullptr))
return false;
- if (V.getSubSym() || V.getRefKind() != MCSymbolRefExpr::VK_None)
+ if (V.getSubSym() || V.getSpecifier() != MCSymbolRefExpr::VK_None)
return false;
auto *Sym = V.getAddSym();
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index c856ef5..5293fa5 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -291,7 +291,7 @@
// Value with RefKind (e.g. %hi(0xdeadbeef) in MIPS) is not considered
// absolute (the value is unknown at parse time), even if it might be resolved
// by evaluateFixup.
- return IsRelocatable && Value.isAbsolute() && Value.getRefKind() == 0;
+ return IsRelocatable && Value.isAbsolute() && Value.getSpecifier() == 0;
}
/// Helper method for \see EvaluateSymbolAdd().
@@ -533,7 +533,7 @@
// If the reference has a variant kind, we can only handle expressions
// which evaluate exactly to a single unadorned symbol. Attach the
// original VariantKind to SymA of the result.
- if (Res.getRefKind() != MCSymbolRefExpr::VK_None ||
+ if (Res.getSpecifier() != MCSymbolRefExpr::VK_None ||
!Res.getAddSym() || Res.getSubSym() || Res.getConstant())
return false;
Res.Specifier = Kind;
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
index 3335d9d..b43de2d 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
@@ -222,7 +222,7 @@
return Value >> 4;
case AArch64::fixup_aarch64_movw: {
AArch64MCExpr::Specifier RefKind =
- static_cast<AArch64MCExpr::Specifier>(Target.getRefKind());
+ static_cast<AArch64MCExpr::Specifier>(Target.getSpecifier());
if (AArch64MCExpr::getSymbolLoc(RefKind) != AArch64MCExpr::VK_ABS &&
AArch64MCExpr::getSymbolLoc(RefKind) != AArch64MCExpr::VK_SABS) {
if (!RefKind) {
@@ -422,7 +422,7 @@
bool IsResolved,
const MCSubtargetInfo *STI) const {
if (Fixup.getTargetKind() == FK_Data_8 && TheTriple.isOSBinFormatELF()) {
- auto RefKind = static_cast<AArch64MCExpr::Specifier>(Target.getRefKind());
+ auto RefKind = static_cast<AArch64MCExpr::Specifier>(Target.getSpecifier());
AArch64MCExpr::Specifier SymLoc = AArch64MCExpr::getSymbolLoc(RefKind);
if (SymLoc == AArch64AuthMCExpr::VK_AUTH ||
SymLoc == AArch64AuthMCExpr::VK_AUTHADDR) {
@@ -480,7 +480,7 @@
// FIXME: getFixupKindInfo() and getFixupKindNumBytes() could be fixed to
// handle this more cleanly. This may affect the output of -show-mc-encoding.
AArch64MCExpr::Specifier RefKind =
- static_cast<AArch64MCExpr::Specifier>(Target.getRefKind());
+ static_cast<AArch64MCExpr::Specifier>(Target.getSpecifier());
if (AArch64MCExpr::getSymbolLoc(RefKind) == AArch64MCExpr::VK_SABS ||
(!RefKind && Fixup.getTargetKind() == AArch64::fixup_aarch64_movw)) {
// If the immediate is negative, generate MOVN else MOVZ.
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
index 37d233a..c0c0e79 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
@@ -112,7 +112,7 @@
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
AArch64MCExpr::Specifier RefKind =
- static_cast<AArch64MCExpr::Specifier>(Target.getRefKind());
+ static_cast<AArch64MCExpr::Specifier>(Target.getSpecifier());
AArch64MCExpr::Specifier SymLoc = AArch64MCExpr::getSymbolLoc(RefKind);
bool IsNC = AArch64MCExpr::isNotChecked(RefKind);
@@ -543,7 +543,7 @@
if (Val.getAddSym() && cast<MCSymbolELF>(Val.getAddSym())->isMemtag())
return true;
- if ((Val.getRefKind() & AArch64MCExpr::VK_GOT) == AArch64MCExpr::VK_GOT)
+ if ((Val.getSpecifier() & AArch64MCExpr::VK_GOT) == AArch64MCExpr::VK_GOT)
return true;
return is_contained({AArch64MCExpr::VK_GOTPCREL, AArch64MCExpr::VK_PLT},
AArch64MCExpr::Specifier(Val.getSpecifier()));
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp
index fc09896..d2c7e78 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp
@@ -391,8 +391,8 @@
Value = 0;
}
- if (Target.getRefKind() == AArch64MCExpr::VK_AUTH ||
- Target.getRefKind() == AArch64MCExpr::VK_AUTHADDR) {
+ if (Target.getSpecifier() == AArch64MCExpr::VK_AUTH ||
+ Target.getSpecifier() == AArch64MCExpr::VK_AUTHADDR) {
auto *Expr = cast<AArch64AuthMCExpr>(Fixup.getValue());
assert(Type == MachO::ARM64_RELOC_UNSIGNED);
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp
index c7ece33..d424399 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp
@@ -44,7 +44,7 @@
unsigned Kind = Fixup.getTargetKind();
uint8_t Modifier = Target.getSpecifier();
- switch (Target.getRefKind()) {
+ switch (Target.getSpecifier()) {
case CSKYMCExpr::VK_TLSIE:
case CSKYMCExpr::VK_TLSLE:
case CSKYMCExpr::VK_TLSGD:
@@ -170,7 +170,7 @@
bool CSKYELFObjectWriter::needsRelocateWithSymbol(const MCValue &V,
const MCSymbol &,
unsigned Type) const {
- switch (V.getRefKind()) {
+ switch (V.getSpecifier()) {
case CSKYMCExpr::VK_PLT:
case CSKYMCExpr::VK_GOT:
return true;
diff --git a/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp b/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp
index 4c6512d..fe83e8f6 100644
--- a/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp
+++ b/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp
@@ -707,7 +707,7 @@
MCValue Res;
if (Expr->evaluateAsRelocatable(Res, nullptr))
- return Res.getRefKind() == LoongArchMCExpr::VK_None;
+ return Res.getSpecifier() == LoongArchMCExpr::VK_None;
return false;
}
diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
index e74c8af..b6a98b3 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
@@ -452,7 +452,7 @@
const MCFixup &Fixup,
const MCValue &Target,
uint64_t &FixedValue) const {
- assert(Target.getRefKind() == 0 &&
+ assert(Target.getSpecifier() == 0 &&
"relocatable SymA-SymB cannot have relocation specifier");
std::pair<MCFixupKind, MCFixupKind> FK;
uint64_t FixedValueA, FixedValueB;
diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp
index ca1eb66..2e2a503 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFObjectWriter.cpp
@@ -50,7 +50,7 @@
const MCValue &Target,
const MCFixup &Fixup,
bool IsPCRel) const {
- switch (Target.getRefKind()) {
+ switch (Target.getSpecifier()) {
case LoongArchMCExpr::VK_TLS_LE_HI20:
case LoongArchMCExpr::VK_TLS_IE_PC_HI20:
case LoongArchMCExpr::VK_TLS_IE_HI20:
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
index c780147..4af619e 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
@@ -162,7 +162,7 @@
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
- switch (Target.getRefKind()) {
+ switch (Target.getSpecifier()) {
case MipsMCExpr::MEK_DTPREL:
case MipsMCExpr::MEK_DTPREL_HI:
case MipsMCExpr::MEK_DTPREL_LO:
diff --git a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
index d23ddb9..dba78fe 100644
--- a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
+++ b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
@@ -2798,14 +2798,14 @@
MCValue Res;
if (Expr->evaluateAsRelocatable(Res, nullptr))
- return Res.getRefKind() == RISCVMCExpr::VK_None;
+ return Res.getSpecifier() == RISCVMCExpr::VK_None;
return false;
}
bool RISCVAsmParser::isSymbolDiff(const MCExpr *Expr) {
MCValue Res;
if (Expr->evaluateAsRelocatable(Res, nullptr)) {
- return Res.getRefKind() == RISCVMCExpr::VK_None && Res.getAddSym() &&
+ return Res.getSpecifier() == RISCVMCExpr::VK_None && Res.getAddSym() &&
Res.getSubSym();
}
return false;
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
index 652dd65..6641116 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
@@ -628,7 +628,7 @@
const MCFixup &Fixup,
const MCValue &Target,
uint64_t &FixedValue) const {
- assert(Target.getRefKind() == 0 &&
+ assert(Target.getSpecifier() == 0 &&
"relocatable SymA-SymB cannot have relocation specifier");
uint64_t FixedValueA, FixedValueB;
unsigned TA = 0, TB = 0;
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
index 1662b80..5fdf8e2 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
@@ -56,7 +56,7 @@
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
- auto Spec = RISCVMCExpr::Specifier(Target.getRefKind());
+ auto Spec = RISCVMCExpr::Specifier(Target.getSpecifier());
switch (Spec) {
case RISCVMCExpr::VK_TPREL_HI:
case RISCVMCExpr::VK_TLS_GOT_HI:
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp b/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
index 2cb7fa8..74ef487 100644
--- a/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
+++ b/llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
@@ -46,7 +46,7 @@
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
- switch (Target.getRefKind()) {
+ switch (Target.getSpecifier()) {
case SparcMCExpr::VK_TLS_GD_HI22:
case SparcMCExpr::VK_TLS_GD_LO10:
case SparcMCExpr::VK_TLS_GD_ADD:
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
index 727ed56..5d0d18d 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
@@ -40,7 +40,7 @@
unsigned VEELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
const MCFixup &Fixup,
bool IsPCRel) const {
- switch (Target.getRefKind()) {
+ switch (Target.getSpecifier()) {
case VEMCExpr::VK_TLS_GD_HI32:
case VEMCExpr::VK_TLS_GD_LO32:
case VEMCExpr::VK_TPOFF_HI32:
