Skip to content

Commit 2c35cb6

Browse files
MaskRayMaskRay
committed
[MC] Remove unneeded getNumFixupKinds
1 parent 009d362 commit 2c35cb6

File tree

29 files changed

+24
-80
lines changed

29 files changed

+24
-80
lines changed

‎llvm/include/llvm/MC/MCAsmBackend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ class MCAsmBackend {
8383
/// \name Target Fixup Interfaces
8484
/// @{
8585

86-
/// Get the number of target specific fixup kinds.
87-
virtual unsigned getNumFixupKinds() const = 0;
88-
8986
/// Map a relocation name used in .reloc to a fixup kind.
9087
virtual std::optional<MCFixupKind> getFixupKind(StringRef Name) const;
9188

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ class AArch64AsmBackend : public MCAsmBackend {
4141
: llvm::endianness::big),
4242
TheTriple(TT) {}
4343

44-
unsigned getNumFixupKinds() const override {
45-
return AArch64::NumTargetFixupKinds;
46-
}
4744

4845
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
4946

@@ -78,7 +75,8 @@ class AArch64AsmBackend : public MCAsmBackend {
7875
if (Kind < FirstTargetFixupKind)
7976
return MCAsmBackend::getFixupKindInfo(Kind);
8077

81-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
78+
assert(unsigned(Kind - FirstTargetFixupKind) <
79+
AArch64::NumTargetFixupKinds &&
8280
"Invalid kind!");
8381
return Infos[Kind - FirstTargetFixupKind];
8482
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class AMDGPUAsmBackend : public MCAsmBackend {
3131
public:
3232
AMDGPUAsmBackend(const Target &T) : MCAsmBackend(llvm::endianness::little) {}
3333

34-
unsigned getNumFixupKinds() const override { return AMDGPU::NumTargetFixupKinds; };
3534

3635
void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
3736
const MCValue &Target, MutableArrayRef<char> Data,
@@ -186,7 +185,7 @@ const MCFixupKindInfo &AMDGPUAsmBackend::getFixupKindInfo(
186185
if (Kind < FirstTargetFixupKind)
187186
return MCAsmBackend::getFixupKindInfo(Kind);
188187

189-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
188+
assert(unsigned(Kind - FirstTargetFixupKind) < AMDGPU::NumTargetFixupKinds &&
190189
"Invalid kind!");
191190
return Infos[Kind - FirstTargetFixupKind];
192191
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ const MCFixupKindInfo &ARMAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
198198
if (Kind < FirstTargetFixupKind)
199199
return MCAsmBackend::getFixupKindInfo(Kind);
200200

201-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
201+
assert(unsigned(Kind - FirstTargetFixupKind) < ARM::NumTargetFixupKinds &&
202202
"Invalid kind!");
203203
return (Endian == llvm::endianness::little
204204
? InfosLE

‎llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ class ARMAsmBackend : public MCAsmBackend {
2323
ARMAsmBackend(const Target &T, bool isThumb, llvm::endianness Endian)
2424
: MCAsmBackend(Endian), isThumbMode(isThumb) {}
2525

26-
unsigned getNumFixupKinds() const override {
27-
return ARM::NumTargetFixupKinds;
28-
}
2926

3027
bool hasNOP(const MCSubtargetInfo *STI) const {
3128
return STI->hasFeature(ARM::HasV6T2Ops);

‎llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ MCFixupKindInfo const &AVRAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
481481
if (Kind < FirstTargetFixupKind)
482482
return MCAsmBackend::getFixupKindInfo(Kind);
483483

484-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
484+
assert(unsigned(Kind - FirstTargetFixupKind) < AVR::NumTargetFixupKinds &&
485485
"Invalid kind!");
486486

487487
return Infos[Kind - FirstTargetFixupKind];

‎llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ class AVRAsmBackend : public MCAsmBackend {
4545
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
4646
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
4747

48-
unsigned getNumFixupKinds() const override {
49-
return AVR::NumTargetFixupKinds;
50-
}
5148

5249
bool writeNopData(raw_ostream &OS, uint64_t Count,
5350
const MCSubtargetInfo *STI) const override;

‎llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ class BPFAsmBackend : public MCAsmBackend {
3535
std::unique_ptr<MCObjectTargetWriter>
3636
createObjectTargetWriter() const override;
3737

38-
unsigned getNumFixupKinds() const override {
39-
return BPF::NumTargetFixupKinds;
40-
}
4138
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
4239

4340
bool writeNopData(raw_ostream &OS, uint64_t Count,
@@ -55,7 +52,7 @@ BPFAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
5552
if (Kind < FirstTargetFixupKind)
5653
return MCAsmBackend::getFixupKindInfo(Kind);
5754

58-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
55+
assert(unsigned(Kind - FirstTargetFixupKind) < BPF::NumTargetFixupKinds &&
5956
"Invalid kind!");
6057
return Infos[Kind - FirstTargetFixupKind];
6158
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ CSKYAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
7171
"Not all fixup kinds added to Infos array");
7272

7373
if (FirstTargetFixupKind <= Kind && Kind < FirstLiteralRelocationKind) {
74-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
74+
assert(unsigned(Kind - FirstTargetFixupKind) < CSKY::NumTargetFixupKinds &&
7575
"Invalid kind!");
7676

7777
return Infos[Kind];

‎llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ class CSKYAsmBackend : public MCAsmBackend {
2222
CSKYAsmBackend(const MCSubtargetInfo &STI, const MCTargetOptions &OP)
2323
: MCAsmBackend(llvm::endianness::little) {}
2424

25-
unsigned int getNumFixupKinds() const override {
26-
return CSKY::NumTargetFixupKinds;
27-
}
2825

2926
void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
3027
const MCValue &Target, MutableArrayRef<char> Data,

‎llvm/lib/Target/DirectX/MCTargetDesc/DirectXMCTargetDesc.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ class DXILAsmBackend : public MCAsmBackend {
8787
return createDXContainerTargetObjectWriter();
8888
}
8989

90-
unsigned getNumFixupKinds() const override { return 0; }
91-
9290
bool writeNopData(raw_ostream &OS, uint64_t Count,
9391
const MCSubtargetInfo *STI) const override {
9492
return true;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ class HexagonAsmBackend : public MCAsmBackend {
8282
return Result;
8383
}
8484

85-
unsigned getNumFixupKinds() const override {
86-
return Hexagon::NumTargetFixupKinds;
87-
}
8885

8986
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override {
9087
const static MCFixupKindInfo Infos[Hexagon::NumTargetFixupKinds] = {
@@ -195,7 +192,8 @@ class HexagonAsmBackend : public MCAsmBackend {
195192
if (Kind < FirstTargetFixupKind)
196193
return MCAsmBackend::getFixupKindInfo(Kind);
197194

198-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
195+
assert(unsigned(Kind - FirstTargetFixupKind) <
196+
Hexagon::NumTargetFixupKinds &&
199197
"Invalid kind!");
200198
return Infos[Kind - FirstTargetFixupKind];
201199
}

‎llvm/lib/Target/Lanai/MCTargetDesc/LanaiAsmBackend.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ class LanaiAsmBackend : public MCAsmBackend {
5757

5858
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
5959

60-
unsigned getNumFixupKinds() const override {
61-
return Lanai::NumTargetFixupKinds;
62-
}
6360

6461
bool writeNopData(raw_ostream &OS, uint64_t Count,
6562
const MCSubtargetInfo *STI) const override;
@@ -143,7 +140,7 @@ LanaiAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
143140
if (Kind < FirstTargetFixupKind)
144141
return MCAsmBackend::getFixupKindInfo(Kind);
145142

146-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
143+
assert(unsigned(Kind - FirstTargetFixupKind) < Lanai::NumTargetFixupKinds &&
147144
"Invalid kind!");
148145
return Infos[Kind - FirstTargetFixupKind];
149146
}

‎llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ LoongArchAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
7676
if (Kind < FirstTargetFixupKind)
7777
return MCAsmBackend::getFixupKindInfo(Kind);
7878

79-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
79+
assert(unsigned(Kind - FirstTargetFixupKind) <
80+
LoongArch::NumTargetFixupKinds &&
8081
"Invalid kind!");
8182
return Infos[Kind - FirstTargetFixupKind];
8283
}

‎llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ class LoongArchAsmBackend : public MCAsmBackend {
6060
const MCValue &Target,
6161
const MCSubtargetInfo *STI) override;
6262

63-
unsigned getNumFixupKinds() const override {
64-
return LoongArch::NumTargetFixupKinds;
65-
}
6663

6764
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
6865

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class M68kAsmBackend : public MCAsmBackend {
5252
.CasesLower("m68020", "m68030", "m68040", true)
5353
.Default(false)) {}
5454

55-
unsigned getNumFixupKinds() const override { return 0; }
5655

5756
void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
5857
const MCValue &Target, MutableArrayRef<char> Data,

‎llvm/lib/Target/MSP430/MCTargetDesc/MSP430AsmBackend.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ class MSP430AsmBackend : public MCAsmBackend {
4646
return createMSP430ELFObjectWriter(OSABI);
4747
}
4848

49-
unsigned getNumFixupKinds() const override {
50-
return MSP430::NumTargetFixupKinds;
51-
}
5249

5350
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override {
5451
const static MCFixupKindInfo Infos[MSP430::NumTargetFixupKinds] = {

‎llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,8 @@ getFixupKindInfo(MCFixupKind Kind) const {
532532
if (Kind < FirstTargetFixupKind)
533533
return MCAsmBackend::getFixupKindInfo(Kind);
534534

535-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
536-
"Invalid kind!");
535+
assert(unsigned(Kind - FirstTargetFixupKind) < Mips::NumTargetFixupKinds &&
536+
"Invalid kind!");
537537

538538
if (Endian == llvm::endianness::little)
539539
return LittleEndianInfos[Kind - FirstTargetFixupKind];

‎llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ class MipsAsmBackend : public MCAsmBackend {
4747
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
4848
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
4949

50-
unsigned getNumFixupKinds() const override {
51-
return Mips::NumTargetFixupKinds;
52-
}
5350

5451
bool writeNopData(raw_ostream &OS, uint64_t Count,
5552
const MCSubtargetInfo *STI) const override;

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ class PPCAsmBackend : public MCAsmBackend {
9090
: llvm::endianness::big),
9191
TT(TT) {}
9292

93-
unsigned getNumFixupKinds() const override {
94-
return PPC::NumTargetFixupKinds;
95-
}
96-
9793
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override {
9894
const static MCFixupKindInfo InfosBE[PPC::NumTargetFixupKinds] = {
9995
// name offset bits flags
@@ -130,7 +126,7 @@ class PPCAsmBackend : public MCAsmBackend {
130126
if (Kind < FirstTargetFixupKind)
131127
return MCAsmBackend::getFixupKindInfo(Kind);
132128

133-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
129+
assert(Kind - FirstTargetFixupKind < PPC::NumTargetFixupKinds &&
134130
"Invalid kind!");
135131
return (Endian == llvm::endianness::little
136132
? InfosLE

‎llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ RISCVAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
104104
if (Kind < FirstTargetFixupKind)
105105
return MCAsmBackend::getFixupKindInfo(Kind);
106106

107-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
107+
assert(unsigned(Kind - FirstTargetFixupKind) < RISCV::NumTargetFixupKinds &&
108108
"Invalid kind!");
109109
return Infos[Kind - FirstTargetFixupKind];
110110
}

‎llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ class RISCVAsmBackend : public MCAsmBackend {
7474
const MCRelaxableFragment *DF,
7575
const bool WasForced) const override;
7676

77-
unsigned getNumFixupKinds() const override {
78-
return RISCV::NumTargetFixupKinds;
79-
}
8077

8178
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
8279

‎llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVAsmBackend.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class SPIRVAsmBackend : public MCAsmBackend {
3030
return createSPIRVObjectTargetWriter();
3131
}
3232

33-
unsigned getNumFixupKinds() const override { return 1; }
3433

3534
bool mayNeedRelaxation(const MCInst &Inst,
3635
const MCSubtargetInfo &STI) const override {

‎llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ namespace {
142142
Is64Bit(STI.getTargetTriple().isArch64Bit()),
143143
IsV8Plus(STI.hasFeature(Sparc::FeatureV8Plus)) {}
144144

145-
unsigned getNumFixupKinds() const override {
146-
return Sparc::NumTargetFixupKinds;
147-
}
148145

149146
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override {
150147
unsigned Type;
@@ -264,7 +261,8 @@ namespace {
264261
if (Kind < FirstTargetFixupKind)
265262
return MCAsmBackend::getFixupKindInfo(Kind);
266263

267-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
264+
assert(unsigned(Kind - FirstTargetFixupKind) <
265+
Sparc::NumTargetFixupKinds &&
268266
"Invalid kind!");
269267
if (Endian == llvm::endianness::little)
270268
return InfosLE[Kind - FirstTargetFixupKind];

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ class SystemZMCAsmBackend : public MCAsmBackend {
110110
SystemZMCAsmBackend() : MCAsmBackend(llvm::endianness::big) {}
111111

112112
// Override MCAsmBackend
113-
unsigned getNumFixupKinds() const override {
114-
return SystemZ::NumTargetFixupKinds;
115-
}
116113
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
117114
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
118115
void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
@@ -151,7 +148,7 @@ SystemZMCAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
151148
if (Kind < FirstTargetFixupKind)
152149
return MCAsmBackend::getFixupKindInfo(Kind);
153150

154-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
151+
assert(unsigned(Kind - FirstTargetFixupKind) < SystemZ::NumTargetFixupKinds &&
155152
"Invalid kind!");
156153
return SystemZ::MCFixupKindInfos[Kind - FirstTargetFixupKind];
157154
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ class VEAsmBackend : public MCAsmBackend {
100100
VEAsmBackend(const Target &T)
101101
: MCAsmBackend(llvm::endianness::little), TheTarget(T) {}
102102

103-
unsigned getNumFixupKinds() const override { return VE::NumTargetFixupKinds; }
104103

105104
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override {
106105
const static MCFixupKindInfo Infos[VE::NumTargetFixupKinds] = {
@@ -126,7 +125,7 @@ class VEAsmBackend : public MCAsmBackend {
126125
if (Kind < FirstTargetFixupKind)
127126
return MCAsmBackend::getFixupKindInfo(Kind);
128127

129-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
128+
assert(unsigned(Kind - FirstTargetFixupKind) < VE::NumTargetFixupKinds &&
130129
"Invalid kind!");
131130
return Infos[Kind - FirstTargetFixupKind];
132131
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ class WebAssemblyAsmBackend final : public MCAsmBackend {
3636
: MCAsmBackend(llvm::endianness::little), Is64Bit(Is64Bit),
3737
IsEmscripten(IsEmscripten) {}
3838

39-
unsigned getNumFixupKinds() const override {
40-
return WebAssembly::NumTargetFixupKinds;
41-
}
4239

4340
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
4441

@@ -70,7 +67,8 @@ WebAssemblyAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
7067
if (Kind < FirstTargetFixupKind)
7168
return MCAsmBackend::getFixupKindInfo(Kind);
7269

73-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
70+
assert(unsigned(Kind - FirstTargetFixupKind) <
71+
WebAssembly::NumTargetFixupKinds &&
7472
"Invalid kind!");
7573
return Infos[Kind - FirstTargetFixupKind];
7674
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ class X86AsmBackend : public MCAsmBackend {
163163
const MCSubtargetInfo &STI);
164164
void emitInstructionEnd(MCObjectStreamer &OS, const MCInst &Inst);
165165

166-
unsigned getNumFixupKinds() const override {
167-
return X86::NumTargetFixupKinds;
168-
}
169166

170167
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
171168

@@ -646,7 +643,7 @@ const MCFixupKindInfo &X86AsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
646643
if (Kind < FirstTargetFixupKind)
647644
return MCAsmBackend::getFixupKindInfo(Kind);
648645

649-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
646+
assert(unsigned(Kind - FirstTargetFixupKind) < X86::NumTargetFixupKinds &&
650647
"Invalid kind!");
651648
assert(Infos[Kind - FirstTargetFixupKind].Name && "Empty fixup name!");
652649
return Infos[Kind - FirstTargetFixupKind];

‎llvm/lib/Target/Xtensa/MCTargetDesc/XtensaAsmBackend.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ class XtensaMCAsmBackend : public MCAsmBackend {
3333
: MCAsmBackend(llvm::endianness::little), OSABI(osABI),
3434
IsLittleEndian(isLE) {}
3535

36-
unsigned getNumFixupKinds() const override {
37-
return Xtensa::NumTargetFixupKinds;
38-
}
3936
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;
4037
void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
4138
const MCValue &Target, MutableArrayRef<char> Data,
@@ -71,7 +68,7 @@ XtensaMCAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
7168

7269
if (Kind < FirstTargetFixupKind)
7370
return MCAsmBackend::getFixupKindInfo(Kind);
74-
assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() &&
71+
assert(unsigned(Kind - FirstTargetFixupKind) < Xtensa::NumTargetFixupKinds &&
7572
"Invalid kind!");
7673
return Infos[Kind - FirstTargetFixupKind];
7774
}

0 commit comments

Comments
 (0)