[PATCH] D68087: [ELF] Set SectionBase::partition in processSectionCommands

[Fangrui Song via Phabricator via llvm-commits]

MaskRay created this revision.
MaskRay added reviewers: andrewng, grimar, peter.smith, ruiu.
Herald added subscribers: llvm-commits, arichardson, emaste.
Herald added a reviewer: espindola.
Herald added a project: LLVM.

Fixes PR43461 (regression caused by D67504 <https://reviews.llvm.org/D67504>)

The partition field of a SECTIONS specified section is not set after
D67504 <https://reviews.llvm.org/D67504>. The 0 value affects findSection() which checks if the partition
field is 1.

So, `Out::initArray = findSection(".init_array")` is null, and
DT_INIT_ARRAYSZ is not set.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D68087

Files:
  ELF/LinkerScript.cpp
  test/ELF/linkerscript/dynamic.s


Index: test/ELF/linkerscript/dynamic.s
===================================================================
--- test/ELF/linkerscript/dynamic.s
+++ test/ELF/linkerscript/dynamic.s
@@ -1,9 +1,13 @@
 # REQUIRES: x86
+
+## Test that DT_INIT_ARRAYSZ/DT_FINI_ARRAYSZ/DT_PREINIT_ARRAYSZ are computed
+## correctly, no matter their associated sections are orphans or not.
+
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-# RUN: ld.lld -shared %t2.o -o %t2.so
+# RUN: ld.lld -shared %t2.o -soname=so -o %t2.so
 
-# RUN: echo "SECTIONS { }" > %t.script
+# RUN: echo "SECTIONS { .init_array : { *(.init_array} } }" > %t.script
 # RUN: ld.lld %t1.o %t2.so -o %t
 # RUN: llvm-readobj --dynamic-table %t | FileCheck %s
 
Index: ELF/LinkerScript.cpp
===================================================================
--- ELF/LinkerScript.cpp
+++ ELF/LinkerScript.cpp
@@ -513,6 +513,11 @@
           s->alignment = subalign;
       }
 
+      // Set the partition field as what OutputSection::recordSection() does.
+      // Partitions cannot be used with the SECTIONS command, so this is always
+      // 1.
+      sec->partition = 1;
+
       sec->sectionIndex = i++;
     }
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68087.221953.patch
Type: text/x-patch
Size: 1279 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190926/c6bd620c/attachment.bin>