[lld] 80743bd - [ELF] Fix /DISCARD/ .eh_frame regression after #179089
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 11 22:08:33 PST 2026
Author: Fangrui Song
Date: 2026-02-11T22:08:26-08:00
New Revision: 80743bd43fd5b38fedc503308e7a652e23d3ec93
URL: https://github.com/llvm/llvm-project/commit/80743bd43fd5b38fedc503308e7a652e23d3ec93
DIFF: https://github.com/llvm/llvm-project/commit/80743bd43fd5b38fedc503308e7a652e23d3ec93.diff
LOG: [ELF] Fix /DISCARD/ .eh_frame regression after #179089
When .eh_frame is discarded while .eh_frame_hdr is not, #179089 caused a
crash for `/DISCARD/ : { *(.eh_frame) }`.
Simplify the PT_GNU_EH_FRAME condition from https://reviews.llvm.org/D30885 (2017).
Added:
lld/test/ELF/linkerscript/discard-eh-frame.s
Modified:
lld/ELF/SyntheticSections.h
lld/ELF/Writer.cpp
Removed:
lld/test/ELF/linkerscript/pt_gnu_eh_frame.s
################################################################################
diff --git a/lld/ELF/SyntheticSections.h b/lld/ELF/SyntheticSections.h
index 64f0a477e2c23..1ae03dc24a2f2 100644
--- a/lld/ELF/SyntheticSections.h
+++ b/lld/ELF/SyntheticSections.h
@@ -53,7 +53,7 @@ class EhFrameSection final : public SyntheticSection {
EhFrameSection(Ctx &);
void writeTo(uint8_t *buf) override;
void finalizeContents() override;
- bool isNeeded() const override { return !sections.empty(); }
+ bool isNeeded() const override { return isLive() && !sections.empty(); }
size_t getSize() const override { return size; }
static bool classof(const SectionBase *d) {
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 2bdf833ed99eb..c84e4df767452 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -2455,8 +2455,7 @@ Writer<ELFT>::createPhdrs(Partition &part) {
ret.push_back(std::move(relRo));
// PT_GNU_EH_FRAME is a special section pointing on .eh_frame_hdr.
- if (part.ehFrame->isNeeded() && part.ehFrameHdr &&
- part.ehFrame->getParent() && part.ehFrameHdr->getParent())
+ if (part.ehFrameHdr && part.ehFrameHdr->isNeeded())
addHdr(PT_GNU_EH_FRAME, part.ehFrameHdr->getParent()->getPhdrFlags())
->add(part.ehFrameHdr->getParent());
diff --git a/lld/test/ELF/linkerscript/discard-eh-frame.s b/lld/test/ELF/linkerscript/discard-eh-frame.s
new file mode 100644
index 0000000000000..116ae7728d6a0
--- /dev/null
+++ b/lld/test/ELF/linkerscript/discard-eh-frame.s
@@ -0,0 +1,44 @@
+# REQUIRES: x86
+## Test discarding .eh_frame and/or .eh_frame_hdr.
+
+# RUN: rm -rf %t && split-file %s %t && cd %t
+# RUN: llvm-mc -filetype=obj -triple=x86_64 a.s -o a.o
+# RUN: ld.lld --eh-frame-hdr -T 1.lds a.o -o out1
+# RUN: llvm-readelf -Sl out1 | FileCheck %s
+# RUN: ld.lld --eh-frame-hdr -T 2.lds a.o -o out2
+# RUN: llvm-readelf -Sl out2 | FileCheck %s
+# RUN: ld.lld --eh-frame-hdr -T 3.lds a.o -o out3
+# RUN: llvm-readelf -Sl out3 | FileCheck %s --check-prefix=CHECK3
+
+# CHECK-NOT: .eh_frame
+# CHECK: .text
+# CHECK-NOT: .eh_frame
+
+# CHECK: Program Headers:
+# CHECK-NOT: PT_GNU_EH_FRAME
+
+# CHECK3-NOT: .eh_frame_hdr
+# CHECK3: .eh_frame PROGBITS
+# CHECK3-NOT: .eh_frame_hdr
+# CHECK3: Program Headers:
+# CHECK3-NOT: PT_GNU_EH_FRAME
+
+#--- a.s
+.global _start
+_start:
+ nop
+
+.section .dah,"ax", at progbits
+.cfi_startproc
+ nop
+.cfi_endproc
+
+#--- 1.lds
+## Regression test for https://github.com/llvm/llvm-project/pull/179089#issuecomment-3888507749
+SECTIONS { /DISCARD/ : { *(.eh_frame) } }
+
+#--- 2.lds
+SECTIONS { /DISCARD/ : { *(.eh_frame .eh_frame_hdr) } }
+
+#--- 3.lds
+SECTIONS { /DISCARD/ : { *(.eh_frame_hdr) } }
diff --git a/lld/test/ELF/linkerscript/pt_gnu_eh_frame.s b/lld/test/ELF/linkerscript/pt_gnu_eh_frame.s
deleted file mode 100644
index 7f9ebaa8d8d1e..0000000000000
--- a/lld/test/ELF/linkerscript/pt_gnu_eh_frame.s
+++ /dev/null
@@ -1,13 +0,0 @@
-# REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: echo "SECTIONS { /DISCARD/ : { *(.eh_frame*) *(.eh_frame_hdr*) } }" > %t.script
-# RUN: ld.lld -o /dev/null --eh-frame-hdr --script %t.script %t
-
-.global _start
-_start:
- nop
-
-.section .dah,"ax", at progbits
-.cfi_startproc
- nop
-.cfi_endproc
More information about the llvm-commits
mailing list