[lld] r297146 - Rename remaining uses of Addralign to Alignment.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Tue Mar  7 09:11:21 2017
New Revision: 297146

URL: http://llvm.org/viewvc/llvm-project?rev=297146&view=rev
Log:
Rename remaining uses of Addralign to Alignment.

Modified:
    lld/trunk/ELF/InputSection.cpp
    lld/trunk/ELF/InputSection.h
    lld/trunk/ELF/SyntheticSections.h

Modified: lld/trunk/ELF/InputSection.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=297146&r1=297145&r2=297146&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.cpp (original)
+++ lld/trunk/ELF/InputSection.cpp Tue Mar  7 09:11:21 2017
@@ -53,7 +53,7 @@ static ArrayRef<uint8_t> getSectionConte
 InputSectionBase::InputSectionBase(InputFile *File, uint64_t Flags,
                                    uint32_t Type, uint64_t Entsize,
                                    uint32_t Link, uint32_t Info,
-                                   uint64_t Addralign, ArrayRef<uint8_t> Data,
+                                   uint64_t Alignment, ArrayRef<uint8_t> Data,
                                    StringRef Name, Kind SectionKind)
     : File(File), Data(Data), Name(Name), SectionKind(SectionKind),
       Live(!Config->GcSections || !(Flags & SHF_ALLOC)), Assigned(false),
@@ -64,7 +64,7 @@ InputSectionBase::InputSectionBase(Input
 
   // The ELF spec states that a value of 0 means the section has
   // no alignment constraits.
-  uint64_t V = std::max<uint64_t>(Addralign, 1);
+  uint64_t V = std::max<uint64_t>(Alignment, 1);
   if (!isPowerOf2_64(V))
     fatal(toString(File) + ": section sh_addralign is not a power of 2");
 
@@ -73,7 +73,7 @@ InputSectionBase::InputSectionBase(Input
   // We might want to relax this in the future.
   if (V > UINT32_MAX)
     fatal(toString(File) + ": section sh_addralign is too large");
-  Alignment = V;
+  this->Alignment = V;
 }
 
 template <class ELFT>
@@ -188,10 +188,10 @@ std::string InputSectionBase::getLocatio
 
 InputSectionBase InputSectionBase::Discarded;
 
-InputSection::InputSection(uint64_t Flags, uint32_t Type, uint64_t Addralign,
+InputSection::InputSection(uint64_t Flags, uint32_t Type, uint64_t Alignment,
                            ArrayRef<uint8_t> Data, StringRef Name, Kind K)
     : InputSectionBase(nullptr, Flags, Type,
-                       /*Entsize*/ 0, /*Link*/ 0, /*Info*/ 0, Addralign, Data,
+                       /*Entsize*/ 0, /*Link*/ 0, /*Info*/ 0, Alignment, Data,
                        Name, K) {}
 
 template <class ELFT>

Modified: lld/trunk/ELF/InputSection.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.h?rev=297146&r1=297145&r2=297146&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.h (original)
+++ lld/trunk/ELF/InputSection.h Tue Mar  7 09:11:21 2017
@@ -78,7 +78,7 @@ public:
 
   InputSectionBase(InputFile *File, uint64_t Flags, uint32_t Type,
                    uint64_t Entsize, uint32_t Link, uint32_t Info,
-                   uint64_t Addralign, ArrayRef<uint8_t> Data, StringRef Name,
+                   uint64_t Alignment, ArrayRef<uint8_t> Data, StringRef Name,
                    Kind SectionKind);
   OutputSection *OutSec = nullptr;
 
@@ -252,7 +252,7 @@ public:
 // .eh_frame. It also includes the synthetic sections themselves.
 class InputSection : public InputSectionBase {
 public:
-  InputSection(uint64_t Flags, uint32_t Type, uint64_t Addralign,
+  InputSection(uint64_t Flags, uint32_t Type, uint64_t Alignment,
                ArrayRef<uint8_t> Data, StringRef Name, Kind K = Regular);
   template <class ELFT>
   InputSection(ObjectFile<ELFT> *F, const typename ELFT::Shdr *Header,

Modified: lld/trunk/ELF/SyntheticSections.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SyntheticSections.h?rev=297146&r1=297145&r2=297146&view=diff
==============================================================================
--- lld/trunk/ELF/SyntheticSections.h (original)
+++ lld/trunk/ELF/SyntheticSections.h Tue Mar  7 09:11:21 2017
@@ -32,9 +32,9 @@ namespace elf {
 
 class SyntheticSection : public InputSection {
 public:
-  SyntheticSection(uint64_t Flags, uint32_t Type, uint64_t Addralign,
+  SyntheticSection(uint64_t Flags, uint32_t Type, uint64_t Alignment,
                    StringRef Name)
-      : InputSection(Flags, Type, Addralign, {}, Name,
+      : InputSection(Flags, Type, Alignment, {}, Name,
                      InputSectionBase::Synthetic) {
     this->Live = true;
   }