[lld] 47eb3f1 - [ELF] Ensure output section is not discarded in addStartEndSymbols()

[Andrew Ng via llvm-commits]

Author: Andrew Ng
Date: 2021-11-19T11:45:58Z
New Revision: 47eb3f155f9e7b2670b8e0f8a85c64f31ea39fa4

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

LOG: [ELF] Ensure output section is not discarded in addStartEndSymbols()

Fixes https://bugs.llvm.org/show_bug.cgi?id=52534.

Differential Revision: https://reviews.llvm.org/D114179

Added: 
    lld/test/ELF/linkerscript/preinit-array-empty.test

Modified: 
    lld/ELF/LinkerScript.cpp
    lld/ELF/LinkerScript.h
    lld/ELF/Writer.cpp

Removed: 
    


################################################################################
diff  --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index dcc7ebb2a293f..f332b03d757df 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -1034,7 +1034,7 @@ void LinkerScript::assignOffsets(OutputSection *sec) {
   }
 }
 
-static bool isDiscardable(OutputSection &sec) {
+static bool isDiscardable(const OutputSection &sec) {
   if (sec.name == "/DISCARD/")
     return true;
 
@@ -1063,6 +1063,11 @@ static bool isDiscardable(OutputSection &sec) {
   return true;
 }
 
+bool LinkerScript::isDiscarded(const OutputSection *sec) const {
+  return hasSectionsCommand && (getFirstInputSection(sec) == nullptr) &&
+         isDiscardable(*sec);
+}
+
 static void maybePropagatePhdrs(OutputSection &sec,
                                 std::vector<StringRef> &phdrs) {
   if (sec.phdrs.empty()) {

diff  --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h
index e6fec026d7eb4..b366da4f274ee 100644
--- a/lld/ELF/LinkerScript.h
+++ b/lld/ELF/LinkerScript.h
@@ -318,6 +318,8 @@ class LinkerScript final {
   void processSymbolAssignments();
   void declareSymbols();
 
+  bool isDiscarded(const OutputSection *sec) const;
+
   // Used to handle INSERT AFTER statements.
   void processInsertCommands();
 

diff  --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 19a71ad9c1195..6d97852aec434 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -2276,7 +2276,7 @@ template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {
     Default = Out::elfHeader;
 
   auto define = [=](StringRef start, StringRef end, OutputSection *os) {
-    if (os) {
+    if (os && !script->isDiscarded(os)) {
       addOptionalRegular(start, os, 0);
       addOptionalRegular(end, os, -1);
     } else {

diff  --git a/lld/test/ELF/linkerscript/preinit-array-empty.test b/lld/test/ELF/linkerscript/preinit-array-empty.test
new file mode 100644
index 0000000000000..696c8ddb622dd
--- /dev/null
+++ b/lld/test/ELF/linkerscript/preinit-array-empty.test
@@ -0,0 +1,39 @@
+# REQUIRES: x86
+# RUN: split-file %s %t
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %t/t.s -o %t.o
+
+## PR52534: https://bugs.llvm.org/show_bug.cgi?id=52534
+## Check case where .preinit_array is discarded.
+## Link should succeed without causing an out of range relocation error.
+# RUN: ld.lld -T %t/discarded.script %t.o -o %t1 --image-base=0x80000000
+# RUN: llvm-readelf -s %t1 | FileCheck --check-prefixes=CHECK,DISCARDED %s
+
+## Check case where .preinit_array is emitted but empty.
+# RUN: ld.lld -T %t/empty.script %t.o -o %t2
+# RUN: llvm-readelf -s %t2 | FileCheck --check-prefixes=CHECK,EMPTY %s
+
+# CHECK:          [[#%x,ADDR:]] 0 NOTYPE  LOCAL  HIDDEN      [[#]] __preinit_array_start
+# CHECK-NEXT:     [[#ADDR]]     0 NOTYPE  LOCAL  HIDDEN      [[#]] __preinit_array_end
+
+# DISCARDED-NEXT: [[#ADDR]]     0 NOTYPE  GLOBAL DEFAULT     [[#]] _start
+
+# EMPTY-NOT:      [[#ADDR]]     0 NOTYPE  GLOBAL DEFAULT     [[#]] _start
+# EMPTY:          [[#ADDR]]     0 NOTYPE  GLOBAL DEFAULT     [[#]] ADDR
+
+#--- t.s
+.global _start
+_start:
+ movq __preinit_array_start at GOTPCREL(%rip),%rax
+ movq __preinit_array_end at GOTPCREL(%rip),%rax
+
+#--- discarded.script
+SECTIONS {
+  .text : { *(.text); }
+  .preinit_array : { *(.preinit_array); }
+}
+
+#--- empty.script
+SECTIONS {
+  .text : { *(.text); }
+  .preinit_array : { ADDR = .; *(.preinit_array); }
+}