[lld] r323993 - Sort each InputSectionDescription individually.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Thu Feb  1 11:30:15 2018
New Revision: 323993

URL: http://llvm.org/viewvc/llvm-project?rev=323993&view=rev
Log:
Sort each InputSectionDescription individually.

This fixes pr36190.

Thanks to James Henderson for the testcase and for pointing out how to
fix this.

Modified:
    lld/trunk/ELF/OutputSections.cpp
    lld/trunk/test/ELF/linkerscript/symbol-ordering-file.s

Modified: lld/trunk/ELF/OutputSections.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=323993&r1=323992&r2=323993&view=diff
==============================================================================
--- lld/trunk/ELF/OutputSections.cpp (original)
+++ lld/trunk/ELF/OutputSections.cpp Thu Feb  1 11:30:15 2018
@@ -160,9 +160,9 @@ bool OutputSection::classof(const BaseCo
 
 void OutputSection::sort(std::function<int(InputSectionBase *S)> Order) {
   assert(Live);
-  assert(SectionCommands.size() == 1);
-  sortByOrder(cast<InputSectionDescription>(SectionCommands[0])->Sections,
-              Order);
+  for (BaseCommand *B : SectionCommands)
+    if (auto *ISD = dyn_cast<InputSectionDescription>(B))
+      sortByOrder(ISD->Sections, Order);
 }
 
 // Fill [Buf, Buf + Size) with Filler.

Modified: lld/trunk/test/ELF/linkerscript/symbol-ordering-file.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/symbol-ordering-file.s?rev=323993&r1=323992&r2=323993&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/symbol-ordering-file.s (original)
+++ lld/trunk/test/ELF/linkerscript/symbol-ordering-file.s Thu Feb  1 11:30:15 2018
@@ -18,6 +18,12 @@
 # RUN: ld.lld --symbol-ordering-file %t.ord %t.o --script %t2.script -o %t3.out
 # RUN: llvm-objdump -s %t3.out| FileCheck %s --check-prefix=AFTER
 
+# RUN: echo "SECTIONS { .foo : { BYTE(0x33); *(.foo); BYTE(0x44) } }" > %t3.script
+# RUN: ld.lld --symbol-ordering-file %t.ord %t.o --script %t3.script -o %t4.out
+# RUN: llvm-objdump -s %t4.out| FileCheck %s --check-prefix=COMMANDS
+# COMMANDS: Contents of section .foo:
+# COMMANDS-NEXT:  33221144
+
 .section .foo,"ax", at progbits,unique,1
 _foo1:
  .byte 0x11