[PATCH] D24870: [ELF] Don't crash in GC mode when linker script is used and .debug_lines section is present

[Eugene Leviant via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL282393: Linkerscript: don't crash when GC .debug_line (authored by evgeny777).

Changed prior to commit:
  https://reviews.llvm.org/D24870?vs=72290&id=72450#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D24870

Files:
  lld/trunk/ELF/MarkLive.cpp
  lld/trunk/test/ELF/linkerscript/Inputs/comdat-gc.s
  lld/trunk/test/ELF/linkerscript/comdat-gc.s

Index: lld/trunk/ELF/MarkLive.cpp
===================================================================
--- lld/trunk/ELF/MarkLive.cpp
+++ lld/trunk/ELF/MarkLive.cpp
@@ -81,13 +81,6 @@
 template <class ELFT>
 static void forEachSuccessor(InputSection<ELFT> &Sec,
                              std::function<void(ResolvedReloc<ELFT>)> Fn) {
-  // Skip over discarded sections. This in theory shouldn't happen, because
-  // the ELF spec doesn't allow a relocation to point to a deduplicated
-  // COMDAT section directly. Unfortunately this happens in practice (e.g.
-  // .eh_frame) so we need to add a check.
-  if (&Sec == &InputSection<ELFT>::Discarded)
-    return;
-
   ELFFile<ELFT> &Obj = Sec.getFile()->getObj();
   for (const typename ELFT::Shdr *RelSec : Sec.RelocSections) {
     if (RelSec->sh_type == SHT_RELA) {
@@ -198,7 +191,11 @@
   SmallVector<InputSection<ELFT> *, 256> Q;
 
   auto Enqueue = [&](ResolvedReloc<ELFT> R) {
-    if (!R.Sec)
+    // Skip over discarded sections. This in theory shouldn't happen, because
+    // the ELF spec doesn't allow a relocation to point to a deduplicated
+    // COMDAT section directly. Unfortunately this happens in practice (e.g.
+    // .eh_frame) so we need to add a check.
+    if (!R.Sec || R.Sec == &InputSection<ELFT>::Discarded)
       return;
 
     // Usually, a whole section is marked as live or dead, but in mergeable
Index: lld/trunk/test/ELF/linkerscript/comdat-gc.s
===================================================================
--- lld/trunk/test/ELF/linkerscript/comdat-gc.s
+++ lld/trunk/test/ELF/linkerscript/comdat-gc.s
@@ -0,0 +1,14 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/comdat-gc.s -o %t1
+# RUN: echo "SECTIONS { .text : { *(.text*) } }" > %t.script
+# RUN: ld.lld --gc-sections --script %t.script %t %t1 -o %t2
+# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC1 %s
+
+# GC1:     Name: .debug_line
+
+.file 1 "test/ELF/linkerscript/comdat_gc.s"
+.section  .text._Z3fooIiEvv,"axG", at progbits,_Z3fooIiEvv,comdat
+.loc 1 14
+  ret
Index: lld/trunk/test/ELF/linkerscript/Inputs/comdat-gc.s
===================================================================
--- lld/trunk/test/ELF/linkerscript/Inputs/comdat-gc.s
+++ lld/trunk/test/ELF/linkerscript/Inputs/comdat-gc.s
@@ -0,0 +1,5 @@
+.file 1 "test/ELF/linkerscript/Inputs/comdat_gc.s"
+
+.section  .text._Z3fooIiEvv,"axG", at progbits,_Z3fooIiEvv,comdat
+.loc 1 5
+  ret


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D24870.72450.patch
Type: text/x-patch
Size: 2544 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160926/3eb33a13/attachment.bin>