commit 2db635096bfbf7ff80f32bf6781885142d91c585
author Igor Kudrin <ikudrin@accesssoftek.com> Mon Nov 15 15:59:39 2021 +0700
committer Copybara-Service <copybara-worker@google.com> Mon Nov 15 01:04:23 2021 -0800
tree 0f945b1627d11f08d39f58c40c591ad11baa4cdd
parent b90edded301d20cbae35cf9c867d830a0140b5f8

[ELF] Do not try to assign a memory region to a non-allocatable section

Non-allocatable sections are not part of the memory image of the
program, so there is no need to find memory regions for them either
matching properties or handling explicit assignments. The early test
and return help to simplify LinkerScript::findMemoryRegion() a bit.

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

GitOrigin-RevId: 66691de94cd7b7b5d2d9ae1d12e99259a8eae5b1

ELF/LinkerScript.cpp

diff --git a/ELF/LinkerScript.cpp b/ELF/LinkerScript.cpp
index 1810d8a..415afef 100644
--- a/ELF/LinkerScript.cpp
+++ b/ELF/LinkerScript.cpp
@@ -887,6 +887,14 @@
 // subsequent call of this method.
 std::pair<MemoryRegion *, MemoryRegion *>
 LinkerScript::findMemoryRegion(OutputSection *sec, MemoryRegion *hint) {
+  // Non-allocatable sections are not part of the process image.
+  if (!(sec->flags & SHF_ALLOC)) {
+    if (!sec->memoryRegionName.empty())
+      warn("ignoring memory region assignment for non-allocatable section '" +
+           sec->name + "'");
+    return {nullptr, nullptr};
+  }
+
   // If a memory region name was specified in the output section command,
   // then try to find that region first.
   if (!sec->memoryRegionName.empty()) {
@@ -902,8 +910,8 @@
   if (memoryRegions.empty())
     return {nullptr, nullptr};
 
-  // An allocatable orphan section should continue the previous memory region.
-  if (sec->sectionIndex == UINT32_MAX && (sec->flags & SHF_ALLOC) && hint)
+  // An orphan section should continue the previous memory region.
+  if (sec->sectionIndex == UINT32_MAX && hint)
     return {hint, hint};
 
   // See if a region can be found by matching section flags.
@@ -914,8 +922,7 @@
   }
 
   // Otherwise, no suitable region was found.
-  if (sec->flags & SHF_ALLOC)
-    error("no memory region specified for section '" + sec->name + "'");
+  error("no memory region specified for section '" + sec->name + "'");
   return {nullptr, nullptr};
 }
 

test/ELF/linkerscript/memory-nonalloc.test

diff --git a/test/ELF/linkerscript/memory-nonalloc.test b/test/ELF/linkerscript/memory-nonalloc.test
new file mode 100644
index 0000000..ed9e2c3
--- /dev/null
+++ b/test/ELF/linkerscript/memory-nonalloc.test
@@ -0,0 +1,48 @@
+REQUIRES: x86
+
+RUN: split-file %s %ts
+RUN: llvm-mc -filetype=obj -triple=x86_64 %ts/s -o %t.o
+
+## Check that a non-allocatable section is not assigned to a memory region by
+## matching the section/region properties. Previously, that could lead to an
+## "error: section '.nonalloc' will not fit in region 'RAM'".
+
+RUN: ld.lld %t.o -T %ts/t --fatal-warnings -o /dev/null
+
+## Check that an explicit assignment is ignored for a non-allocatable section.
+## Previously, that also could lead to the same error.
+
+RUN: ld.lld %t.o -T %ts/t2 -o /dev/null 2>&1 | FileCheck %s --check-prefix=WARN
+
+WARN: warning: ignoring memory region assignment for non-allocatable section '.nonalloc'
+
+#--- s
+  .global _start
+_start:
+
+  ## Note: a "writable" section is used because lld does not fully support
+  ## memory region attribute "r" at the moment.
+  .section .nonalloc,"w"
+  .zero 0x1000
+
+#--- t
+MEMORY
+{
+  RAM (rwx) : ORIGIN = 0x8000, LENGTH = 0x100
+}
+
+SECTIONS
+{
+  .nonalloc : { *(.nonalloc) }
+}
+
+#--- t2
+MEMORY
+{
+  RAM (rwx) : ORIGIN = 0x8000, LENGTH = 0x100
+}
+
+SECTIONS
+{
+  .nonalloc : { *(.nonalloc) } > RAM
+}