[llvm] c39d393 - ELFObjectWriter: Remove relocation specifier test from shouldRelocateWithSymbol

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-03-23T11:50:58-07:00
New Revision: c39d39303833c515f11921a96a97d668ed3fddf2

URL: https://github.com/llvm/llvm-project/commit/c39d39303833c515f11921a96a97d668ed3fddf2
DIFF: https://github.com/llvm/llvm-project/commit/c39d39303833c515f11921a96a97d668ed3fddf2.diff

LOG: ELFObjectWriter: Remove relocation specifier test from shouldRelocateWithSymbol

It's the decision of backend needsRelocateWithSymbol whether the
STT_SECTION adjustment should be suppressed.

test/MC/AArch64/data-directive-specifier.s demonstrates how to test this
property.

Added: 
    

Modified: 
    llvm/lib/MC/ELFObjectWriter.cpp
    llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 6fb67e63d5d0a..16eb0fb8df0b7 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -1257,21 +1257,6 @@ bool ELFObjectWriter::shouldRelocateWithSymbol(const MCAssembler &Asm,
   if (!RefA)
     return false;
 
-  MCSymbolRefExpr::VariantKind Kind = RefA->getKind();
-  switch (Kind) {
-  default:
-    break;
-
-  // These VariantKind cause the relocation to refer to something other than
-  // the symbol itself, like a linker generated table. Since the address of
-  // symbol is not relevant, we cannot replace the symbol with the
-  // section and patch the 
diff erence in the addend.
-  case MCSymbolRefExpr::VK_GOT:
-  case MCSymbolRefExpr::VK_PLT:
-  case MCSymbolRefExpr::VK_GOTPCREL:
-    return true;
-  }
-
   // An undefined symbol is not in any section, so the relocation has to point
   // to the symbol itself.
   assert(Sym && "Expected a symbol");

diff  --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
index 19d04b4e83c23..51ee4aa069039 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
@@ -543,7 +543,10 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
 bool AArch64ELFObjectWriter::needsRelocateWithSymbol(const MCValue &Val,
                                                      const MCSymbol &,
                                                      unsigned) const {
-  return (Val.getRefKind() & AArch64MCExpr::VK_GOT) == AArch64MCExpr::VK_GOT;
+  if ((Val.getRefKind() & AArch64MCExpr::VK_GOT) == AArch64MCExpr::VK_GOT)
+    return true;
+  return is_contained({MCSymbolRefExpr::VK_GOTPCREL, MCSymbolRefExpr::VK_PLT},
+                      Val.getAccessVariant());
 }
 
 std::unique_ptr<MCObjectTargetWriter>