From 2bfc488d34ef54d6d1b30facddcb097a953a6dfd Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 4 Jul 2025 16:30:07 -0700 Subject: [PATCH] X86MCCodeEmitter: Remove unneeded MCFixupKindInfo::FKF_IsPCRel --- bolt/lib/Target/X86/X86MCPlusBuilder.cpp | 2 +- .../Target/X86/MCTargetDesc/X86AsmBackend.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bolt/lib/Target/X86/X86MCPlusBuilder.cpp b/bolt/lib/Target/X86/X86MCPlusBuilder.cpp index a91fd146fa36..1c17fc3a1436 100644 --- a/bolt/lib/Target/X86/X86MCPlusBuilder.cpp +++ b/bolt/lib/Target/X86/X86MCPlusBuilder.cpp @@ -2444,7 +2444,7 @@ public: const uint64_t RelOffset = Fixup.getOffset(); uint32_t RelType; - if (FKI.Flags & MCFixupKindInfo::FKF_IsPCRel) { + if (Fixup.isPCRel()) { switch (FKI.TargetSize) { default: return std::nullopt; diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp index b56d8f2d2eb6..eedc81b8dfd7 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp @@ -623,17 +623,17 @@ std::optional X86AsmBackend::getFixupKind(StringRef Name) const { MCFixupKindInfo X86AsmBackend::getFixupKindInfo(MCFixupKind Kind) const { const static MCFixupKindInfo Infos[X86::NumTargetFixupKinds] = { // clang-format off - {"reloc_riprel_4byte", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, - {"reloc_riprel_4byte_movq_load", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, - {"reloc_riprel_4byte_movq_load_rex2", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, - {"reloc_riprel_4byte_relax", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, - {"reloc_riprel_4byte_relax_rex", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, - {"reloc_riprel_4byte_relax_rex2", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, - {"reloc_riprel_4byte_relax_evex", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, + {"reloc_riprel_4byte", 0, 32, 0}, + {"reloc_riprel_4byte_movq_load", 0, 32, 0}, + {"reloc_riprel_4byte_movq_load_rex2", 0, 32, 0}, + {"reloc_riprel_4byte_relax", 0, 32, 0}, + {"reloc_riprel_4byte_relax_rex", 0, 32, 0}, + {"reloc_riprel_4byte_relax_rex2", 0, 32, 0}, + {"reloc_riprel_4byte_relax_evex", 0, 32, 0}, {"reloc_signed_4byte", 0, 32, 0}, {"reloc_signed_4byte_relax", 0, 32, 0}, {"reloc_global_offset_table", 0, 32, 0}, - {"reloc_branch_4byte_pcrel", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, + {"reloc_branch_4byte_pcrel", 0, 32, 0}, // clang-format on };