[PATCH] D75966: [ELF] Move --print-map(-M)/--cref before checkSections() and openFile()

[Fangrui Song via Phabricator via llvm-commits]

MaskRay updated this revision to Diff 249519.
MaskRay retitled this revision from "[ELF] Move --print-map(-M)/--cref before openFile()" to "[ELF] Move --print-map(-M)/--cref before checkSections() and openFile()".
MaskRay added a comment.

Move -M/--cref before checkSections()


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D75966

Files:
  lld/ELF/Writer.cpp
  lld/test/ELF/linkerscript/output-too-large.s


Index: lld/test/ELF/linkerscript/output-too-large.s
===================================================================
--- lld/test/ELF/linkerscript/output-too-large.s
+++ lld/test/ELF/linkerscript/output-too-large.s
@@ -1,12 +1,26 @@
 # REQUIRES: x86
 
-# RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
-# RUN: echo "SECTIONS { .text : { . = 0xffffffff; *(.text*); } }" > %t.script
-# RUN: not ld.lld --no-check-sections --script %t.script %t.o -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686 %s -o %t1.o
+# RUN: echo "SECTIONS { .text : { . = 0xffffffff; *(.text*); } }" > %t1.script
+# RUN: not ld.lld --no-check-sections -T %t1.script %t1.o -o /dev/null 2>&1 | FileCheck %s
 
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-# RUN: echo "SECTIONS { .text : { . = 0x8fffffffffffffff; *(.text*); } }" > %t.script
-# RUN: not ld.lld --no-check-sections --script %t.script %t.o -o /dev/null 2>&1 | FileCheck %s
+# RUN: not ld.lld -T %t1.script %t1.o -M -o /dev/null 2>&1 | \
+# RUN:   FileCheck --check-prefixes=MAP1 %s
+
+# MAP1:           VMA      LMA     Size Align Out     In      Symbol
+# MAP1-NEXT:        0        0 100000001     4 .text
+# MAP1-NEXT:        0        0 ffffffff     1         . = 0xffffffff
+# MAP1-NEXT: 100000000 100000000        1     4         {{.*}}.o:(.text)
+# MAP1:      error: section .text at 0x0 of size 0x100000001 exceeds available address space
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t2.o
+# RUN: echo "SECTIONS { .text : { . = 0x8fffffffffffffff; *(.text*); } }" > %t2.script
+# RUN: not ld.lld -T %t2.script -M %t2.o -o /dev/null 2>&1 | \
+# RUN:   FileCheck --check-prefixes=MAP2,CHECK %s
+
+# MAP2:                   VMA              LMA     Size Align Out     In      Symbol
+# MAP2:      9000000000000000 9000000000000000        1     4         {{.*}}.o:(.text)
+# MAP2-NEXT: 9000000000000000 9000000000000000        0     1                 _start
 
 # CHECK: error: output file too large
 
Index: lld/ELF/Writer.cpp
===================================================================
--- lld/ELF/Writer.cpp
+++ lld/ELF/Writer.cpp
@@ -595,6 +595,12 @@
     for (OutputSection *sec : outputSections)
       sec->addr = 0;
 
+  // Handle --print-map(-M)/--Map and --cref. Dump them before checkSections()
+  // because the files may be useful in case checkSections() or openFile()
+  // fails, for example, due to an erroneous file size.
+  writeMapFile();
+  writeCrossReferenceTable();
+
   if (config->checkSections)
     checkSections();
 
@@ -621,12 +627,6 @@
   if (errorCount())
     return;
 
-  // Handle -Map and -cref options.
-  writeMapFile();
-  writeCrossReferenceTable();
-  if (errorCount())
-    return;
-
   if (auto e = buffer->commit())
     error("failed to write to the output file: " + toString(std::move(e)));
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75966.249519.patch
Type: text/x-patch
Size: 2865 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200310/5198b878/attachment.bin>