Skip to content

Commit 56b2c7d

Browse files
MaskRayMaskRay
committed
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.
1 parent 9179322 commit 56b2c7d

File tree

13 files changed

+41
-42
lines changed

13 files changed

+41
-42
lines changed

‎llvm/include/llvm/MC/MCAsmInfo.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ class LLVM_ABI MCAsmInfo {
7676
uint32_t Kind;
7777
StringRef Name;
7878
};
79-
using VariantKindDesc = AtSpecifier;
8079

8180
protected:
8281
//===------------------------------------------------------------------===//
@@ -427,9 +426,9 @@ class LLVM_ABI MCAsmInfo {
427426
// If true, use Motorola-style integers in Assembly (ex. $0ac).
428427
bool UseMotorolaIntegers = false;
429428

430-
llvm::DenseMap<uint32_t, StringRef> SpecifierToName;
431-
llvm::StringMap<uint32_t> NameToSpecifier;
432-
void initializeVariantKinds(ArrayRef<AtSpecifier> Descs);
429+
llvm::DenseMap<uint32_t, StringRef> AtSpecifierToName;
430+
llvm::StringMap<uint32_t> NameToAtSpecifier;
431+
void initializeAtSpecifiers(ArrayRef<AtSpecifier>);
433432

434433
public:
435434
explicit MCAsmInfo();

‎llvm/lib/MC/MCAsmInfo.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,28 +124,28 @@ bool MCAsmInfo::shouldOmitSectionDirective(StringRef SectionName) const {
124124
(SectionName == ".bss" && !usesELFSectionDirectiveForBSS());
125125
}
126126

127-
void MCAsmInfo::initializeVariantKinds(ArrayRef<AtSpecifier> Descs) {
128-
assert(SpecifierToName.empty() && "cannot initialize twice");
127+
void MCAsmInfo::initializeAtSpecifiers(ArrayRef<AtSpecifier> Descs) {
128+
assert(AtSpecifierToName.empty() && "cannot initialize twice");
129129
for (auto Desc : Descs) {
130130
[[maybe_unused]] auto It =
131-
SpecifierToName.try_emplace(Desc.Kind, Desc.Name);
131+
AtSpecifierToName.try_emplace(Desc.Kind, Desc.Name);
132132
assert(It.second && "duplicate Kind");
133133
[[maybe_unused]] auto It2 =
134-
NameToSpecifier.try_emplace(Desc.Name.lower(), Desc.Kind);
134+
NameToAtSpecifier.try_emplace(Desc.Name.lower(), Desc.Kind);
135135
assert(It2.second);
136136
}
137137
}
138138

139139
StringRef MCAsmInfo::getSpecifierName(uint32_t S) const {
140-
auto It = SpecifierToName.find(S);
141-
assert(It != SpecifierToName.end() &&
140+
auto It = AtSpecifierToName.find(S);
141+
assert(It != AtSpecifierToName.end() &&
142142
"ensure the specifier is set in initializeVariantKinds");
143143
return It->second;
144144
}
145145

146146
std::optional<uint32_t> MCAsmInfo::getSpecifierForName(StringRef Name) const {
147-
auto It = NameToSpecifier.find(Name.lower());
148-
if (It != NameToSpecifier.end())
147+
auto It = NameToAtSpecifier.find(Name.lower());
148+
if (It != NameToAtSpecifier.end())
149149
return It->second;
150150
return {};
151151
}

‎llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ AArch64MCAsmInfoDarwin::AArch64MCAsmInfoDarwin(bool IsILP32) {
147147

148148
ExceptionsType = ExceptionHandling::DwarfCFI;
149149

150-
initializeVariantKinds(MachOAtSpecifiers);
150+
initializeAtSpecifiers(MachOAtSpecifiers);
151151
}
152152

153153
const MCExpr *AArch64MCAsmInfoDarwin::getExprForPersonalitySymbol(
@@ -225,7 +225,7 @@ AArch64MCAsmInfoELF::AArch64MCAsmInfoELF(const Triple &T) {
225225

226226
HasIdentDirective = true;
227227

228-
initializeVariantKinds(ELFAtSpecifiers);
228+
initializeAtSpecifiers(ELFAtSpecifiers);
229229
}
230230

231231
void AArch64MCAsmInfoELF::printSpecifierExpr(
@@ -257,7 +257,7 @@ AArch64MCAsmInfoMicrosoftCOFF::AArch64MCAsmInfoMicrosoftCOFF() {
257257
ExceptionsType = ExceptionHandling::WinEH;
258258
WinEHEncodingType = WinEH::EncodingType::Itanium;
259259

260-
initializeVariantKinds(COFFAtSpecifiers);
260+
initializeAtSpecifiers(COFFAtSpecifiers);
261261
}
262262

263263
void AArch64MCAsmInfoMicrosoftCOFF::printSpecifierExpr(
@@ -287,7 +287,7 @@ AArch64MCAsmInfoGNUCOFF::AArch64MCAsmInfoGNUCOFF() {
287287
ExceptionsType = ExceptionHandling::WinEH;
288288
WinEHEncodingType = WinEH::EncodingType::Itanium;
289289

290-
initializeVariantKinds(COFFAtSpecifiers);
290+
initializeAtSpecifiers(COFFAtSpecifiers);
291291
}
292292

293293
void AArch64MCAsmInfoGNUCOFF::printSpecifierExpr(

‎llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
using namespace llvm;
1818

19-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
19+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
2020
{AMDGPUMCExpr::S_GOTPCREL, "gotpcrel"},
2121
{AMDGPUMCExpr::S_GOTPCREL32_LO, "gotpcrel32@lo"},
2222
{AMDGPUMCExpr::S_GOTPCREL32_HI, "gotpcrel32@hi"},
@@ -56,7 +56,7 @@ AMDGPUMCAsmInfo::AMDGPUMCAsmInfo(const Triple &TT,
5656
DwarfRegNumForCFI = true;
5757

5858
UseIntegratedAssembler = false;
59-
initializeVariantKinds(variantKindDescs);
59+
initializeAtSpecifiers(atSpecifiers);
6060
}
6161

6262
bool AMDGPUMCAsmInfo::shouldOmitSectionDirective(StringRef SectionName) const {

‎llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using namespace llvm;
1919

20-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
20+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
2121
{ARM::S_GOT_PREL, "GOT_PREL"},
2222
{ARM::S_ARM_NONE, "none"},
2323
{ARM::S_PREL31, "prel31"},
@@ -65,7 +65,7 @@ ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin(const Triple &TheTriple) {
6565
? ExceptionHandling::SjLj
6666
: ExceptionHandling::DwarfCFI;
6767

68-
initializeVariantKinds(variantKindDescs);
68+
initializeAtSpecifiers(atSpecifiers);
6969
}
7070

7171
void ARMELFMCAsmInfo::anchor() { }
@@ -100,7 +100,7 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(const Triple &TheTriple) {
100100
UseAtForSpecifier = false;
101101
UseParensForSpecifier = true;
102102

103-
initializeVariantKinds(variantKindDescs);
103+
initializeAtSpecifiers(atSpecifiers);
104104
}
105105

106106
void ARMELFMCAsmInfo::setUseIntegratedAssembler(bool Value) {
@@ -127,7 +127,7 @@ ARMCOFFMCAsmInfoMicrosoft::ARMCOFFMCAsmInfoMicrosoft() {
127127
// Conditional Thumb 4-byte instructions can have an implicit IT.
128128
MaxInstLength = 6;
129129

130-
initializeVariantKinds(variantKindDescs);
130+
initializeAtSpecifiers(atSpecifiers);
131131
}
132132

133133
void ARMCOFFMCAsmInfoGNU::anchor() { }
@@ -151,7 +151,7 @@ ARMCOFFMCAsmInfoGNU::ARMCOFFMCAsmInfoGNU() {
151151
// Conditional Thumb 4-byte instructions can have an implicit IT.
152152
MaxInstLength = 6;
153153

154-
initializeVariantKinds(variantKindDescs);
154+
initializeAtSpecifiers(atSpecifiers);
155155
}
156156

157157
void ARM::printSpecifierExpr(const MCAsmInfo &MAI, raw_ostream &OS,

‎llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
using namespace llvm;
2020

21-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
21+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
2222
{CSKYMCExpr::VK_GOT, "GOT"}, {CSKYMCExpr::VK_GOTOFF, "GOTOFF"},
2323
{CSKYMCExpr::VK_PLT, "PLT"}, {CSKYMCExpr::VK_TLSGD, "TLSGD"},
2424
{CSKYMCExpr::VK_TLSLDM, "TLSLDM"}, {CSKYMCExpr::VK_TPOFF, "TPOFF"},
@@ -36,5 +36,5 @@ CSKYMCAsmInfo::CSKYMCAsmInfo(const Triple &TargetTriple) {
3636

3737
ExceptionsType = ExceptionHandling::DwarfCFI;
3838

39-
initializeVariantKinds(variantKindDescs);
39+
initializeAtSpecifiers(atSpecifiers);
4040
}

‎llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
using namespace llvm;
1818

19-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
19+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
2020
{HexagonMCExpr::VK_DTPREL, "DTPREL"}, {HexagonMCExpr::VK_GD_GOT, "GDGOT"},
2121
{HexagonMCExpr::VK_GD_PLT, "GDPLT"}, {HexagonMCExpr::VK_GOT, "GOT"},
2222
{HexagonMCExpr::VK_GOTREL, "GOTREL"}, {HexagonMCExpr::VK_IE, "IE"},
@@ -47,5 +47,5 @@ HexagonMCAsmInfo::HexagonMCAsmInfo(const Triple &TT) {
4747
ExceptionsType = ExceptionHandling::DwarfCFI;
4848
UseLogicalShr = false;
4949

50-
initializeVariantKinds(variantKindDescs);
50+
initializeAtSpecifiers(atSpecifiers);
5151
}

‎llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
using namespace llvm;
2020

21-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
21+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
2222
{M68k::S_GOTOFF, "GOTOFF"}, {M68k::S_GOTPCREL, "GOTPCREL"},
2323
{M68k::S_GOTTPOFF, "GOTTPOFF"}, {M68k::S_PLT, "PLT"},
2424
{M68k::S_TLSGD, "TLSGD"}, {M68k::S_TLSLD, "TLSLD"},
@@ -42,5 +42,5 @@ M68kELFMCAsmInfo::M68kELFMCAsmInfo(const Triple &T) {
4242
UseMotorolaIntegers = true;
4343
CommentString = ";";
4444

45-
initializeVariantKinds(variantKindDescs);
45+
initializeAtSpecifiers(atSpecifiers);
4646
}

‎llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ PPCELFMCAsmInfo::PPCELFMCAsmInfo(bool is64Bit, const Triple& T) {
204204
AssemblerDialect = 1; // New-Style mnemonics.
205205
LCOMMDirectiveAlignmentType = LCOMM::ByteAlignment;
206206

207-
initializeVariantKinds(elfAtSpecifiers);
207+
initializeAtSpecifiers(elfAtSpecifiers);
208208
}
209209

210210
void PPCELFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
@@ -240,7 +240,7 @@ PPCXCOFFMCAsmInfo::PPCXCOFFMCAsmInfo(bool Is64Bit, const Triple &T) {
240240

241241
UsesSetToEquateSymbol = true;
242242

243-
initializeVariantKinds(xcoffAtSpecifiers);
243+
initializeAtSpecifiers(xcoffAtSpecifiers);
244244
}
245245

246246
void PPCXCOFFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,

‎llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
using namespace llvm;
1515

16-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
16+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
1717
{SystemZ::S_DTPOFF, "DTPOFF"}, {SystemZ::S_GOT, "GOT"},
1818
{SystemZ::S_GOTENT, "GOTENT"}, {SystemZ::S_INDNTPOFF, "INDNTPOFF"},
1919
{SystemZ::S_NTPOFF, "NTPOFF"}, {SystemZ::S_PLT, "PLT"},
@@ -33,7 +33,7 @@ SystemZMCAsmInfoELF::SystemZMCAsmInfoELF(const Triple &TT) {
3333
UsesELFSectionDirectiveForBSS = true;
3434
ZeroDirective = "\t.space\t";
3535

36-
initializeVariantKinds(variantKindDescs);
36+
initializeAtSpecifiers(atSpecifiers);
3737
}
3838

3939
SystemZMCAsmInfoGOFF::SystemZMCAsmInfoGOFF(const Triple &TT) {
@@ -52,7 +52,7 @@ SystemZMCAsmInfoGOFF::SystemZMCAsmInfoGOFF(const Triple &TT) {
5252
MaxInstLength = 6;
5353
SupportsDebugInformation = true;
5454

55-
initializeVariantKinds(variantKindDescs);
55+
initializeAtSpecifiers(atSpecifiers);
5656
}
5757

5858
bool SystemZMCAsmInfoGOFF::isAcceptableChar(char C) const {

‎llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
using namespace llvm;
2121

22-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
22+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
2323
{VE::S_HI32, "hi"},
2424
{VE::S_LO32, "lo"},
2525
{VE::S_PC_HI32, "pc_hi"},
@@ -55,7 +55,7 @@ VEELFMCAsmInfo::VEELFMCAsmInfo(const Triple &TheTriple) {
5555

5656
SupportsDebugInformation = true;
5757

58-
initializeVariantKinds(variantKindDescs);
58+
initializeAtSpecifiers(atSpecifiers);
5959
}
6060

6161
void VEELFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,

‎llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ WebAssemblyMCAsmInfo::WebAssemblyMCAsmInfo(const Triple &T,
6565
if (WebAssembly::WasmEnableEH || WebAssembly::WasmEnableSjLj)
6666
ExceptionsType = ExceptionHandling::Wasm;
6767

68-
initializeVariantKinds(atSpecifiers);
68+
initializeAtSpecifiers(atSpecifiers);
6969
}

‎llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ MarkedJTDataRegions("mark-data-regions", cl::init(true),
3535
cl::desc("Mark code section jump table data regions."),
3636
cl::Hidden);
3737

38-
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
38+
const MCAsmInfo::AtSpecifier atSpecifiers[] = {
3939
{X86MCExpr::VK_ABS8, "ABS8"},
4040
{X86MCExpr::VK_DTPOFF, "DTPOFF"},
4141
{X86MCExpr::VK_DTPREL, "DTPREL"},
@@ -102,7 +102,7 @@ X86MCAsmInfoDarwin::X86MCAsmInfoDarwin(const Triple &T) {
102102
// overwhelm ld64's tiny little mind and it fails).
103103
DwarfFDESymbolsUseAbsDiff = true;
104104

105-
initializeVariantKinds(variantKindDescs);
105+
initializeAtSpecifiers(atSpecifiers);
106106
}
107107

108108
X86_64MCAsmInfoDarwin::X86_64MCAsmInfoDarwin(const Triple &Triple)
@@ -131,7 +131,7 @@ X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &T) {
131131
// Exceptions handling
132132
ExceptionsType = ExceptionHandling::DwarfCFI;
133133

134-
initializeVariantKinds(variantKindDescs);
134+
initializeAtSpecifiers(atSpecifiers);
135135
}
136136

137137
const MCExpr *
@@ -166,7 +166,7 @@ X86MCAsmInfoMicrosoft::X86MCAsmInfoMicrosoft(const Triple &Triple) {
166166

167167
AllowAtInName = true;
168168

169-
initializeVariantKinds(variantKindDescs);
169+
initializeAtSpecifiers(atSpecifiers);
170170
}
171171

172172
void X86MCAsmInfoMicrosoftMASM::anchor() { }
@@ -201,5 +201,5 @@ X86MCAsmInfoGNUCOFF::X86MCAsmInfoGNUCOFF(const Triple &Triple) {
201201

202202
AllowAtInName = true;
203203

204-
initializeVariantKinds(variantKindDescs);
204+
initializeAtSpecifiers(atSpecifiers);
205205
}

0 commit comments

Comments
 (0)