commit e1901cc33df90d0f32b58380cc4ad619496d09e3
author Rafael Espindola <rafael.espindola@gmail.com> Thu Sep 24 15:11:50 2015 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Sep 24 15:11:50 2015 +0000
tree 0e8c1de864b970704893ad88bd187af4ea940b5b
parent f209cdfade65a822d34160c94f103a8e3bf02498

Simplify memory management by having ELFData contain a ELFObj.

llvm-svn: 248502

lld/ELF/Writer.cpp

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index c9bf60e..78797dc 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -249,7 +249,7 @@
     iterator_range<const Elf_Rel_Impl<ELFT, isRela> *> Rels) {
   typedef Elf_Rel_Impl<ELFT, isRela> RelType;
   const ObjectFile<ELFT> &File = *C.getFile();
-  bool IsMips64EL = File.getObj()->isMips64EL();
+  bool IsMips64EL = File.getObj().isMips64EL();
   for (const RelType &RI : Rels) {
     uint32_t SymIndex = RI.getSymbol(IsMips64EL);
     SymbolBody *Body = File.getSymbolBody(SymIndex);
@@ -275,17 +275,17 @@
 
 template <class ELFT>
 void Writer<ELFT>::scanRelocs(const InputSection<ELFT> &C) {
-  const ObjectFile<ELFT> *File = C.getFile();
-  ELFFile<ELFT> *EObj = File->getObj();
+  ObjectFile<ELFT> *File = C.getFile();
+  ELFFile<ELFT> &EObj = File->getObj();
 
   if (!(C.getSectionHdr()->sh_flags & SHF_ALLOC))
     return;
 
   for (const Elf_Shdr *RelSec : C.RelocSections) {
     if (RelSec->sh_type == SHT_RELA)
-      scanRelocs(C, EObj->relas(RelSec));
+      scanRelocs(C, EObj.relas(RelSec));
     else
-      scanRelocs(C, EObj->rels(RelSec));
+      scanRelocs(C, EObj.rels(RelSec));
   }
 }
 
@@ -299,7 +299,7 @@
 
   for (const std::unique_ptr<ObjectFileBase> &F : S.getObjectFiles()) {
     const auto &File = cast<ObjectFile<ELFT>>(*F);
-    Elf_Sym_Range Syms = File.getObj()->symbols(File.getSymbolTable());
+    Elf_Sym_Range Syms = File.getObj().symbols(File.getSymbolTable());
     if (&SymE > Syms.begin() && &SymE < Syms.end())
       SymFile = F.get();
   }