[lld] r249642 - ELF2: Make member variable names shorter.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Wed Oct  7 19:29:00 2015
New Revision: 249642

URL: http://llvm.org/viewvc/llvm-project?rev=249642&view=rev
Log:
ELF2: Make member variable names shorter.

I'm going to use them in other patches, and the names feel too long
despite their narrow scope.

Modified:
    lld/trunk/ELF/SymbolTable.cpp
    lld/trunk/ELF/Symbols.cpp
    lld/trunk/ELF/Symbols.h

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=249642&r1=249641&r2=249642&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Wed Oct  7 19:29:00 2015
@@ -90,8 +90,7 @@ void SymbolTable::addUndefinedSym(String
 }
 
 template <class ELFT> void SymbolTable::addUndefinedSym(StringRef Name) {
-  resolve<ELFT>(new (Alloc)
-                    Undefined<ELFT>(Name, Undefined<ELFT>::SyntheticOptional));
+  resolve<ELFT>(new (Alloc) Undefined<ELFT>(Name, Undefined<ELFT>::Optional));
 }
 
 template <class ELFT>
@@ -119,7 +118,7 @@ template <class ELFT> void SymbolTable::
     return;
   EntrySym = new (Alloc) Undefined<ELFT>(
       Config->Entry.empty() ? Target->getDefaultEntry() : Config->Entry,
-      Undefined<ELFT>::SyntheticRequired);
+      Undefined<ELFT>::Required);
   resolve<ELFT>(EntrySym);
 
   // In the assembly for 32 bit x86 the _GLOBAL_OFFSET_TABLE_ symbol is magical

Modified: lld/trunk/ELF/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.cpp?rev=249642&r1=249641&r2=249642&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.cpp (original)
+++ lld/trunk/ELF/Symbols.cpp Wed Oct  7 19:29:00 2015
@@ -87,10 +87,10 @@ std::unique_ptr<InputFile> Lazy::getMemb
 }
 
 void lld::elf2::initSymbols() {
-  Undefined<ELF32LE>::SyntheticOptional.setVisibility(STV_HIDDEN);
-  Undefined<ELF32BE>::SyntheticOptional.setVisibility(STV_HIDDEN);
-  Undefined<ELF64LE>::SyntheticOptional.setVisibility(STV_HIDDEN);
-  Undefined<ELF64BE>::SyntheticOptional.setVisibility(STV_HIDDEN);
+  Undefined<ELF32LE>::Optional.setVisibility(STV_HIDDEN);
+  Undefined<ELF32BE>::Optional.setVisibility(STV_HIDDEN);
+  Undefined<ELF64LE>::Optional.setVisibility(STV_HIDDEN);
+  Undefined<ELF64BE>::Optional.setVisibility(STV_HIDDEN);
 }
 
 template int SymbolBody::compare<ELF32LE>(SymbolBody *Other);

Modified: lld/trunk/ELF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=249642&r1=249641&r2=249642&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.h (original)
+++ lld/trunk/ELF/Symbols.h Wed Oct  7 19:29:00 2015
@@ -238,8 +238,8 @@ template <class ELFT> class Undefined :
   typedef typename Base::Elf_Sym Elf_Sym;
 
 public:
-  static Elf_Sym SyntheticRequired;
-  static Elf_Sym SyntheticOptional;
+  static Elf_Sym Required;
+  static Elf_Sym Optional;
 
   Undefined(StringRef N, const Elf_Sym &Sym)
       : ELFSymbolBody<ELFT>(Base::UndefinedKind, N, Sym) {}
@@ -248,13 +248,13 @@ public:
     return S->kind() == Base::UndefinedKind;
   }
 
-  bool canKeepUndefined() const { return &this->Sym == &SyntheticOptional; }
+  bool canKeepUndefined() const { return &this->Sym == &Optional; }
 };
 
 template <class ELFT>
-typename Undefined<ELFT>::Elf_Sym Undefined<ELFT>::SyntheticRequired;
+typename Undefined<ELFT>::Elf_Sym Undefined<ELFT>::Required;
 template <class ELFT>
-typename Undefined<ELFT>::Elf_Sym Undefined<ELFT>::SyntheticOptional;
+typename Undefined<ELFT>::Elf_Sym Undefined<ELFT>::Optional;
 
 template <class ELFT> class SharedSymbol : public Defined<ELFT> {
   typedef Defined<ELFT> Base;