[lld] r234452 - Rename atom_collection -> AtomVector.

Rui Ueyama ruiu at google.com
Wed Apr 8 16:06:00 PDT 2015


Author: ruiu
Date: Wed Apr  8 18:05:59 2015
New Revision: 234452

URL: http://llvm.org/viewvc/llvm-project?rev=234452&view=rev
Log:
Rename atom_collection -> AtomVector.

Type names should start with an uppercase letter in the LLVM coding style.

Modified:
    lld/trunk/include/lld/Core/File.h
    lld/trunk/include/lld/Core/SharedLibraryFile.h
    lld/trunk/include/lld/Core/Simple.h
    lld/trunk/lib/Core/File.cpp
    lld/trunk/lib/ReaderWriter/FileArchive.cpp
    lld/trunk/lib/ReaderWriter/MachO/ExecutableAtoms.hpp
    lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
    lld/trunk/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
    lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
    lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
    lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp

Modified: lld/trunk/include/lld/Core/File.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/File.h?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/File.h (original)
+++ lld/trunk/include/lld/Core/File.h Wed Apr  8 18:05:59 2015
@@ -108,23 +108,23 @@ public:
   };
 
   /// The type of atom mutable container.
-  template <typename T> using atom_collection = std::vector<const T *>;
+  template <typename T> using AtomVector = std::vector<const T *>;
 
-  /// \brief Must be implemented to return the atom_collection object for
+  /// \brief Must be implemented to return the AtomVector object for
   /// all DefinedAtoms in this File.
-  virtual const atom_collection<DefinedAtom> &defined() const = 0;
+  virtual const AtomVector<DefinedAtom> &defined() const = 0;
 
-  /// \brief Must be implemented to return the atom_collection object for
+  /// \brief Must be implemented to return the AtomVector object for
   /// all UndefinedAtomw in this File.
-  virtual const atom_collection<UndefinedAtom> &undefined() const = 0;
+  virtual const AtomVector<UndefinedAtom> &undefined() const = 0;
 
-  /// \brief Must be implemented to return the atom_collection object for
+  /// \brief Must be implemented to return the AtomVector object for
   /// all SharedLibraryAtoms in this File.
-  virtual const atom_collection<SharedLibraryAtom> &sharedLibrary() const = 0;
+  virtual const AtomVector<SharedLibraryAtom> &sharedLibrary() const = 0;
 
-  /// \brief Must be implemented to return the atom_collection object for
+  /// \brief Must be implemented to return the AtomVector object for
   /// all AbsoluteAtoms in this File.
-  virtual const atom_collection<AbsoluteAtom> &absolute() const = 0;
+  virtual const AtomVector<AbsoluteAtom> &absolute() const = 0;
 
   /// \brief If a file is parsed using a different method than doParse(),
   /// one must use this method to set the last error status, so that
@@ -160,11 +160,11 @@ protected:
   /// memory buffer passed to this file's constructor.
   virtual std::error_code doParse() { return std::error_code(); }
 
-  static atom_collection<DefinedAtom> _noDefinedAtoms;
-  static atom_collection<UndefinedAtom> _noUndefinedAtoms;
-  static atom_collection<SharedLibraryAtom> _noSharedLibraryAtoms;
-  static atom_collection<AbsoluteAtom> _noAbsoluteAtoms;
-  mutable llvm::BumpPtrAllocator                  _allocator;
+  static AtomVector<DefinedAtom> _noDefinedAtoms;
+  static AtomVector<UndefinedAtom> _noUndefinedAtoms;
+  static AtomVector<SharedLibraryAtom> _noSharedLibraryAtoms;
+  static AtomVector<AbsoluteAtom> _noAbsoluteAtoms;
+  mutable llvm::BumpPtrAllocator _allocator;
 
 private:
   StringRef _path;
@@ -189,16 +189,16 @@ public:
 
   std::error_code doParse() override { return _ec; }
 
-  const atom_collection<DefinedAtom> &defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     llvm_unreachable("internal error");
   }
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     llvm_unreachable("internal error");
   }
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     llvm_unreachable("internal error");
   }
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     llvm_unreachable("internal error");
   }
 

Modified: lld/trunk/include/lld/Core/SharedLibraryFile.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/SharedLibraryFile.h?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/SharedLibraryFile.h (original)
+++ lld/trunk/include/lld/Core/SharedLibraryFile.h Wed Apr  8 18:05:59 2015
@@ -34,19 +34,19 @@ public:
   // the import name (Windows).
   virtual StringRef getDSOName() const = 0;
 
-  const atom_collection<DefinedAtom> &defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _definedAtoms;
   }
 
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _undefinedAtoms;
   }
 
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _sharedLibraryAtoms;
   }
 
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _absoluteAtoms;
   }
 
@@ -54,10 +54,10 @@ protected:
   /// only subclasses of SharedLibraryFile can be instantiated
   explicit SharedLibraryFile(StringRef path) : File(path, kindSharedLibrary) {}
 
-  atom_collection<DefinedAtom> _definedAtoms;
-  atom_collection<UndefinedAtom> _undefinedAtoms;
-  atom_collection<SharedLibraryAtom> _sharedLibraryAtoms;
-  atom_collection<AbsoluteAtom> _absoluteAtoms;
+  AtomVector<DefinedAtom> _definedAtoms;
+  AtomVector<UndefinedAtom> _undefinedAtoms;
+  AtomVector<SharedLibraryAtom> _sharedLibraryAtoms;
+  AtomVector<AbsoluteAtom> _absoluteAtoms;
 };
 
 } // namespace lld

Modified: lld/trunk/include/lld/Core/Simple.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Simple.h?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Simple.h (original)
+++ lld/trunk/include/lld/Core/Simple.h Wed Apr  8 18:05:59 2015
@@ -55,19 +55,17 @@ public:
     atoms.erase(newEnd, atoms.end());
   }
 
-  const atom_collection<DefinedAtom> &defined() const override {
-    return _defined;
-  }
+  const AtomVector<DefinedAtom> &defined() const override { return _defined; }
 
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _undefined;
   }
 
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _shared;
   }
 
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _absolute;
   }
 
@@ -75,10 +73,10 @@ public:
   DefinedAtomRange definedAtoms() { return make_range(_defined); }
 
 private:
-  atom_collection<DefinedAtom> _defined;
-  atom_collection<UndefinedAtom> _undefined;
-  atom_collection<SharedLibraryAtom> _shared;
-  atom_collection<AbsoluteAtom> _absolute;
+  AtomVector<DefinedAtom> _defined;
+  AtomVector<UndefinedAtom> _undefined;
+  AtomVector<SharedLibraryAtom> _shared;
+  AtomVector<AbsoluteAtom> _absolute;
 };
 
 /// \brief Archive library file that may be used as a virtual container
@@ -89,19 +87,19 @@ public:
   SimpleArchiveLibraryFile(StringRef filename)
       : ArchiveLibraryFile(filename) {}
 
-  const atom_collection<DefinedAtom> &defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _definedAtoms;
   }
 
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _undefinedAtoms;
   }
 
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _sharedLibraryAtoms;
   }
 
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _absoluteAtoms;
   }
 
@@ -117,10 +115,10 @@ public:
   }
 
 private:
-  atom_collection<DefinedAtom> _definedAtoms;
-  atom_collection<UndefinedAtom> _undefinedAtoms;
-  atom_collection<SharedLibraryAtom> _sharedLibraryAtoms;
-  atom_collection<AbsoluteAtom> _absoluteAtoms;
+  AtomVector<DefinedAtom> _definedAtoms;
+  AtomVector<UndefinedAtom> _undefinedAtoms;
+  AtomVector<SharedLibraryAtom> _sharedLibraryAtoms;
+  AtomVector<AbsoluteAtom> _absoluteAtoms;
 };
 
 class SimpleReference : public Reference {

Modified: lld/trunk/lib/Core/File.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/File.cpp?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/Core/File.cpp (original)
+++ lld/trunk/lib/Core/File.cpp Wed Apr  8 18:05:59 2015
@@ -15,10 +15,10 @@ namespace lld {
 
 File::~File() {}
 
-File::atom_collection<DefinedAtom> File::_noDefinedAtoms;
-File::atom_collection<UndefinedAtom> File::_noUndefinedAtoms;
-File::atom_collection<SharedLibraryAtom> File::_noSharedLibraryAtoms;
-File::atom_collection<AbsoluteAtom> File::_noAbsoluteAtoms;
+File::AtomVector<DefinedAtom> File::_noDefinedAtoms;
+File::AtomVector<UndefinedAtom> File::_noUndefinedAtoms;
+File::AtomVector<SharedLibraryAtom> File::_noSharedLibraryAtoms;
+File::AtomVector<AbsoluteAtom> File::_noAbsoluteAtoms;
 
 std::error_code File::parse() {
   std::lock_guard<std::mutex> lock(_parseMutex);

Modified: lld/trunk/lib/ReaderWriter/FileArchive.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/FileArchive.cpp?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/FileArchive.cpp (original)
+++ lld/trunk/lib/ReaderWriter/FileArchive.cpp Wed Apr  8 18:05:59 2015
@@ -119,19 +119,19 @@ public:
     return std::error_code();
   }
 
-  const atom_collection<DefinedAtom> &defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _noDefinedAtoms;
   }
 
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _noUndefinedAtoms;
   }
 
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _noSharedLibraryAtoms;
   }
 
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _noAbsoluteAtoms;
   }
 

Modified: lld/trunk/lib/ReaderWriter/MachO/ExecutableAtoms.hpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ExecutableAtoms.hpp?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/ExecutableAtoms.hpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/ExecutableAtoms.hpp Wed Apr  8 18:05:59 2015
@@ -106,24 +106,24 @@ public:
     return nullptr;
   }
 
-  const atom_collection<DefinedAtom> &defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _definedAtoms;
   }
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _noUndefinedAtoms;
   }
 
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _noSharedLibraryAtoms;
   }
 
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _noAbsoluteAtoms;
   }
 
 
 private:
-  mutable atom_collection<DefinedAtom> _definedAtoms;
+  mutable AtomVector<DefinedAtom> _definedAtoms;
   StringRef _machHeaderSymbolName;
 };
 

Modified: lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp (original)
+++ lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp Wed Apr  8 18:05:59 2015
@@ -374,16 +374,16 @@ public:
     delete [] _targetsTable;
   }
 
-  const atom_collection<DefinedAtom>&  defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _definedAtoms;
   }
-  const atom_collection<UndefinedAtom>& undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
       return _undefinedAtoms;
   }
-  const atom_collection<SharedLibraryAtom>& sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
       return _sharedLibraryAtoms;
   }
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _absoluteAtoms;
   }
 
@@ -398,8 +398,8 @@ private:
 
   // instantiate array of BASeT from IvarsT data in file
   template <typename BaseT, typename AtomT, typename IvarsT>
-  std::error_code processAtoms(atom_collection<BaseT> &result,
-                               const uint8_t *base, const NativeChunk *chunk) {
+  std::error_code processAtoms(AtomVector<BaseT> &result, const uint8_t *base,
+                               const NativeChunk *chunk) {
     std::vector<const BaseT *> vec(chunk->elementCount);
     const size_t ivarElementSize = chunk->fileSize / chunk->elementCount;
     if (ivarElementSize != sizeof(IvarsT))
@@ -690,10 +690,10 @@ private:
 
   std::unique_ptr<MemoryBuffer>   _mb;
   const NativeFileHeader*         _header;
-  atom_collection<DefinedAtom> _definedAtoms;
-  atom_collection<UndefinedAtom> _undefinedAtoms;
-  atom_collection<SharedLibraryAtom> _sharedLibraryAtoms;
-  atom_collection<AbsoluteAtom> _absoluteAtoms;
+  AtomVector<DefinedAtom> _definedAtoms;
+  AtomVector<UndefinedAtom> _undefinedAtoms;
+  AtomVector<SharedLibraryAtom> _sharedLibraryAtoms;
+  AtomVector<AbsoluteAtom> _absoluteAtoms;
   const uint8_t*                  _absAttributes;
   uint32_t                        _absAbsoluteMaxOffset;
   const uint8_t*                  _attributes;

Modified: lld/trunk/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h Wed Apr  8 18:05:59 2015
@@ -217,12 +217,12 @@ public:
       : SimpleFile("<entry>"), _ctx(const_cast<PECOFFLinkingContext *>(&ctx)),
         _firstTime(true) {}
 
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return const_cast<EntryPointFile *>(this)->getUndefinedAtoms();
   }
 
 private:
-  const atom_collection<UndefinedAtom> &getUndefinedAtoms() {
+  const AtomVector<UndefinedAtom> &getUndefinedAtoms() {
     std::lock_guard<std::mutex> lock(_mutex);
     if (!_firstTime)
       return _undefinedAtoms;
@@ -299,7 +299,7 @@ private:
   }
 
   PECOFFLinkingContext *_ctx;
-  atom_collection<UndefinedAtom> _undefinedAtoms;
+  AtomVector<UndefinedAtom> _undefinedAtoms;
   std::mutex _mutex;
   llvm::BumpPtrAllocator _alloc;
   bool _firstTime;

Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp Wed Apr  8 18:05:59 2015
@@ -84,19 +84,19 @@ public:
   bool isCompatibleWithSEH() const { return _compatibleWithSEH; }
   llvm::COFF::MachineTypes getMachineType() { return _machineType; }
 
-  const atom_collection<DefinedAtom> &defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _definedAtoms;
   }
 
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _undefinedAtoms;
   }
 
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _sharedLibraryAtoms;
   }
 
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _absoluteAtoms;
   }
 
@@ -159,10 +159,10 @@ private:
 
   std::unique_ptr<const llvm::object::COFFObjectFile> _obj;
   std::unique_ptr<MemoryBuffer> _mb;
-  atom_collection<DefinedAtom> _definedAtoms;
-  atom_collection<UndefinedAtom> _undefinedAtoms;
-  atom_collection<SharedLibraryAtom> _sharedLibraryAtoms;
-  atom_collection<AbsoluteAtom> _absoluteAtoms;
+  AtomVector<DefinedAtom> _definedAtoms;
+  AtomVector<UndefinedAtom> _undefinedAtoms;
+  AtomVector<SharedLibraryAtom> _sharedLibraryAtoms;
+  AtomVector<AbsoluteAtom> _absoluteAtoms;
 
   // The target type of the object.
   Reference::KindArch _referenceArch;

Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp Wed Apr  8 18:05:59 2015
@@ -282,19 +282,19 @@ public:
     return std::error_code();
   }
 
-  const atom_collection<DefinedAtom> &defined() const override {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _definedAtoms;
   }
 
-  const atom_collection<UndefinedAtom> &undefined() const override {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _noUndefinedAtoms;
   }
 
-  const atom_collection<SharedLibraryAtom> &sharedLibrary() const override {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _sharedLibraryAtoms;
   }
 
-  const atom_collection<AbsoluteAtom> &absolute() const override {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _noAbsoluteAtoms;
   }
 
@@ -315,8 +315,8 @@ private:
     _definedAtoms.push_back(atom);
   }
 
-  atom_collection<DefinedAtom> _definedAtoms;
-  atom_collection<SharedLibraryAtom> _sharedLibraryAtoms;
+  AtomVector<DefinedAtom> _definedAtoms;
+  AtomVector<SharedLibraryAtom> _sharedLibraryAtoms;
   mutable llvm::BumpPtrAllocator _alloc;
 
   // Does the same thing as StringRef::ltrim() but removes at most one

Modified: lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp?rev=234452&r1=234451&r2=234452&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp (original)
+++ lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp Wed Apr  8 18:05:59 2015
@@ -217,7 +217,7 @@ private:
 
 /// Mapping of Atoms.
 template <typename T> class AtomList {
-  typedef lld::File::atom_collection<T> Ty;
+  typedef lld::File::AtomVector<T> Ty;
 
 public:
   typename Ty::iterator begin() { return _atoms.begin(); }
@@ -582,17 +582,17 @@ template <> struct MappingTraits<const l
 
     const lld::File *denormalize(IO &io) { return this; }
 
-    const atom_collection<lld::DefinedAtom> &defined() const override {
+    const AtomVector<lld::DefinedAtom> &defined() const override {
       return _noDefinedAtoms;
     }
-    const atom_collection<lld::UndefinedAtom> &undefined() const override {
+    const AtomVector<lld::UndefinedAtom> &undefined() const override {
       return _noUndefinedAtoms;
     }
-    virtual const atom_collection<lld::SharedLibraryAtom> &
+    virtual const AtomVector<lld::SharedLibraryAtom> &
     sharedLibrary() const override {
       return _noSharedLibraryAtoms;
     }
-    const atom_collection<lld::AbsoluteAtom> &absolute() const override {
+    const AtomVector<lld::AbsoluteAtom> &absolute() const override {
       return _noAbsoluteAtoms;
     }
     File *find(StringRef name, bool dataSymbolOnly) override {
@@ -640,17 +640,17 @@ template <> struct MappingTraits<const l
     }
     const lld::File *denormalize(IO &io);
 
-    const atom_collection<lld::DefinedAtom> &defined() const override {
+    const AtomVector<lld::DefinedAtom> &defined() const override {
       return _definedAtoms._atoms;
     }
-    const atom_collection<lld::UndefinedAtom> &undefined() const override {
+    const AtomVector<lld::UndefinedAtom> &undefined() const override {
       return _undefinedAtoms._atoms;
     }
-    virtual const atom_collection<lld::SharedLibraryAtom> &
+    virtual const AtomVector<lld::SharedLibraryAtom> &
     sharedLibrary() const override {
       return _sharedLibraryAtoms._atoms;
     }
-    const atom_collection<lld::AbsoluteAtom> &absolute() const override {
+    const AtomVector<lld::AbsoluteAtom> &absolute() const override {
       return _absoluteAtoms._atoms;
     }
 





More information about the llvm-commits mailing list