commit a55b86c0e5eca17b382c8bbe207bcc95be825887
author Rafael Espindola <rafael.espindola@gmail.com> Thu Feb 23 00:02:03 2017 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Feb 23 00:02:03 2017 +0000
tree ed51730f363adb6107fa54e40815ef1bb96a280c
parent 79a45db7f5752be9fd1f4f718c7ac90a70972662

Reduce templating a bit. NFC.

llvm-svn: 295909

lld/ELF/OutputSections.cpp

diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp
index 9eff851..15d467a 100644
--- a/lld/ELF/OutputSections.cpp
+++ b/lld/ELF/OutputSections.cpp
@@ -163,8 +163,7 @@
 }
 
 template <class ELFT>
-void OutputSection<ELFT>::sort(
-    std::function<int(InputSection<ELFT> *S)> Order) {
+void OutputSection<ELFT>::sort(std::function<int(InputSectionData *S)> Order) {
   typedef std::pair<unsigned, InputSection<ELFT> *> Pair;
   auto Comp = [](const Pair &A, const Pair &B) { return A.first < B.first; };
 
@@ -185,7 +184,7 @@
 // For more detail, read the section of the GCC's manual about init_priority.
 template <class ELFT> void OutputSection<ELFT>::sortInitFini() {
   // Sort sections by priority.
-  sort([](InputSection<ELFT> *S) { return getPriority(S->Name); });
+  sort([](InputSectionData *S) { return getPriority(S->Name); });
 }
 
 // Returns true if S matches /Filename.?\.o$/.

lld/ELF/OutputSections.h

diff --git a/lld/ELF/OutputSections.h b/lld/ELF/OutputSections.h
index f5b8157..a2ab3b0 100644
--- a/lld/ELF/OutputSections.h
+++ b/lld/ELF/OutputSections.h
@@ -112,7 +112,7 @@
   typedef typename ELFT::uint uintX_t;
   OutputSection(StringRef Name, uint32_t Type, uintX_t Flags);
   void addSection(InputSectionData *C) override;
-  void sort(std::function<int(InputSection<ELFT> *S)> Order);
+  void sort(std::function<int(InputSectionData *S)> Order);
   void sortInitFini();
   void sortCtorsDtors();
   void writeTo(uint8_t *Buf) override;

lld/ELF/Writer.cpp

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index a2064e3..abdf61a 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -885,7 +885,7 @@
     SymbolOrder.insert({S, Priority++});
 
   // Build a map from sections to their priorities.
-  DenseMap<InputSectionBase<ELFT> *, int> SectionOrder;
+  DenseMap<InputSectionData *, int> SectionOrder;
   for (elf::ObjectFile<ELFT> *File : Symtab<ELFT>::X->getObjectFiles()) {
     for (SymbolBody *Body : File->getSymbols()) {
       auto *D = dyn_cast<DefinedRegular<ELFT>>(Body);
@@ -899,7 +899,7 @@
   // Sort sections by priority.
   for (OutputSectionBase *Base : OutputSections)
     if (auto *Sec = dyn_cast<OutputSection<ELFT>>(Base))
-      Sec->sort([&](InputSection<ELFT> *S) { return SectionOrder.lookup(S); });
+      Sec->sort([&](InputSectionData *S) { return SectionOrder.lookup(S); });
 }
 
 template <class ELFT>