[llvm] 3793cc1 - MCAsmBackend: Remove the MCAssembler argument from fixupNeedsRelaxationAdvanced
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sat May 24 15:14:02 PDT 2025
Author: Fangrui Song
Date: 2025-05-24T15:13:57-07:00
New Revision: 3793cc1561c96c51e847a5ae25789a5969bf1c33
URL: https://github.com/llvm/llvm-project/commit/3793cc1561c96c51e847a5ae25789a5969bf1c33
DIFF: https://github.com/llvm/llvm-project/commit/3793cc1561c96c51e847a5ae25789a5969bf1c33.diff
LOG: MCAsmBackend: Remove the MCAssembler argument from fixupNeedsRelaxationAdvanced
Added:
Modified:
llvm/include/llvm/MC/MCAsmBackend.h
llvm/lib/MC/MCAsmBackend.cpp
llvm/lib/MC/MCAssembler.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h
llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.cpp
llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.h
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.h
llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCAsmBackend.h b/llvm/include/llvm/MC/MCAsmBackend.h
index d18744d39bdac..325468d0f5187 100644
--- a/llvm/include/llvm/MC/MCAsmBackend.h
+++ b/llvm/include/llvm/MC/MCAsmBackend.h
@@ -147,8 +147,7 @@ class MCAsmBackend {
/// Target specific predicate for whether a given fixup requires the
/// associated instruction to be relaxed.
- virtual bool fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &, const MCValue &,
+ virtual bool fixupNeedsRelaxationAdvanced(const MCFixup &, const MCValue &,
uint64_t, bool Resolved) const;
/// Simple predicate for targets where !Resolved implies requiring relaxation
diff --git a/llvm/lib/MC/MCAsmBackend.cpp b/llvm/lib/MC/MCAsmBackend.cpp
index 5570499be5f35..4c803585ce25c 100644
--- a/llvm/lib/MC/MCAsmBackend.cpp
+++ b/llvm/lib/MC/MCAsmBackend.cpp
@@ -111,8 +111,7 @@ MCFixupKindInfo MCAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
return Builtins[Kind - FK_NONE];
}
-bool MCAsmBackend::fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &Fixup,
+bool MCAsmBackend::fixupNeedsRelaxationAdvanced(const MCFixup &Fixup,
const MCValue &, uint64_t Value,
bool Resolved) const {
if (!Resolved)
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index d687f2b5ac022..ae6560d836cfe 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -990,7 +990,7 @@ bool MCAssembler::fixupNeedsRelaxation(const MCFixup &Fixup,
uint64_t Value;
bool Resolved = evaluateFixup(DF, const_cast<MCFixup &>(Fixup), Target, Value,
/*RecordReloc=*/false, {});
- return getBackend().fixupNeedsRelaxationAdvanced(*this, Fixup, Target, Value,
+ return getBackend().fixupNeedsRelaxationAdvanced(Fixup, Target, Value,
Resolved);
}
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
index 81602e2ae2af8..075fe8687b5af 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
@@ -340,13 +340,12 @@ static bool needsInterworking(const MCAssembler &Asm, const MCSymbol *Sym,
return false;
}
-bool ARMAsmBackend::fixupNeedsRelaxationAdvanced(const MCAssembler &Asm,
- const MCFixup &Fixup,
+bool ARMAsmBackend::fixupNeedsRelaxationAdvanced(const MCFixup &Fixup,
const MCValue &Target,
uint64_t Value,
bool Resolved) const {
const MCSymbol *Sym = Target.getAddSym();
- if (needsInterworking(Asm, Sym, Fixup.getTargetKind()))
+ if (needsInterworking(*Asm, Sym, Fixup.getTargetKind()))
return true;
if (!Resolved)
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h
index d52f48a5152f0..5efc969641b90 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h
@@ -50,8 +50,7 @@ class ARMAsmBackend : public MCAsmBackend {
const char *reasonForFixupRelaxation(const MCFixup &Fixup,
uint64_t Value) const;
- bool fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &, const MCValue &, uint64_t,
+ bool fixupNeedsRelaxationAdvanced(const MCFixup &, const MCValue &, uint64_t,
bool) const override;
void relaxInstruction(MCInst &Inst,
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.cpp b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.cpp
index a482d26bf4e64..47d2728915707 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.cpp
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.cpp
@@ -165,8 +165,7 @@ static uint64_t adjustFixupValue(const MCFixup &Fixup, uint64_t Value,
}
}
-bool CSKYAsmBackend::fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &Fixup,
+bool CSKYAsmBackend::fixupNeedsRelaxationAdvanced(const MCFixup &Fixup,
const MCValue &,
uint64_t Value,
bool Resolved) const {
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.h b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.h
index 735ac8bc3ada0..099aaa6e67cd7 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.h
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYAsmBackend.h
@@ -37,8 +37,7 @@ class CSKYAsmBackend : public MCAsmBackend {
bool mayNeedRelaxation(const MCInst &Inst,
const MCSubtargetInfo &STI) const override;
- bool fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &, const MCValue &, uint64_t,
+ bool fixupNeedsRelaxationAdvanced(const MCFixup &, const MCValue &, uint64_t,
bool) const override;
bool writeNopData(raw_ostream &OS, uint64_t Count,
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp
index 5c08c8b5c0af3..624610a66ee94 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp
@@ -564,8 +564,7 @@ class HexagonAsmBackend : public MCAsmBackend {
/// fixupNeedsRelaxation - Target specific predicate for whether a given
/// fixup requires the associated instruction to be relaxed.
- bool fixupNeedsRelaxationAdvanced(const MCAssembler &Asm,
- const MCFixup &Fixup, const MCValue &,
+ bool fixupNeedsRelaxationAdvanced(const MCFixup &Fixup, const MCValue &,
uint64_t Value,
bool Resolved) const override {
MCInst const &MCB = *RelaxedMCB;
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
index 9950c644f9365..0bee7209c3726 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
@@ -105,8 +105,7 @@ MCFixupKindInfo RISCVAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
return Infos[Kind - FirstTargetFixupKind];
}
-bool RISCVAsmBackend::fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &Fixup,
+bool RISCVAsmBackend::fixupNeedsRelaxationAdvanced(const MCFixup &Fixup,
const MCValue &,
uint64_t Value,
bool Resolved) const {
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.h b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.h
index 65f7b1ed20173..e411d65304241 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.h
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.h
@@ -58,8 +58,7 @@ class RISCVAsmBackend : public MCAsmBackend {
std::unique_ptr<MCObjectTargetWriter>
createObjectTargetWriter() const override;
- bool fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &, const MCValue &, uint64_t,
+ bool fixupNeedsRelaxationAdvanced(const MCFixup &, const MCValue &, uint64_t,
bool) const override;
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
index bf525137298ac..d4015c351af11 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -178,8 +178,7 @@ class X86AsmBackend : public MCAsmBackend {
bool mayNeedRelaxation(const MCInst &Inst,
const MCSubtargetInfo &STI) const override;
- bool fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &, const MCValue &, uint64_t,
+ bool fixupNeedsRelaxationAdvanced(const MCFixup &, const MCValue &, uint64_t,
bool) const override;
void relaxInstruction(MCInst &Inst,
@@ -736,8 +735,7 @@ bool X86AsmBackend::mayNeedRelaxation(const MCInst &MI,
MI.getOperand(MI.getNumOperands() - 1 - SkipOperands).isExpr());
}
-bool X86AsmBackend::fixupNeedsRelaxationAdvanced(const MCAssembler &,
- const MCFixup &Fixup,
+bool X86AsmBackend::fixupNeedsRelaxationAdvanced(const MCFixup &Fixup,
const MCValue &Target,
uint64_t Value,
bool Resolved) const {
More information about the llvm-commits
mailing list