commit 512c61df1c28a5b1bfaa58d8cc8d3a215f5cfc8c
author Rui Ueyama <ruiu@google.com> Wed Feb 03 00:12:24 2016 +0000
committer Rui Ueyama <ruiu@google.com> Wed Feb 03 00:12:24 2016 +0000
tree 34993d0ed84a16157630be9cbe11b241120d371a
parent a8d480d9d555250e6711fc71156f62ba40578430

Define SymbolBody::getSize instead of getSymSize(SymbolBody&). NFC.

llvm-svn: 259613

lld/ELF/InputSection.cpp

diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index d5ff181..67432dd 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -130,14 +130,6 @@
 }
 
 template <class ELFT>
-static typename llvm::object::ELFFile<ELFT>::uintX_t
-getSymSize(SymbolBody &Body) {
-  if (auto *SS = dyn_cast<DefinedElf<ELFT>>(&Body))
-    return SS->Sym.st_size;
-  return 0;
-}
-
-template <class ELFT>
 template <bool isRela>
 void InputSectionBase<ELFT>::relocate(uint8_t *Buf, uint8_t *BufEnd,
                                       RelIteratorRange<isRela> Rels) {
@@ -243,7 +235,7 @@
       else if (Type == R_MIPS_LO16 && Body == Config->MipsGpDisp)
         SymVA = getMipsGpAddr<ELFT>() - AddrLoc + 4;
     }
-    uintX_t Size = getSymSize<ELFT>(*Body);
+    uintX_t Size = Body->getSize<ELFT>();
     Target->relocateOne(BufLoc, BufEnd, Type, AddrLoc, SymVA + A, Size + A,
                         findMipsPairedReloc(Buf, SymIndex, Type, NextRelocs));
   }

lld/ELF/Symbols.cpp

diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp
index 30b086f..dec8442 100644
--- a/lld/ELF/Symbols.cpp
+++ b/lld/ELF/Symbols.cpp
@@ -89,6 +89,13 @@
          PltIndex * Target->PltEntrySize;
 }
 
+template <class ELFT>
+typename ELFFile<ELFT>::uintX_t SymbolBody::getSize() const {
+  if (auto *B = dyn_cast<DefinedElf<ELFT>>(this))
+    return B->Sym.st_size;
+  return 0;
+}
+
 static uint8_t getMinVisibility(uint8_t VA, uint8_t VB) {
   if (VA == STV_DEFAULT)
     return VB;
@@ -252,6 +259,11 @@
 template uint64_t SymbolBody::template getPltVA<ELF64LE>() const;
 template uint64_t SymbolBody::template getPltVA<ELF64BE>() const;
 
+template uint32_t SymbolBody::template getSize<ELF32LE>() const;
+template uint32_t SymbolBody::template getSize<ELF32BE>() const;
+template uint64_t SymbolBody::template getSize<ELF64LE>() const;
+template uint64_t SymbolBody::template getSize<ELF64BE>() const;
+
 template int SymbolBody::compare<ELF32LE>(SymbolBody *Other);
 template int SymbolBody::compare<ELF32BE>(SymbolBody *Other);
 template int SymbolBody::compare<ELF64LE>(SymbolBody *Other);

lld/ELF/Symbols.h

diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h
index af16124..1d67d3b 100644
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -110,6 +110,8 @@
   typename llvm::object::ELFFile<ELFT>::uintX_t getGotPltVA() const;
   template <class ELFT>
   typename llvm::object::ELFFile<ELFT>::uintX_t getPltVA() const;
+  template <class ELFT>
+  typename llvm::object::ELFFile<ELFT>::uintX_t getSize() const;
 
   // A SymbolBody has a backreference to a Symbol. Originally they are
   // doubly-linked. A backreference will never change. But the pointer