[lld] r263502 - Make getAlignment a non-member function. NFC.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Mon Mar 14 17:41:08 2016
New Revision: 263502

URL: http://llvm.org/viewvc/llvm-project?rev=263502&view=rev
Log:
Make getAlignment a non-member function. NFC.

This function did not rely on Writer class.

Modified:
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263502&r1=263501&r2=263502&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Mon Mar 14 17:41:08 2016
@@ -89,8 +89,6 @@ private:
   void addCommonSymbols(std::vector<DefinedCommon *> &Syms);
   void addCopyRelSymbols(std::vector<SharedSymbol<ELFT> *> &Syms);
 
-  static uint32_t getAlignment(SharedSymbol<ELFT> *SS);
-
   std::unique_ptr<llvm::FileOutputBuffer> Buffer;
 
   BumpPtrAllocator Alloc;
@@ -719,13 +717,13 @@ void Writer<ELFT>::addCommonSymbols(std:
   Out<ELFT>::Bss->setSize(Off);
 }
 
-template <class ELFT>
-uint32_t Writer<ELFT>::getAlignment(SharedSymbol<ELFT> *SS) {
-  const Elf_Sym &Sym = SS->Sym;
-  const Elf_Shdr *Sec = SS->File->getSection(Sym);
-  uintX_t SecAlign = Sec->sh_addralign;
+template <class ELFT> static uint32_t getAlignment(SharedSymbol<ELFT> *SS) {
+  typedef typename ELFFile<ELFT>::uintX_t uintX_t;
+
+  uintX_t SecAlign = SS->File->getSection(SS->Sym)->sh_addralign;
+  uintX_t SymValue = SS->Sym.st_value;
   int TrailingZeros = std::min(countTrailingZeros(SecAlign),
-                               countTrailingZeros((uintX_t)Sym.st_value));
+                               countTrailingZeros(SymValue));
   return 1 << TrailingZeros;
 }