[ELF] - Do not list sections explicitly for finalizeSynthetic()

[grimar]

Summary

That allows to add new synthetic sections and not worry
about updating one more list for finalization.

[ruiu]

ELF/Writer.cpp

1023–1043

This function probably should go away. You shouldn't call assignOffsets every time you finalize one synthetic section.

1030–1033

This comment doesn't seem to make much sense. You want to mention that dynamic symbols depends on other section contents so they need to be finalized later.

1035–1038

Remove this lambda and inline.

1172

finalizeSyntheticSections.

[grimar]

• Addressed review comments.

ELF/Writer.cpp

1023–1043

I think so. That is for another patch, this one did not change original logic here.

1030–1033

Fixed.

1035–1038

Done.

1172

Done.

[ruiu]

ELF/Writer.cpp

1023–1043

Can you do that in this patch too?

[grimar]

ELF/Writer.cpp

1023–1043

This patch is not about changing how we assign offsets, so I do not think that make sence in context of it.
I'll prepare different separate patch for that then and update this when it be landed.

[ruiu]

Please do that in this patch. If some change makes other part of code look too funny, this should be addressed at the same time.

ELF/Writer.cpp

if (BestPos != NonScriptI &&
       ++BestPos;
     std::rotate(BestPos, NonScriptI, NonScriptI + 1);
     ++NonScriptI;
   }
 
   Script<ELFT>::X->adjustSectionsAfterSorting();
 }
 
-template <class ELFT>
-static void finalizeSynthetic(const std::vector<SyntheticSection *> &Sections) {
-  for (SyntheticSection *SS : Sections)
-    if (SS && SS->OutSec && !SS->empty()) {
-      SS->finalizeContents();
-      SS->OutSec->template assignOffsets<ELFT>();
-    }
+template <class ELFT> static void finalizeSynthetic(SyntheticSection *SS) {
+  if (!SS || !SS->OutSec || SS->empty())
+    return;
+
+// Dynamic section must be the last one in this list because depends on
+// other section contents. Dynamic symbol table section must be the
+// first one for the same reasons. Dynamic string table also should go after
+// others because some sections may add strings there during finalizing.
+template <class ELFT> static void finalizeSyntheticSections() {
+  finalizeSynthetic<ELFT>(In<ELFT>::DynSymTab);
+  for (InputSectionBase *S : InputSections)
+    if (SyntheticSection *SS = dyn_cast<SyntheticSection>(S))
+      if (SS != In<ELFT>::DynSymTab && SS != In<ELFT>::Dynamic &&
+          SS != In<ELFT>::DynStrTab)
+        finalizeSynthetic<ELFT>(SS);
+  finalizeSynthetic<ELFT>(In<ELFT>::DynStrTab);
+  finalizeSynthetic<ELFT>(In<ELFT>::Dynamic);
 }
 
 // We need to add input synthetic sections early in createSyntheticSections()
 // to make them visible from linkescript side. But not all sections are always
 // required to be in output. For example we don't need dynamic section content
 // sometimes. This function filters out such unused sections from output.
 template <class ELFT>
 static void removeUnusedSyntheticSections(std::vector<OutputSection *> &V) {
   // All input synthetic sections that can be empty are placed after
if (In<ELFT>::DynSymTab)
     addRegular<ELFT>("_DYNAMIC", In<ELFT>::Dynamic, 0);
 
   // Define __rel[a]_iplt_{start,end} symbols if needed.
   addRelIpltSymbols();
 
   // This responsible for splitting up .eh_frame section into
   // pieces. The relocation scan uses those peaces, so this has to be
   // earlier.
-  finalizeSynthetic<ELFT>({In<ELFT>::EhFrame});
+  finalizeSynthetic<ELFT>(In<ELFT>::EhFrame);
 
   // Scan relocations. This must be done after every symbol is declared so that
   // we can correctly decide if a dynamic relocation is needed.
   forEachRelSec(scanRelocations<ELFT>);
 
   if (In<ELFT>::Plt && !In<ELFT>::Plt->empty())
     In<ELFT>::Plt->addSymbols();
   if (In<ELFT>::Iplt && !In<ELFT>::Iplt->empty())
if (Target->NeedsThunks)
     createThunks<ELFT>(OutputSections);
 
   // Fill other section headers. The dynamic table is finalized
   // at the end because some tags like RELSZ depend on result
   // of finalizing other sections.
   for (OutputSection *Sec : OutputSections)
     Sec->finalize<ELFT>();
 
-  // Dynamic section must be the last one in this list and dynamic
-  // symbol table section (DynSymTab) must be the first one.
-  finalizeSynthetic<ELFT>(
-      {In<ELFT>::DynSymTab, In<ELFT>::GnuHashTab, In<ELFT>::HashTab,
-       In<ELFT>::SymTab,    In<ELFT>::ShStrTab,   In<ELFT>::StrTab,
-       In<ELFT>::VerDef,    In<ELFT>::DynStrTab,  In<ELFT>::GdbIndex,
-       In<ELFT>::Got,       In<ELFT>::MipsGot,    In<ELFT>::IgotPlt,
-       In<ELFT>::GotPlt,    In<ELFT>::RelaDyn,    In<ELFT>::RelaIplt,
-       In<ELFT>::RelaPlt,   In<ELFT>::Plt,        In<ELFT>::Iplt,
-       In<ELFT>::Plt,       In<ELFT>::EhFrameHdr, In<ELFT>::VerSym,
-       In<ELFT>::VerNeed,   In<ELFT>::Dynamic});
+  finalizeSyntheticSections<ELFT>();
 }
 
 template <class ELFT> void Writer<ELFT>::addPredefinedSections() {
   // Add BSS sections.
   auto Add = [=](OutputSection *Sec) {
     if (!Sec->Sections.empty()) {
       Sec->assignOffsets<ELFT>();
       OutputSections.push_back(Sec);