commit 24e6f363c5c9b9b01ca0c4fc066d2fb2edfc3b92
author Rafael Espindola <rafael.espindola@gmail.com> Fri Feb 24 15:07:30 2017 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Feb 24 15:07:30 2017 +0000
tree 40559ba922eb56024d5d9c15518d025c933f9ad4
parent 8d4d72f16b180397914dfd9505ce691be349c11a

Merge OutputSectionBase and OutputSection. NFC.

Now that all special sections are SyntheticSections, we only need one
OutputSection class.

llvm-svn: 296127

lld/ELF/LinkerScript.h

diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h
index c8b967b..4dbd5af 100644
--- a/lld/ELF/LinkerScript.h
+++ b/lld/ELF/LinkerScript.h
@@ -33,7 +33,7 @@
 class SymbolBody;
 class InputSectionBase;
 class InputSection;
-class OutputSectionBase;
+class OutputSection;
 template <class ELFT> class OutputSectionFactory;
 class InputSectionBase;
 
@@ -47,13 +47,13 @@
 
   // If expression is section-relative the function below is used
   // to get the output section pointer.
-  std::function<const OutputSectionBase *()> Section;
+  std::function<const OutputSection *()> Section;
 
   uint64_t operator()(uint64_t Dot) const { return Val(Dot); }
   operator bool() const { return (bool)Val; }
 
   Expr(std::function<uint64_t(uint64_t)> Val, std::function<bool()> IsAbsolute,
-       std::function<const OutputSectionBase *()> Section)
+       std::function<const OutputSection *()> Section)
       : Val(Val), IsAbsolute(IsAbsolute), Section(Section) {}
   template <typename T>
   Expr(T V) : Expr(V, [] { return true; }, [] { return nullptr; }) {}
@@ -213,9 +213,9 @@
   virtual uint64_t getSymbolValue(const Twine &Loc, StringRef S) = 0;
   virtual bool isDefined(StringRef S) = 0;
   virtual bool isAbsolute(StringRef S) = 0;
-  virtual const OutputSectionBase *getSymbolSection(StringRef S) = 0;
-  virtual const OutputSectionBase *getOutputSection(const Twine &Loc,
-                                                    StringRef S) = 0;
+  virtual const OutputSection *getSymbolSection(StringRef S) = 0;
+  virtual const OutputSection *getOutputSection(const Twine &Loc,
+                                                StringRef S) = 0;
   virtual uint64_t getOutputSectionSize(StringRef S) = 0;
 };
 
@@ -268,12 +268,11 @@
   uint64_t getSymbolValue(const Twine &Loc, StringRef S) override;
   bool isDefined(StringRef S) override;
   bool isAbsolute(StringRef S) override;
-  const OutputSectionBase *getSymbolSection(StringRef S) override;
-  const OutputSectionBase *getOutputSection(const Twine &Loc,
-                                            StringRef S) override;
+  const OutputSection *getSymbolSection(StringRef S) override;
+  const OutputSection *getOutputSection(const Twine &Loc, StringRef S) override;
   uint64_t getOutputSectionSize(StringRef S) override;
 
-  std::vector<OutputSectionBase *> *OutputSections;
+  std::vector<OutputSection *> *OutputSections;
 
   int getSectionIndex(StringRef Name);
 
@@ -294,19 +293,18 @@
   std::vector<size_t> getPhdrIndices(StringRef SectionName);
   size_t getPhdrIndex(const Twine &Loc, StringRef PhdrName);
 
-  MemoryRegion *findMemoryRegion(OutputSectionCommand *Cmd,
-                                 OutputSectionBase *Sec);
+  MemoryRegion *findMemoryRegion(OutputSectionCommand *Cmd, OutputSection *Sec);
 
   uintX_t Dot;
   std::function<uint64_t()> LMAOffset;
-  OutputSectionBase *CurOutSec = nullptr;
+  OutputSection *CurOutSec = nullptr;
   MemoryRegion *CurMemRegion = nullptr;
   uintX_t ThreadBssOffset = 0;
-  void switchTo(OutputSectionBase *Sec);
+  void switchTo(OutputSection *Sec);
   void flush();
   void output(InputSection *Sec);
   void process(BaseCommand &Base);
-  llvm::DenseSet<OutputSectionBase *> AlreadyOutputOS;
+  llvm::DenseSet<OutputSection *> AlreadyOutputOS;
   llvm::DenseSet<InputSectionBase *> AlreadyOutputIS;
 };