[llvm] 7117dea - AsmPrinter: Remove ELF's special lowerRelativeReference for unnamed_addr function; use lowerDSOLocalEquivalent in more cases
via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 8 10:11:23 PDT 2025
Author: Fangrui Song
Date: 2025-04-08T10:11:20-07:00
New Revision: 7117dea043d39912dc41aaeba9c3186486b9b867
URL: https://github.com/llvm/llvm-project/commit/7117dea043d39912dc41aaeba9c3186486b9b867
DIFF: https://github.com/llvm/llvm-project/commit/7117dea043d39912dc41aaeba9c3186486b9b867.diff
LOG: AsmPrinter: Remove ELF's special lowerRelativeReference for unnamed_addr function; use lowerDSOLocalEquivalent in more cases
https://reviews.llvm.org/D17938 introduced lowerRelativeReference to
give ConstantExpr sub (A-B) special semantics in ELF: when `A` is an
`unnamed_addr` function, create a PLT-generating relocation. This was
intended for C++ relative vtables, but C++ relative vtable ended up
using DSOLocalEquivalent (lowerDSOLocalEquivalent).
This special treatment of `unnamed_addr` seems unusual.
Let's remove it. Only COFF needs an overload to generate a @IMGREL32
relocation specifier (llvm/test/MC/COFF/cross-section-relative.ll).
Pull Request: https://github.com/llvm/llvm-project/pull/134781
Added:
llvm/test/CodeGen/ARM/relative-reloc.ll
llvm/test/CodeGen/RISCV/relative-reloc.ll
llvm/test/CodeGen/X86/relative-reloc-32.ll
llvm/test/CodeGen/X86/relative-reloc-64.ll
Modified:
llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
llvm/test/CodeGen/RISCV/dso_local_equivalent.ll
llvm/test/CodeGen/X86/dso_local_equivalent.ll
llvm/test/CodeGen/X86/relptr-rodata.ll
Removed:
llvm/test/CodeGen/ARM/plt-relative-reloc.ll
llvm/test/CodeGen/RISCV/plt-relative-reloc.ll
llvm/test/CodeGen/X86/x86-64-plt-relative-reloc.ll
llvm/test/CodeGen/X86/x86-plt-relative-reloc.ll
################################################################################
diff --git a/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h b/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
index af8d73b4fa064..fa6cb75338d4f 100644
--- a/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
+++ b/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
@@ -125,10 +125,6 @@ class TargetLoweringObjectFileELF : public TargetLoweringObjectFile {
lowerSymbolDifference(const MCSymbol *LHS, const MCSymbol *RHS,
int64_t Addend,
std::optional<int64_t> PCRelativeOffset) const;
- const MCExpr *lowerRelativeReference(const GlobalValue *LHS,
- const GlobalValue *RHS, int64_t Addend,
- std::optional<int64_t> PCRelativeOffset,
- const TargetMachine &TM) const override;
const MCExpr *lowerDSOLocalEquivalent(const MCSymbol *LHS,
const MCSymbol *RHS, int64_t Addend,
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index d245cd75745d0..cf8f1c878ea5a 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -3496,10 +3496,12 @@ const MCExpr *AsmPrinter::lowerConstant(const Constant *CV,
LHSGV, RHSGV, Addend, PCRelativeOffset, TM);
// (ELF-specific) If the generic symbol
diff erence does not apply, and
- // LHS is a dso_local_equivalent of a dso_preemptable function,
- // reference the PLT entry instead.
- if (DSOEquiv && TM.getTargetTriple().isOSBinFormatELF() &&
- !(LHSGV->isDSOLocal() || LHSGV->isImplicitDSOLocal()))
+ // LHS is a dso_local_equivalent of a function, reference the PLT entry
+ // instead. Note: A default visibility symbol is by default preemptible
+ // during linking, and should not be referenced with PC-relative
+ // relocations. Therefore, use a PLT relocation even if the function is
+ // dso_local.
+ if (DSOEquiv && TM.getTargetTriple().isOSBinFormatELF())
Res = getObjFileLowering().lowerDSOLocalEquivalent(
LHSSym, RHSSym, Addend, PCRelativeOffset, TM);
diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index 4c20c5dc74d9a..c9415292e88f7 100644
--- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -1233,24 +1233,6 @@ const MCExpr *TargetLoweringObjectFileELF::lowerSymbolDifference(
return Res;
}
-const MCExpr *TargetLoweringObjectFileELF::lowerRelativeReference(
- const GlobalValue *LHS, const GlobalValue *RHS, int64_t Addend,
- std::optional<int64_t> PCRelativeOffset, const TargetMachine &TM) const {
- // We may only use a PLT-relative relocation to refer to unnamed_addr
- // functions.
- if (!LHS->hasGlobalUnnamedAddr() || !LHS->getValueType()->isFunctionTy())
- return nullptr;
-
- // Basic correctness checks.
- if (LHS->getType()->getPointerAddressSpace() != 0 ||
- RHS->getType()->getPointerAddressSpace() != 0 || LHS->isThreadLocal() ||
- RHS->isThreadLocal())
- return nullptr;
-
- return lowerSymbolDifference(TM.getSymbol(LHS), TM.getSymbol(RHS), Addend,
- PCRelativeOffset);
-}
-
// Reference the PLT entry of a function, optionally with a subtrahend (`RHS`).
const MCExpr *TargetLoweringObjectFileELF::lowerDSOLocalEquivalent(
const MCSymbol *LHS, const MCSymbol *RHS, int64_t Addend,
diff --git a/llvm/test/CodeGen/ARM/plt-relative-reloc.ll b/llvm/test/CodeGen/ARM/relative-reloc.ll
similarity index 78%
rename from llvm/test/CodeGen/ARM/plt-relative-reloc.ll
rename to llvm/test/CodeGen/ARM/relative-reloc.ll
index ede891900e6d0..65053726e66bf 100644
--- a/llvm/test/CodeGen/ARM/plt-relative-reloc.ll
+++ b/llvm/test/CodeGen/ARM/relative-reloc.ll
@@ -10,7 +10,8 @@ declare void @fn1() unnamed_addr
declare void @fn2() unnamed_addr
declare void @fn3()
+;; Create a PC-relative relocation that the linker might decline if the addend symbol is preemptible.
; CHECK: .long 0
-; CHECK-NEXT: .long fn1(prel31)-vtable-4
-; CHECK-NEXT: .long fn2(prel31)-vtable-4
+; CHECK-NEXT: .long fn1-vtable-4
+; CHECK-NEXT: .long fn2-vtable-4
; CHECK-NEXT: .long fn3-vtable-4
diff --git a/llvm/test/CodeGen/RISCV/dso_local_equivalent.ll b/llvm/test/CodeGen/RISCV/dso_local_equivalent.ll
index e5e69b7bfe13b..daf46fa699b0f 100644
--- a/llvm/test/CodeGen/RISCV/dso_local_equivalent.ll
+++ b/llvm/test/CodeGen/RISCV/dso_local_equivalent.ll
@@ -26,9 +26,9 @@ declare void @extern_func()
; CHECK-NEXT: .word 0 # 0x0
; CHECK-NEXT: .word %pltpcrel(f0)
; CHECK-NEXT: .word %pltpcrel(f1+4)
-; CHECK-NEXT: .word f2-_ZTV1B-8
+; CHECK-NEXT: .word %pltpcrel(f2+8)
; CHECK-NEXT: .word %pltpcrel(f3+12)
-; CHECK-NEXT: .word f4-_ZTV1B-8
+; CHECK-NEXT: .word %pltpcrel(f4+16)
; CHECK-NEXT: .size _ZTV1B, 28
declare void @f0()
declare void @f1()
diff --git a/llvm/test/CodeGen/RISCV/plt-relative-reloc.ll b/llvm/test/CodeGen/RISCV/relative-reloc.ll
similarity index 84%
rename from llvm/test/CodeGen/RISCV/plt-relative-reloc.ll
rename to llvm/test/CodeGen/RISCV/relative-reloc.ll
index d2dceb773b2e9..6c94b9fce9308 100644
--- a/llvm/test/CodeGen/RISCV/plt-relative-reloc.ll
+++ b/llvm/test/CodeGen/RISCV/relative-reloc.ll
@@ -12,10 +12,11 @@ declare void @fn2() unnamed_addr
declare void @fn3()
@global4 = external unnamed_addr global i8
+;; Create a PC-relative relocation that the linker might decline if the addend symbol is preemptible.
; CHECK: vtable:
; CHECK-NEXT: .word 0 # 0x0
-; CHECK-NEXT: .word %pltpcrel(fn1)
-; CHECK-NEXT: .word %pltpcrel(fn2+4)
+; CHECK-NEXT: .word fn1-vtable-4
+; CHECK-NEXT: .word fn2-vtable-4
; CHECK-NEXT: .word fn3-vtable-4
; CHECK-NEXT: .word global4-vtable-4
; CHECK-NEXT: .size vtable, 20
diff --git a/llvm/test/CodeGen/X86/dso_local_equivalent.ll b/llvm/test/CodeGen/X86/dso_local_equivalent.ll
index ed31f62d5a750..c609042fad030 100644
--- a/llvm/test/CodeGen/X86/dso_local_equivalent.ll
+++ b/llvm/test/CodeGen/X86/dso_local_equivalent.ll
@@ -207,11 +207,27 @@ define void @call_no_name_extern() {
declare hidden void @0()
declare void @1()
+declare void @forward_extern_func()
;; Note that we keep this at the very end because llc emits this after all the
;; functions.
-; CHECK: const:
-; CHECK: .long forward_extern_func at PLT
- at const = constant i32 trunc (i64 ptrtoint (ptr dso_local_equivalent @forward_extern_func to i64) to i32)
-
-declare void @forward_extern_func()
+; CHECK-LABEL: _ZTV1B:
+; CHECK: .long 0
+; CHECK-NEXT: .long 0
+; CHECK-NEXT: .long f0 at PLT-_ZTV1B-8
+; CHECK-NEXT: .long f1 at PLT-_ZTV1B-8
+; CHECK-NEXT: .long f2 at PLT-_ZTV1B-8
+
+ at _ZTV1B = dso_local constant { [5 x i32] } { [5 x i32] [
+ i32 0,
+ i32 0,
+ i32 trunc (i64 sub (i64 ptrtoint (ptr dso_local_equivalent @f0 to i64), i64 ptrtoint (ptr getelementptr inbounds ({ [7 x i32] }, ptr @_ZTV1B, i32 0, i32 0, i32 2) to i64)) to i32),
+ i32 trunc (i64 sub (i64 ptrtoint (ptr dso_local_equivalent @f1 to i64), i64 ptrtoint (ptr getelementptr inbounds ({ [7 x i32] }, ptr @_ZTV1B, i32 0, i32 0, i32 2) to i64)) to i32),
+ i32 trunc (i64 sub (i64 ptrtoint (ptr dso_local_equivalent @f2 to i64), i64 ptrtoint (ptr getelementptr inbounds ({ [7 x i32] }, ptr @_ZTV1B, i32 0, i32 0, i32 2) to i64)) to i32)
+] }
+
+declare void @f0()
+declare void @f1()
+define dso_local void @f2() {
+ ret void
+}
diff --git a/llvm/test/CodeGen/X86/x86-plt-relative-reloc.ll b/llvm/test/CodeGen/X86/relative-reloc-32.ll
similarity index 89%
rename from llvm/test/CodeGen/X86/x86-plt-relative-reloc.ll
rename to llvm/test/CodeGen/X86/relative-reloc-32.ll
index d5e80285b160d..7d0b1fd546a00 100644
--- a/llvm/test/CodeGen/X86/x86-plt-relative-reloc.ll
+++ b/llvm/test/CodeGen/X86/relative-reloc-32.ll
@@ -11,6 +11,6 @@ declare void @fn2() unnamed_addr
declare void @fn3()
; CHECK: .long 0
-; CHECK-NEXT: .long fn1 at PLT-vtable-4
-; CHECK-NEXT: .long fn2 at PLT-vtable-4
+; CHECK-NEXT: .long fn1-vtable-4
+; CHECK-NEXT: .long fn2-vtable-4
; CHECK-NEXT: .long fn3-vtable-4
diff --git a/llvm/test/CodeGen/X86/x86-64-plt-relative-reloc.ll b/llvm/test/CodeGen/X86/relative-reloc-64.ll
similarity index 84%
rename from llvm/test/CodeGen/X86/x86-64-plt-relative-reloc.ll
rename to llvm/test/CodeGen/X86/relative-reloc-64.ll
index 54736c94af248..6f88edfa075b8 100644
--- a/llvm/test/CodeGen/X86/x86-64-plt-relative-reloc.ll
+++ b/llvm/test/CodeGen/X86/relative-reloc-64.ll
@@ -12,8 +12,9 @@ declare void @fn2() unnamed_addr
declare void @fn3()
@global4 = external unnamed_addr global i8
+;; Create a PC-relative relocation that the linker might decline if the addend symbol is preemptible.
; CHECK: .long 0
-; CHECK-NEXT: .long fn1 at PLT-vtable-4
-; CHECK-NEXT: .long fn2 at PLT-vtable-4
+; CHECK-NEXT: .long fn1-vtable-4
+; CHECK-NEXT: .long fn2-vtable-4
; CHECK-NEXT: .long fn3-vtable-4
; CHECK-NEXT: .long global4-vtable-4
diff --git a/llvm/test/CodeGen/X86/relptr-rodata.ll b/llvm/test/CodeGen/X86/relptr-rodata.ll
index 878151efccc3b..ea22b081ba865 100644
--- a/llvm/test/CodeGen/X86/relptr-rodata.ll
+++ b/llvm/test/CodeGen/X86/relptr-rodata.ll
@@ -24,7 +24,7 @@ target triple = "x86_64-unknown-linux-gnu"
; CHECK-NEXT: .globl obj
; CHECK: obj:
; CHECK: .long 0
-; CHECK: .long hidden_func-obj-4
+; CHECK: .long hidden_func at PLT-obj-4
declare hidden void @hidden_func()
More information about the llvm-commits
mailing list