[PATCH] D104607: [lld-macho] Have inputOrder default to less than INT_MAX

[Jez Ng via Phabricator via llvm-commits]

int3 updated this revision to Diff 353246.
int3 added a comment.

style


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D104607

Files:
  lld/MachO/Driver.cpp
  lld/MachO/OutputSection.h
  lld/MachO/OutputSegment.h


Index: lld/MachO/OutputSegment.h
===================================================================
--- lld/MachO/OutputSegment.h
+++ lld/MachO/OutputSegment.h
@@ -51,7 +51,7 @@
   uint64_t fileOff = 0;
   uint64_t fileSize = 0;
   uint64_t vmSize = 0;
-  int inputOrder = std::numeric_limits<int>::max();
+  int inputOrder = UnspecifiedInputOrder;
   StringRef name;
   uint32_t maxProt = 0;
   uint32_t initProt = 0;
Index: lld/MachO/OutputSection.h
===================================================================
--- lld/MachO/OutputSection.h
+++ lld/MachO/OutputSection.h
@@ -20,6 +20,12 @@
 class InputSection;
 class OutputSegment;
 
+// The default order value for OutputSections that are not constructed from
+// InputSections (i.e. SyntheticSections). We make it less than INT_MAX in order
+// not to conflict with the ordering of zerofill sections, which must always be
+// placed at the end of their segment.
+constexpr int UnspecifiedInputOrder = std::numeric_limits<int>::max() - 1024;
+
 // Output sections represent the finalized sections present within the final
 // linked executable. They can represent special sections (like the symbol
 // table), or represent coalesced sections from the various inputs given to the
@@ -61,7 +67,7 @@
   // For output sections that don't have explicit ordering requirements, their
   // output order should be based on the order of the input sections they
   // contain.
-  int inputOrder = std::numeric_limits<int>::max();
+  int inputOrder = UnspecifiedInputOrder;
 
   uint32_t index = 0;
   uint64_t addr = 0;
Index: lld/MachO/Driver.cpp
===================================================================
--- lld/MachO/Driver.cpp
+++ lld/MachO/Driver.cpp
@@ -1341,6 +1341,7 @@
           }
         }
       }
+      assert(inputSections.size() < UnspecifiedInputOrder);
     }
 
     if (config->deadStrip)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D104607.353246.patch
Type: text/x-patch
Size: 1871 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210620/1397dd3b/attachment.bin>