[llvm] 84841e2 - Revert "[MC] Restore MCAsmBackend::shouldForceRelocation to false"
JP Lehr via llvm-commits
llvm-commits at lists.llvm.org
Thu May 22 02:16:13 PDT 2025
Author: JP Lehr
Date: 2025-05-22T04:15:08-05:00
New Revision: 84841e2ffe911270713407ffba9e0fed7718be12
URL: https://github.com/llvm/llvm-project/commit/84841e2ffe911270713407ffba9e0fed7718be12
DIFF: https://github.com/llvm/llvm-project/commit/84841e2ffe911270713407ffba9e0fed7718be12.diff
LOG: Revert "[MC] Restore MCAsmBackend::shouldForceRelocation to false"
This reverts commit 6f6dc1f239433393c0b09430193beb85d03464c8.
Resulted in several bot failures.
Added:
Modified:
llvm/include/llvm/MC/MCAsmBackend.h
llvm/lib/MC/MCAsmBackend.cpp
llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCAsmBackend.h b/llvm/include/llvm/MC/MCAsmBackend.h
index 9eabacf2f7f10..27fdd23c88cf3 100644
--- a/llvm/include/llvm/MC/MCAsmBackend.h
+++ b/llvm/include/llvm/MC/MCAsmBackend.h
@@ -88,11 +88,10 @@ class MCAsmBackend {
/// Get information on a fixup kind.
virtual MCFixupKindInfo getFixupKindInfo(MCFixupKind Kind) const;
- // Hook used by the default `addReloc` to check if a relocation is needed.
+ // Hook to check if a relocation is needed. The default implementation tests
+ // whether the MCValue has a relocation specifier.
virtual bool shouldForceRelocation(const MCAssembler &, const MCFixup &,
- const MCValue &, const MCSubtargetInfo *) {
- return false;
- }
+ const MCValue &, const MCSubtargetInfo *);
/// Hook to check if extra nop bytes must be inserted for alignment directive.
/// For some targets this may be necessary in order to support linker
diff --git a/llvm/lib/MC/MCAsmBackend.cpp b/llvm/lib/MC/MCAsmBackend.cpp
index 2dae9c0266722..0c43b2e473559 100644
--- a/llvm/lib/MC/MCAsmBackend.cpp
+++ b/llvm/lib/MC/MCAsmBackend.cpp
@@ -109,6 +109,12 @@ MCFixupKindInfo MCAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
return Builtins[Kind - FK_NONE];
}
+bool MCAsmBackend::shouldForceRelocation(const MCAssembler &, const MCFixup &,
+ const MCValue &Target,
+ const MCSubtargetInfo *) {
+ return Target.getSpecifier();
+}
+
bool MCAsmBackend::fixupNeedsRelaxationAdvanced(const MCAssembler &,
const MCFixup &Fixup,
const MCValue &, uint64_t Value,
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp b/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
index 9ef335a5af4a3..3ea8bede91ea4 100644
--- a/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
+++ b/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
@@ -200,6 +200,12 @@ namespace {
return Info;
}
+ bool shouldForceRelocation(const MCAssembler &, const MCFixup &,
+ const MCValue &,
+ const MCSubtargetInfo *) override {
+ return false;
+ }
+
void relaxInstruction(MCInst &Inst,
const MCSubtargetInfo &STI) const override {
// FIXME.
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp
index bbb405ff77068..58bb7baea1d47 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp
@@ -17,7 +17,6 @@
#include "llvm/MC/MCInst.h"
#include "llvm/MC/MCObjectWriter.h"
#include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/MC/MCValue.h"
using namespace llvm;
@@ -113,8 +112,6 @@ class SystemZMCAsmBackend : public MCAsmBackend {
// Override MCAsmBackend
std::optional<MCFixupKind> getFixupKind(StringRef Name) const override;
MCFixupKindInfo getFixupKindInfo(MCFixupKind Kind) const override;
- bool shouldForceRelocation(const MCAssembler &, const MCFixup &,
- const MCValue &, const MCSubtargetInfo *) override;
void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
const MCValue &Target, MutableArrayRef<char> Data,
uint64_t Value, bool IsResolved,
@@ -155,13 +152,6 @@ MCFixupKindInfo SystemZMCAsmBackend::getFixupKindInfo(MCFixupKind Kind) const {
return SystemZ::MCFixupKindInfos[Kind - FirstTargetFixupKind];
}
-bool SystemZMCAsmBackend::shouldForceRelocation(const MCAssembler &,
- const MCFixup &,
- const MCValue &Target,
- const MCSubtargetInfo *) {
- return Target.getSpecifier();
-}
-
void SystemZMCAsmBackend::applyFixup(const MCAssembler &Asm,
const MCFixup &Fixup,
const MCValue &Target,
More information about the llvm-commits
mailing list