[llvm] 56b2c7d - MC: Rename initializeVariantKinds to initializeAtSpecifiers
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Thu Jun 26 22:46:25 PDT 2025
Author: Fangrui Song
Date: 2025-06-26T22:46:20-07:00
New Revision: 56b2c7d988750454f17beeadb360435dd770b67d
URL: https://github.com/llvm/llvm-project/commit/56b2c7d988750454f17beeadb360435dd770b67d
DIFF: https://github.com/llvm/llvm-project/commit/56b2c7d988750454f17beeadb360435dd770b67d.diff
LOG: MC: Rename initializeVariantKinds to initializeAtSpecifiers
We introduced VariantKinds after MCSymbolRefExpr::VariantKind and then
deprecated the VariantKind naming in favor of AtSpecifier (#133214).
Rename the function and type to use the recommended convention.
Added:
Modified:
llvm/include/llvm/MC/MCAsmInfo.h
llvm/lib/MC/MCAsmInfo.cpp
llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCAsmInfo.h b/llvm/include/llvm/MC/MCAsmInfo.h
index 5a9b39295ffd0..71da0482fe888 100644
--- a/llvm/include/llvm/MC/MCAsmInfo.h
+++ b/llvm/include/llvm/MC/MCAsmInfo.h
@@ -76,7 +76,6 @@ class LLVM_ABI MCAsmInfo {
uint32_t Kind;
StringRef Name;
};
- using VariantKindDesc = AtSpecifier;
protected:
//===------------------------------------------------------------------===//
@@ -427,9 +426,9 @@ class LLVM_ABI MCAsmInfo {
// If true, use Motorola-style integers in Assembly (ex. $0ac).
bool UseMotorolaIntegers = false;
- llvm::DenseMap<uint32_t, StringRef> SpecifierToName;
- llvm::StringMap<uint32_t> NameToSpecifier;
- void initializeVariantKinds(ArrayRef<AtSpecifier> Descs);
+ llvm::DenseMap<uint32_t, StringRef> AtSpecifierToName;
+ llvm::StringMap<uint32_t> NameToAtSpecifier;
+ void initializeAtSpecifiers(ArrayRef<AtSpecifier>);
public:
explicit MCAsmInfo();
diff --git a/llvm/lib/MC/MCAsmInfo.cpp b/llvm/lib/MC/MCAsmInfo.cpp
index 25edd30c3005e..19032634f43d7 100644
--- a/llvm/lib/MC/MCAsmInfo.cpp
+++ b/llvm/lib/MC/MCAsmInfo.cpp
@@ -124,28 +124,28 @@ bool MCAsmInfo::shouldOmitSectionDirective(StringRef SectionName) const {
(SectionName == ".bss" && !usesELFSectionDirectiveForBSS());
}
-void MCAsmInfo::initializeVariantKinds(ArrayRef<AtSpecifier> Descs) {
- assert(SpecifierToName.empty() && "cannot initialize twice");
+void MCAsmInfo::initializeAtSpecifiers(ArrayRef<AtSpecifier> Descs) {
+ assert(AtSpecifierToName.empty() && "cannot initialize twice");
for (auto Desc : Descs) {
[[maybe_unused]] auto It =
- SpecifierToName.try_emplace(Desc.Kind, Desc.Name);
+ AtSpecifierToName.try_emplace(Desc.Kind, Desc.Name);
assert(It.second && "duplicate Kind");
[[maybe_unused]] auto It2 =
- NameToSpecifier.try_emplace(Desc.Name.lower(), Desc.Kind);
+ NameToAtSpecifier.try_emplace(Desc.Name.lower(), Desc.Kind);
assert(It2.second);
}
}
StringRef MCAsmInfo::getSpecifierName(uint32_t S) const {
- auto It = SpecifierToName.find(S);
- assert(It != SpecifierToName.end() &&
+ auto It = AtSpecifierToName.find(S);
+ assert(It != AtSpecifierToName.end() &&
"ensure the specifier is set in initializeVariantKinds");
return It->second;
}
std::optional<uint32_t> MCAsmInfo::getSpecifierForName(StringRef Name) const {
- auto It = NameToSpecifier.find(Name.lower());
- if (It != NameToSpecifier.end())
+ auto It = NameToAtSpecifier.find(Name.lower());
+ if (It != NameToAtSpecifier.end())
return It->second;
return {};
}
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
index b1652e862541c..e5c8564f09849 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
@@ -147,7 +147,7 @@ AArch64MCAsmInfoDarwin::AArch64MCAsmInfoDarwin(bool IsILP32) {
ExceptionsType = ExceptionHandling::DwarfCFI;
- initializeVariantKinds(MachOAtSpecifiers);
+ initializeAtSpecifiers(MachOAtSpecifiers);
}
const MCExpr *AArch64MCAsmInfoDarwin::getExprForPersonalitySymbol(
@@ -225,7 +225,7 @@ AArch64MCAsmInfoELF::AArch64MCAsmInfoELF(const Triple &T) {
HasIdentDirective = true;
- initializeVariantKinds(ELFAtSpecifiers);
+ initializeAtSpecifiers(ELFAtSpecifiers);
}
void AArch64MCAsmInfoELF::printSpecifierExpr(
@@ -257,7 +257,7 @@ AArch64MCAsmInfoMicrosoftCOFF::AArch64MCAsmInfoMicrosoftCOFF() {
ExceptionsType = ExceptionHandling::WinEH;
WinEHEncodingType = WinEH::EncodingType::Itanium;
- initializeVariantKinds(COFFAtSpecifiers);
+ initializeAtSpecifiers(COFFAtSpecifiers);
}
void AArch64MCAsmInfoMicrosoftCOFF::printSpecifierExpr(
@@ -287,7 +287,7 @@ AArch64MCAsmInfoGNUCOFF::AArch64MCAsmInfoGNUCOFF() {
ExceptionsType = ExceptionHandling::WinEH;
WinEHEncodingType = WinEH::EncodingType::Itanium;
- initializeVariantKinds(COFFAtSpecifiers);
+ initializeAtSpecifiers(COFFAtSpecifiers);
}
void AArch64MCAsmInfoGNUCOFF::printSpecifierExpr(
diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp
index fcf134aa8658f..31dd373e54fb6 100644
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp
@@ -16,7 +16,7 @@
using namespace llvm;
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{AMDGPUMCExpr::S_GOTPCREL, "gotpcrel"},
{AMDGPUMCExpr::S_GOTPCREL32_LO, "gotpcrel32 at lo"},
{AMDGPUMCExpr::S_GOTPCREL32_HI, "gotpcrel32 at hi"},
@@ -56,7 +56,7 @@ AMDGPUMCAsmInfo::AMDGPUMCAsmInfo(const Triple &TT,
DwarfRegNumForCFI = true;
UseIntegratedAssembler = false;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
bool AMDGPUMCAsmInfo::shouldOmitSectionDirective(StringRef SectionName) const {
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
index a3d86f690e4a8..ab9954c53571d 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
@@ -17,7 +17,7 @@
using namespace llvm;
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{ARM::S_GOT_PREL, "GOT_PREL"},
{ARM::S_ARM_NONE, "none"},
{ARM::S_PREL31, "prel31"},
@@ -65,7 +65,7 @@ ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin(const Triple &TheTriple) {
? ExceptionHandling::SjLj
: ExceptionHandling::DwarfCFI;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
void ARMELFMCAsmInfo::anchor() { }
@@ -100,7 +100,7 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(const Triple &TheTriple) {
UseAtForSpecifier = false;
UseParensForSpecifier = true;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
void ARMELFMCAsmInfo::setUseIntegratedAssembler(bool Value) {
@@ -127,7 +127,7 @@ ARMCOFFMCAsmInfoMicrosoft::ARMCOFFMCAsmInfoMicrosoft() {
// Conditional Thumb 4-byte instructions can have an implicit IT.
MaxInstLength = 6;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
void ARMCOFFMCAsmInfoGNU::anchor() { }
@@ -151,7 +151,7 @@ ARMCOFFMCAsmInfoGNU::ARMCOFFMCAsmInfoGNU() {
// Conditional Thumb 4-byte instructions can have an implicit IT.
MaxInstLength = 6;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
void ARM::printSpecifierExpr(const MCAsmInfo &MAI, raw_ostream &OS,
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp
index 796bac33419b2..6e10ce4570c06 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp
@@ -18,7 +18,7 @@
using namespace llvm;
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{CSKYMCExpr::VK_GOT, "GOT"}, {CSKYMCExpr::VK_GOTOFF, "GOTOFF"},
{CSKYMCExpr::VK_PLT, "PLT"}, {CSKYMCExpr::VK_TLSGD, "TLSGD"},
{CSKYMCExpr::VK_TLSLDM, "TLSLDM"}, {CSKYMCExpr::VK_TPOFF, "TPOFF"},
@@ -36,5 +36,5 @@ CSKYMCAsmInfo::CSKYMCAsmInfo(const Triple &TargetTriple) {
ExceptionsType = ExceptionHandling::DwarfCFI;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
index ba8faaeb74a07..8f23585df7e11 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
@@ -16,7 +16,7 @@
using namespace llvm;
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{HexagonMCExpr::VK_DTPREL, "DTPREL"}, {HexagonMCExpr::VK_GD_GOT, "GDGOT"},
{HexagonMCExpr::VK_GD_PLT, "GDPLT"}, {HexagonMCExpr::VK_GOT, "GOT"},
{HexagonMCExpr::VK_GOTREL, "GOTREL"}, {HexagonMCExpr::VK_IE, "IE"},
@@ -47,5 +47,5 @@ HexagonMCAsmInfo::HexagonMCAsmInfo(const Triple &TT) {
ExceptionsType = ExceptionHandling::DwarfCFI;
UseLogicalShr = false;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
index b0a19309b50f7..21c73872e3bbb 100644
--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
+++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
@@ -18,7 +18,7 @@
using namespace llvm;
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{M68k::S_GOTOFF, "GOTOFF"}, {M68k::S_GOTPCREL, "GOTPCREL"},
{M68k::S_GOTTPOFF, "GOTTPOFF"}, {M68k::S_PLT, "PLT"},
{M68k::S_TLSGD, "TLSGD"}, {M68k::S_TLSLD, "TLSLD"},
@@ -42,5 +42,5 @@ M68kELFMCAsmInfo::M68kELFMCAsmInfo(const Triple &T) {
UseMotorolaIntegers = true;
CommentString = ";";
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
index 9471aba65ca5f..b2a1696fb927d 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
@@ -204,7 +204,7 @@ PPCELFMCAsmInfo::PPCELFMCAsmInfo(bool is64Bit, const Triple& T) {
AssemblerDialect = 1; // New-Style mnemonics.
LCOMMDirectiveAlignmentType = LCOMM::ByteAlignment;
- initializeVariantKinds(elfAtSpecifiers);
+ initializeAtSpecifiers(elfAtSpecifiers);
}
void PPCELFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
@@ -240,7 +240,7 @@ PPCXCOFFMCAsmInfo::PPCXCOFFMCAsmInfo(bool Is64Bit, const Triple &T) {
UsesSetToEquateSymbol = true;
- initializeVariantKinds(xcoffAtSpecifiers);
+ initializeAtSpecifiers(xcoffAtSpecifiers);
}
void PPCXCOFFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
index 052875bf0d3f6..2933b4becba05 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
@@ -13,7 +13,7 @@
using namespace llvm;
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{SystemZ::S_DTPOFF, "DTPOFF"}, {SystemZ::S_GOT, "GOT"},
{SystemZ::S_GOTENT, "GOTENT"}, {SystemZ::S_INDNTPOFF, "INDNTPOFF"},
{SystemZ::S_NTPOFF, "NTPOFF"}, {SystemZ::S_PLT, "PLT"},
@@ -33,7 +33,7 @@ SystemZMCAsmInfoELF::SystemZMCAsmInfoELF(const Triple &TT) {
UsesELFSectionDirectiveForBSS = true;
ZeroDirective = "\t.space\t";
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
SystemZMCAsmInfoGOFF::SystemZMCAsmInfoGOFF(const Triple &TT) {
@@ -52,7 +52,7 @@ SystemZMCAsmInfoGOFF::SystemZMCAsmInfoGOFF(const Triple &TT) {
MaxInstLength = 6;
SupportsDebugInformation = true;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
bool SystemZMCAsmInfoGOFF::isAcceptableChar(char C) const {
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
index 8eb3aedd668e4..9c6abde6fae98 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
@@ -19,7 +19,7 @@
using namespace llvm;
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{VE::S_HI32, "hi"},
{VE::S_LO32, "lo"},
{VE::S_PC_HI32, "pc_hi"},
@@ -55,7 +55,7 @@ VEELFMCAsmInfo::VEELFMCAsmInfo(const Triple &TheTriple) {
SupportsDebugInformation = true;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
void VEELFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
index a9793e04c4b60..b1190fb663543 100644
--- a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
@@ -65,5 +65,5 @@ WebAssemblyMCAsmInfo::WebAssemblyMCAsmInfo(const Triple &T,
if (WebAssembly::WasmEnableEH || WebAssembly::WasmEnableSjLj)
ExceptionsType = ExceptionHandling::Wasm;
- initializeVariantKinds(atSpecifiers);
+ initializeAtSpecifiers(atSpecifiers);
}
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
index 8702638564bcb..3e48c231ea1d6 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
@@ -35,7 +35,7 @@ MarkedJTDataRegions("mark-data-regions", cl::init(true),
cl::desc("Mark code section jump table data regions."),
cl::Hidden);
-const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
+const MCAsmInfo::AtSpecifier atSpecifiers[] = {
{X86MCExpr::VK_ABS8, "ABS8"},
{X86MCExpr::VK_DTPOFF, "DTPOFF"},
{X86MCExpr::VK_DTPREL, "DTPREL"},
@@ -102,7 +102,7 @@ X86MCAsmInfoDarwin::X86MCAsmInfoDarwin(const Triple &T) {
// overwhelm ld64's tiny little mind and it fails).
DwarfFDESymbolsUseAbsDiff = true;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
X86_64MCAsmInfoDarwin::X86_64MCAsmInfoDarwin(const Triple &Triple)
@@ -131,7 +131,7 @@ X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &T) {
// Exceptions handling
ExceptionsType = ExceptionHandling::DwarfCFI;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
const MCExpr *
@@ -166,7 +166,7 @@ X86MCAsmInfoMicrosoft::X86MCAsmInfoMicrosoft(const Triple &Triple) {
AllowAtInName = true;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
void X86MCAsmInfoMicrosoftMASM::anchor() { }
@@ -201,5 +201,5 @@ X86MCAsmInfoGNUCOFF::X86MCAsmInfoGNUCOFF(const Triple &Triple) {
AllowAtInName = true;
- initializeVariantKinds(variantKindDescs);
+ initializeAtSpecifiers(atSpecifiers);
}
More information about the llvm-commits
mailing list