[PATCH] D65722: [ELF] Expand regions for gaps due to explicit address

[Gabriel Smith via Phabricator via llvm-commits]

yodaldevoid updated this revision to Diff 213516.

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65722/new/

https://reviews.llvm.org/D65722

Files:
  lld/ELF/LinkerScript.cpp
  lld/test/ELF/linkerscript/memory-gap-explicit-expr.test


Index: lld/test/ELF/linkerscript/memory-gap-explicit-expr.test
===================================================================
--- /dev/null
+++ lld/test/ELF/linkerscript/memory-gap-explicit-expr.test
@@ -0,0 +1,18 @@
+# REQUIRES: x86
+
+# RUN: echo '.section .aaa, "a"; .quad 0; .section .bbb, "a"; .quad 0;' \
+# RUN:   | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t.o
+# RUN: ld.lld %t.o --script %s -o %t
+
+# RUN: llvm-readelf -S %t | FileCheck %s
+# CHECK: .aaa_s PROGBITS 0000000000000000 001000 000008
+# CHECK: .bbb_s PROGBITS 0000000000000014 001014 000008
+
+MEMORY {
+  REGION (rwx) : ORIGIN = 0x0000, LENGTH = 0x100
+}
+
+SECTIONS {
+  .aaa_s 0 : { *(.aaa) } > REGION
+  .bbb_s 0x14 : { *(.bbb) } > REGION
+}
Index: lld/ELF/LinkerScript.cpp
===================================================================
--- lld/ELF/LinkerScript.cpp
+++ lld/ELF/LinkerScript.cpp
@@ -772,6 +772,15 @@
   if ((sec->flags & SHF_ALLOC) && sec->addrExpr)
     setDot(sec->addrExpr, sec->location, false);
 
+  // If the address of the section has been moved forward by an explicit
+  // expression so that it now starts past the current curPos of the enclosing
+  // region, we need to expand the current region to account for the space
+  // between the previous section, if any, and the start of this section.
+  if (ctx->memRegion && ctx->memRegion->curPos < dot) {
+    expandMemoryRegion(ctx->memRegion, dot - ctx->memRegion->curPos,
+                       ctx->memRegion->name, sec->name);
+  }
+
   switchTo(sec);
 
   if (sec->lmaExpr)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65722.213516.patch
Type: text/x-patch
Size: 1554 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190806/fb2ea02a/attachment.bin>