[lld] r311214 - Rename {Lazy,}ObjectKind -> {Lazy,}ObjKind.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Fri Aug 18 17:13:54 2017
New Revision: 311214

URL: http://llvm.org/viewvc/llvm-project?rev=311214&view=rev
Log:
Rename {Lazy,}ObjectKind -> {Lazy,}ObjKind.

I renamed corresponding classes in r309199 but forgot to rename enums
at the moment. Rename them now to make them consistent.

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

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=311214&r1=311213&r2=311214&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Fri Aug 18 17:13:54 2017
@@ -157,7 +157,7 @@ void ELFFileBase<ELFT>::initSymtab(Array
 
 template <class ELFT>
 ObjFile<ELFT>::ObjFile(MemoryBufferRef M, StringRef ArchiveName)
-    : ELFFileBase<ELFT>(Base::ObjectKind, M) {
+    : ELFFileBase<ELFT>(Base::ObjKind, M) {
   this->ArchiveName = ArchiveName;
 }
 

Modified: lld/trunk/ELF/InputFiles.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.h?rev=311214&r1=311213&r2=311214&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.h (original)
+++ lld/trunk/ELF/InputFiles.h Fri Aug 18 17:13:54 2017
@@ -63,9 +63,9 @@ llvm::Optional<MemoryBufferRef> readFile
 class InputFile {
 public:
   enum Kind {
-    ObjectKind,
+    ObjKind,
     SharedKind,
-    LazyObjectKind,
+    LazyObjKind,
     ArchiveKind,
     BitcodeKind,
     BinaryKind,
@@ -79,14 +79,14 @@ public:
   // Returns sections. It is a runtime error to call this function
   // on files that don't have the notion of sections.
   ArrayRef<InputSectionBase *> getSections() const {
-    assert(FileKind == ObjectKind || FileKind == BinaryKind);
+    assert(FileKind == ObjKind || FileKind == BinaryKind);
     return Sections;
   }
 
   // Returns object file symbols. It is a runtime error to call this
   // function on files of other types.
   ArrayRef<SymbolBody *> getSymbols() {
-    assert(FileKind == ObjectKind || FileKind == BitcodeKind ||
+    assert(FileKind == ObjKind || FileKind == BitcodeKind ||
            FileKind == ArchiveKind);
     return Symbols;
   }
@@ -124,7 +124,7 @@ public:
   ELFFileBase(Kind K, MemoryBufferRef M);
   static bool classof(const InputFile *F) {
     Kind K = F->kind();
-    return K == ObjectKind || K == SharedKind;
+    return K == ObjKind || K == SharedKind;
   }
 
   llvm::object::ELFFile<ELFT> getObj() const {
@@ -160,9 +160,7 @@ template <class ELFT> class ObjFile : pu
   ArrayRef<Elf_Word> getShtGroupEntries(const Elf_Shdr &Sec);
 
 public:
-  static bool classof(const InputFile *F) {
-    return F->kind() == Base::ObjectKind;
-  }
+  static bool classof(const InputFile *F) { return F->kind() == Base::ObjKind; }
 
   static std::vector<ObjFile<ELFT> *> Instances;
 
@@ -236,13 +234,11 @@ class LazyObjFile : public InputFile {
 public:
   LazyObjFile(MemoryBufferRef M, StringRef ArchiveName,
               uint64_t OffsetInArchive)
-      : InputFile(LazyObjectKind, M), OffsetInArchive(OffsetInArchive) {
+      : InputFile(LazyObjKind, M), OffsetInArchive(OffsetInArchive) {
     this->ArchiveName = ArchiveName;
   }
 
-  static bool classof(const InputFile *F) {
-    return F->kind() == LazyObjectKind;
-  }
+  static bool classof(const InputFile *F) { return F->kind() == LazyObjKind; }
 
   template <class ELFT> void parse();
   MemoryBufferRef getBuffer();

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=311214&r1=311213&r2=311214&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Fri Aug 18 17:13:54 2017
@@ -250,7 +250,7 @@ std::pair<Symbol *, bool> SymbolTable::i
                                               uint8_t Visibility,
                                               bool CanOmitFromDynSym,
                                               InputFile *File) {
-  bool IsUsedInRegularObj = !File || File->kind() == InputFile::ObjectKind;
+  bool IsUsedInRegularObj = !File || File->kind() == InputFile::ObjKind;
   Symbol *S;
   bool WasInserted;
   std::tie(S, WasInserted) = insert(Name);