From: Michael J. Spencer Date: Tue, 13 Nov 2012 19:58:58 +0000 (+0000) Subject: Fix style violations. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5d22811af227f334f27d8e54f0a4d7961225b3b;p=platform%2Fupstream%2Fllvm.git Fix style violations. llvm-svn: 167869 --- diff --git a/lld/include/lld/Core/ArchiveLibraryFile.h b/lld/include/lld/Core/ArchiveLibraryFile.h index fbeb296..e385e80 100644 --- a/lld/include/lld/Core/ArchiveLibraryFile.h +++ b/lld/include/lld/Core/ArchiveLibraryFile.h @@ -27,9 +27,6 @@ namespace lld { class ArchiveLibraryFile : public File { public: - virtual ~ArchiveLibraryFile() { - } - virtual Kind kind() const { return kindArchiveLibrary; } @@ -37,9 +34,6 @@ public: static inline bool classof(const File *f) { return f->kind() == kindArchiveLibrary; } - static inline bool classof(const ArchiveLibraryFile *) { - return true; - } /// Check if any member of the archive contains an Atom with the /// specified name and return the File object for that member, or nullptr. diff --git a/lld/include/lld/ReaderWriter/ReaderArchive.h b/lld/include/lld/ReaderWriter/ReaderArchive.h index f63006c..abe868b 100644 --- a/lld/include/lld/ReaderWriter/ReaderArchive.h +++ b/lld/include/lld/ReaderWriter/ReaderArchive.h @@ -11,31 +11,31 @@ #define LLD_READER_ARCHIVE_H #include "lld/Core/ArchiveLibraryFile.h" -#include "llvm/Object/ObjectFile.h" -#include "llvm/ADT/OwningPtr.h" -#include "llvm/ADT/StringRef.h" -#include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/system_error.h" -#include "llvm/Object/Archive.h" #include "lld/Core/File.h" #include "lld/Core/LLVM.h" #include "lld/ReaderWriter/Reader.h" #include "lld/ReaderWriter/ReaderArchive.h" + +#include "llvm/ADT/OwningPtr.h" +#include "llvm/ADT/StringRef.h" +#include "llvm/Object/Archive.h" +#include "llvm/Object/ObjectFile.h" +#include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/system_error.h" + #include -#include #include -namespace lld -{ -/// -/// The ReaderOptionsArchive encapsulates the options used by the ReaderArchive. -/// The option objects are the only way to control the behaviour of Readers. -/// -class ReaderOptionsArchive -{ +namespace lld { + +/// \brief The ReaderOptionsArchive encapsulates the options used by the +/// ReaderArchive. The option objects are the only way to control the +/// behaviour of Readers. +class ReaderOptionsArchive { public: - ReaderOptionsArchive(bool is_force_load=false): _isForceLoad(is_force_load), - _reader(nullptr) + ReaderOptionsArchive(bool isForceLoad = false) + : _isForceLoad(isForceLoad) + , _reader(nullptr) { } bool isForceLoad() const { @@ -55,23 +55,20 @@ private: Reader *_reader; }; -// ReaderArchive is a class for reading archive libraries -class ReaderArchive final -{ +/// \brief ReaderArchive is a class for reading archive libraries +class ReaderArchive { public: - ReaderArchive(ReaderOptionsArchive &options) : _options(options), - _archive() + ReaderArchive(const ReaderOptionsArchive &options) + : _options(options) { } - // Returns a vector of Files that are contained in the archive file - // pointed to by the Memorybuffer - virtual error_code parseFile(std::unique_ptr mb, - std::vector> &result); - - virtual ~ReaderArchive() { } + /// \brief Returns a vector of Files that are contained in the archive file + /// pointed to by the Memorybuffer + error_code parseFile(std::unique_ptr mb, + std::vector> &result); private: - ReaderOptionsArchive &_options; + const ReaderOptionsArchive &_options; std::unique_ptr _archive; }; diff --git a/lld/lib/ReaderWriter/ELF/ReaderELF.cpp b/lld/lib/ReaderWriter/ELF/ReaderELF.cpp index e239fd7..ad0227f 100644 --- a/lld/lib/ReaderWriter/ELF/ReaderELF.cpp +++ b/lld/lib/ReaderWriter/ELF/ReaderELF.cpp @@ -752,11 +752,10 @@ private: class ReaderELF: public Reader { public: - ReaderELF(const ReaderOptionsELF &readerELFOptions, + ReaderELF(const ReaderOptionsELF &, ReaderOptionsArchive &readerOptionsArchive) - : _readerELFOptions(readerELFOptions), - _readerOptionsArchive(readerOptionsArchive), - _readerArchive(_readerOptionsArchive) { + : _readerOptionsArchive(readerOptionsArchive) + , _readerArchive(_readerOptionsArchive) { _readerOptionsArchive.setReader(this); } @@ -770,42 +769,40 @@ public: llvm::sys::IdentifyFileType(mb->getBufferStart(), static_cast(mb->getBufferSize())); switch (fileType) { + case llvm::sys::ELF_Relocatable_FileType: + Ident = llvm::object::getElfArchType(&*mb); + // Instantiate the correct FileELF template instance + // based on the Ident pair. Once the File is created + // we push the file to the vector of files already + // created during parser's life. + + if (Ident.first == llvm::ELF::ELFCLASS32 && Ident.second + == llvm::ELF::ELFDATA2LSB) { + f.reset(new FileELF(std::move(mb), ec)); + + } else if (Ident.first == llvm::ELF::ELFCLASS32 && Ident.second + == llvm::ELF::ELFDATA2MSB) { + f.reset(new FileELF (std::move(mb), ec)); + + } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second + == llvm::ELF::ELFDATA2MSB) { + f.reset(new FileELF (std::move(mb), ec)); + + } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second + == llvm::ELF::ELFDATA2LSB) { + f.reset(new FileELF (std::move(mb), ec)); + } + if (!ec) + result.push_back(std::move(f)); + break; - case llvm::sys::ELF_Relocatable_FileType: - - Ident = llvm::object::getElfArchType(&*mb); - // Instantiate the correct FileELF template instance - // based on the Ident pair. Once the File is created - // we push the file to the vector of files already - // created during parser's life. - - if (Ident.first == llvm::ELF::ELFCLASS32 && Ident.second - == llvm::ELF::ELFDATA2LSB) { - f.reset(new FileELF(std::move(mb), ec)); - - } else if (Ident.first == llvm::ELF::ELFCLASS32 && Ident.second - == llvm::ELF::ELFDATA2MSB) { - f.reset(new FileELF (std::move(mb), ec)); - - } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second - == llvm::ELF::ELFDATA2MSB) { - f.reset(new FileELF (std::move(mb), ec)); - - } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second - == llvm::ELF::ELFDATA2LSB) { - f.reset(new FileELF (std::move(mb), ec)); - } - if (!ec) - result.push_back(std::move(f)); - break; - - case llvm::sys::Archive_FileType: - ec = _readerArchive.parseFile(std::move(mb), result); - break; + case llvm::sys::Archive_FileType: + ec = _readerArchive.parseFile(std::move(mb), result); + break; - default: - llvm_unreachable("not supported format"); - break; + default: + llvm_unreachable("not supported format"); + break; } if (ec) @@ -815,7 +812,6 @@ public: } private: - const ReaderOptionsELF &_readerELFOptions; ReaderOptionsArchive &_readerOptionsArchive; ReaderArchive _readerArchive; }; diff --git a/lld/lib/ReaderWriter/ReaderArchive.cpp b/lld/lib/ReaderWriter/ReaderArchive.cpp index 437db2a..4bce530 100644 --- a/lld/lib/ReaderWriter/ReaderArchive.cpp +++ b/lld/lib/ReaderWriter/ReaderArchive.cpp @@ -6,17 +6,17 @@ // License. See LICENSE.TXT for details. // //===---------------------------------------------------------------------===// + #include "lld/ReaderWriter/ReaderArchive.h" -namespace lld -{ -// The FileArchive class represents an Archive Library file +namespace lld { +/// \brief The FileArchive class represents an Archive Library file class FileArchive : public ArchiveLibraryFile { public: virtual ~FileArchive() { } - /// Check if any member of the archive contains an Atom with the + /// \brief Check if any member of the archive contains an Atom with the /// specified name and return the File object for that member, or nullptr. virtual const File *find(StringRef name, bool dataSymbolOnly) const { error_code ec; @@ -66,8 +66,7 @@ public: } protected: - error_code isDataSymbol(MemoryBuffer *mb, StringRef symbol) const - { + error_code isDataSymbol(MemoryBuffer *mb, StringRef symbol) const { llvm::object::ObjectFile *obj = llvm::object::ObjectFile::createObjectFile(mb); error_code ec; @@ -103,7 +102,6 @@ protected: } private: - llvm::MemoryBuffer *_mb; std::unique_ptr _archive; const ReaderOptionsArchive _options; atom_collection_vector _definedAtoms; @@ -117,13 +115,12 @@ public: const ReaderOptionsArchive &options, error_code &ec) :ArchiveLibraryFile(mb->getBufferIdentifier()), - _mb(mb), - _archive(nullptr), _options(options) { - auto *archive_obj = new llvm::object::Archive(mb, ec); - if (ec) + std::unique_ptr archive_obj( + new llvm::object::Archive(mb, ec)); + if (ec) return; - _archive.reset(archive_obj); + _archive.swap(archive_obj); } }; // class FileArchive @@ -133,15 +130,13 @@ error_code ReaderArchive::parseFile(std::unique_ptr mb, std::vector> &result) { error_code ec; - if (_options.isForceLoad()) - { + if (_options.isForceLoad()) { _archive.reset(new llvm::object::Archive(mb.release(), ec)); if (ec) return ec; for (auto mf = _archive->begin_children(), - me = _archive->end_children(); mf != me; ++mf) - { + me = _archive->end_children(); mf != me; ++mf) { if ((ec = _options.reader()->parseFile(std::unique_ptr (mf->getBuffer()), result))) return ec;