[lld] r235776 - Use MemoryBufferRef instead of MemoryBuffer&. NFC.
Rafael Espindola
rafael.espindola at gmail.com
Fri Apr 24 14:10:51 PDT 2015
Author: rafael
Date: Fri Apr 24 16:10:50 2015
New Revision: 235776
URL: http://llvm.org/viewvc/llvm-project?rev=235776&view=rev
Log:
Use MemoryBufferRef instead of MemoryBuffer&. NFC.
This just reduces the noise from another patch.
Modified:
lld/trunk/include/lld/Core/LLVM.h
lld/trunk/include/lld/Core/Reader.h
lld/trunk/lib/Core/Reader.cpp
lld/trunk/lib/ReaderWriter/ELF/ELFReader.h
lld/trunk/lib/ReaderWriter/FileArchive.cpp
lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
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/LLVM.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/LLVM.h?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/LLVM.h (original)
+++ lld/trunk/include/lld/Core/LLVM.h Fri Apr 24 16:10:50 2015
@@ -26,6 +26,7 @@ namespace llvm {
class StringRef;
class Twine;
class MemoryBuffer;
+ class MemoryBufferRef;
template<typename T> class ArrayRef;
template<unsigned InternalLen> class SmallString;
template<typename T, unsigned N> class SmallVector;
@@ -53,6 +54,7 @@ namespace lld {
using llvm::StringRef;
using llvm::Twine;
using llvm::MemoryBuffer;
+ using llvm::MemoryBufferRef;
using llvm::ArrayRef;
using llvm::SmallString;
using llvm::SmallVector;
Modified: lld/trunk/include/lld/Core/Reader.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Reader.h?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Reader.h (original)
+++ lld/trunk/include/lld/Core/Reader.h Fri Apr 24 16:10:50 2015
@@ -46,7 +46,7 @@ public:
/// The method is called with:
/// 1) the file_magic enumeration returned by identify_magic()
/// 2) the whole file content buffer if the above is not enough.
- virtual bool canParse(file_magic magic, const MemoryBuffer &mb) const = 0;
+ virtual bool canParse(file_magic magic, MemoryBufferRef mb) const = 0;
/// \brief Parse a supplied buffer (already filled with the contents of a
/// file) and create a File object.
Modified: lld/trunk/lib/Core/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Reader.cpp?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/lib/Core/Reader.cpp (original)
+++ lld/trunk/lib/Core/Reader.cpp Fri Apr 24 16:10:50 2015
@@ -36,7 +36,7 @@ Registry::loadFile(std::unique_ptr<Memor
// Ask each registered reader if it can handle this file type or extension.
for (const std::unique_ptr<Reader> &reader : _readers) {
- if (!reader->canParse(fileType, *mb))
+ if (!reader->canParse(fileType, mb->getMemBufferRef()))
continue;
return reader->loadFile(std::move(mb), *this);
}
Modified: lld/trunk/lib/ReaderWriter/ELF/ELFReader.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFReader.h?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ELFReader.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ELFReader.h Fri Apr 24 16:10:50 2015
@@ -24,7 +24,7 @@ template <typename FileT> class ELFReade
public:
ELFReader(ELFLinkingContext &ctx) : _ctx(ctx) {}
- bool canParse(file_magic magic, const MemoryBuffer &mb) const override {
+ bool canParse(file_magic magic, MemoryBufferRef mb) const override {
return FileT::canParse(magic);
}
Modified: lld/trunk/lib/ReaderWriter/FileArchive.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/FileArchive.cpp?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/FileArchive.cpp (original)
+++ lld/trunk/lib/ReaderWriter/FileArchive.cpp Fri Apr 24 16:10:50 2015
@@ -261,7 +261,7 @@ class ArchiveReader : public Reader {
public:
ArchiveReader(bool logLoading) : _logLoading(logLoading) {}
- bool canParse(file_magic magic, const MemoryBuffer &) const override {
+ bool canParse(file_magic magic, MemoryBufferRef) const override {
return magic == llvm::sys::fs::file_magic::archive;
}
Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp Fri Apr 24 16:10:50 2015
@@ -517,7 +517,7 @@ class MachOObjectReader : public Reader
public:
MachOObjectReader(MachOLinkingContext &ctx) : _ctx(ctx) {}
- bool canParse(file_magic magic, const MemoryBuffer &mb) const override {
+ bool canParse(file_magic magic, MemoryBufferRef mb) const override {
return (magic == llvm::sys::fs::file_magic::macho_object &&
mb.getBufferSize() > 32);
}
@@ -538,7 +538,7 @@ class MachODylibReader : public Reader {
public:
MachODylibReader(MachOLinkingContext &ctx) : _ctx(ctx) {}
- bool canParse(file_magic magic, const MemoryBuffer &mb) const override {
+ bool canParse(file_magic magic, MemoryBufferRef mb) const override {
switch (magic) {
case llvm::sys::fs::file_magic::macho_dynamically_linked_shared_lib:
case llvm::sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub:
Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp Fri Apr 24 16:10:50 2015
@@ -1048,7 +1048,7 @@ class COFFObjectReader : public Reader {
public:
COFFObjectReader(PECOFFLinkingContext &ctx) : _ctx(ctx) {}
- bool canParse(file_magic magic, const MemoryBuffer &) const override {
+ bool canParse(file_magic magic, MemoryBufferRef) const override {
return magic == llvm::sys::fs::file_magic::coff_object;
}
Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp Fri Apr 24 16:10:50 2015
@@ -361,7 +361,7 @@ class COFFImportLibraryReader : public R
public:
COFFImportLibraryReader(PECOFFLinkingContext &ctx) : _ctx(ctx) {}
- bool canParse(file_magic magic, const MemoryBuffer &mb) const override {
+ bool canParse(file_magic magic, MemoryBufferRef mb) const override {
if (mb.getBufferSize() < sizeof(COFF::ImportHeader))
return false;
return magic == llvm::sys::fs::file_magic::coff_import_library;
Modified: lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp?rev=235776&r1=235775&r2=235776&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp (original)
+++ lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp Fri Apr 24 16:10:50 2015
@@ -1289,7 +1289,7 @@ class YAMLReader : public Reader {
public:
YAMLReader(const Registry ®istry) : _registry(registry) {}
- bool canParse(file_magic magic, const MemoryBuffer &mb) const override {
+ bool canParse(file_magic magic, MemoryBufferRef mb) const override {
StringRef ext = llvm::sys::path::extension(mb.getBufferIdentifier());
return ext.equals(".objtxt") || ext.equals(".yaml");
}
More information about the llvm-commits
mailing list