Skip to content

Commit 2c35cb6

Browse files
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,

0 commit comments

Comments
 (0)