[llvm-commits] [lld] r167869 - in /lld/trunk: include/lld/Core/ArchiveLibraryFile.h include/lld/ReaderWriter/ReaderArchive.h lib/ReaderWriter/ELF/ReaderELF.cpp lib/ReaderWriter/ReaderArchive.cpp
Michael J. Spencer
bigcheesegs at gmail.com
Tue Nov 13 11:58:59 PST 2012
Author: mspencer
Date: Tue Nov 13 13:58:58 2012
New Revision: 167869
URL: http://llvm.org/viewvc/llvm-project?rev=167869&view=rev
Log:
Fix style violations.
Modified:
lld/trunk/include/lld/Core/ArchiveLibraryFile.h
lld/trunk/include/lld/ReaderWriter/ReaderArchive.h
lld/trunk/lib/ReaderWriter/ELF/ReaderELF.cpp
lld/trunk/lib/ReaderWriter/ReaderArchive.cpp
Modified: lld/trunk/include/lld/Core/ArchiveLibraryFile.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/ArchiveLibraryFile.h?rev=167869&r1=167868&r2=167869&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/ArchiveLibraryFile.h (original)
+++ lld/trunk/include/lld/Core/ArchiveLibraryFile.h Tue Nov 13 13:58:58 2012
@@ -27,9 +27,6 @@
class ArchiveLibraryFile : public File {
public:
- virtual ~ArchiveLibraryFile() {
- }
-
virtual Kind kind() const {
return kindArchiveLibrary;
}
@@ -37,9 +34,6 @@
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.
Modified: lld/trunk/include/lld/ReaderWriter/ReaderArchive.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ReaderArchive.h?rev=167869&r1=167868&r2=167869&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/ReaderArchive.h (original)
+++ lld/trunk/include/lld/ReaderWriter/ReaderArchive.h Tue Nov 13 13:58:58 2012
@@ -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 <memory>
-#include <bits/unique_ptr.h>
#include <vector>
-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 @@
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<llvm::MemoryBuffer> mb,
- std::vector<std::unique_ptr<File>> &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<llvm::MemoryBuffer> mb,
+ std::vector<std::unique_ptr<File>> &result);
private:
- ReaderOptionsArchive &_options;
+ const ReaderOptionsArchive &_options;
std::unique_ptr<llvm::object::Archive> _archive;
};
Modified: lld/trunk/lib/ReaderWriter/ELF/ReaderELF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ReaderELF.cpp?rev=167869&r1=167868&r2=167869&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ReaderELF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ReaderELF.cpp Tue Nov 13 13:58:58 2012
@@ -752,11 +752,10 @@
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 @@
llvm::sys::IdentifyFileType(mb->getBufferStart(),
static_cast<unsigned>(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<llvm::support::little, false>(std::move(mb), ec));
-
- } else if (Ident.first == llvm::ELF::ELFCLASS32 && Ident.second
- == llvm::ELF::ELFDATA2MSB) {
- f.reset(new FileELF<llvm::support::big, false> (std::move(mb), ec));
-
- } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second
- == llvm::ELF::ELFDATA2MSB) {
- f.reset(new FileELF<llvm::support::big, true> (std::move(mb), ec));
-
- } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second
- == llvm::ELF::ELFDATA2LSB) {
- f.reset(new FileELF<llvm::support::little, true> (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;
-
- default:
- llvm_unreachable("not supported format");
- 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<llvm::support::little, false>(std::move(mb), ec));
+
+ } else if (Ident.first == llvm::ELF::ELFCLASS32 && Ident.second
+ == llvm::ELF::ELFDATA2MSB) {
+ f.reset(new FileELF<llvm::support::big, false> (std::move(mb), ec));
+
+ } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second
+ == llvm::ELF::ELFDATA2MSB) {
+ f.reset(new FileELF<llvm::support::big, true> (std::move(mb), ec));
+
+ } else if (Ident.first == llvm::ELF::ELFCLASS64 && Ident.second
+ == llvm::ELF::ELFDATA2LSB) {
+ f.reset(new FileELF<llvm::support::little, true> (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;
+
+ default:
+ llvm_unreachable("not supported format");
+ break;
}
if (ec)
@@ -815,7 +812,6 @@
}
private:
- const ReaderOptionsELF &_readerELFOptions;
ReaderOptionsArchive &_readerOptionsArchive;
ReaderArchive _readerArchive;
};
Modified: lld/trunk/lib/ReaderWriter/ReaderArchive.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ReaderArchive.cpp?rev=167869&r1=167868&r2=167869&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ReaderArchive.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ReaderArchive.cpp Tue Nov 13 13:58:58 2012
@@ -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 @@
}
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 @@
}
private:
- llvm::MemoryBuffer *_mb;
std::unique_ptr<llvm::object::Archive> _archive;
const ReaderOptionsArchive _options;
atom_collection_vector<DefinedAtom> _definedAtoms;
@@ -117,13 +115,12 @@
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<llvm::object::Archive> 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 @@
std::vector<std::unique_ptr<File>> &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<MemoryBuffer>
(mf->getBuffer()), result)))
return ec;
More information about the llvm-commits
mailing list