[Lldb-commits] [lldb] [lldb][NFC] Change ObjectFile argument type (PR #171574)
Jason Molenda via lldb-commits
lldb-commits at lists.llvm.org
Wed Dec 10 19:29:37 PST 2025
https://github.com/jasonmolenda updated https://github.com/llvm/llvm-project/pull/171574
>From 0d4d04f17ee7a2a5ed66446e6c8f73b20bde1051 Mon Sep 17 00:00:00 2001
From: Jason Molenda <jmolenda at apple.com>
Date: Tue, 9 Dec 2025 23:28:19 -0800
Subject: [PATCH 1/4] [lldb][NFC] Change ObjectFile argument type
The ObjectFile plugin interface accepts an optional
DataBufferSP argument. If the caller has the contents
of the binary, it can provide this in that DataBufferSP.
The ObjectFile subclasses in their CreateInstance methods
will fill in the DataBufferSP with the actual binary contents
if it is not set.
ObjectFile base class creates an ivar DataExtractor from the
DataBufferSP passed in.
My next patch will be a caller that creates a VirtualDataExtractor
with the binary data, and needs to pass that in to the ObjectFile
plugin, instead of the bag-of-bytes DataBufferSP. It builds on
the previous patch changing ObjectFile's ivar from DataExtractor
to DataExtractorSP so I could pass in a subclass in the shared ptr.
And it will be using the VirtualDataExtractor that Jonas added in
https://github.com/llvm/llvm-project/pull/168802
No behavior is changed by the patch; we're simply moving the creation
of the DataExtractor to the caller, instead of a DataBuffer that
is immediately used to set up the ObjectFile DataExtractor. The
patch is a bit complicated because all of the ObjectFile subclasses
have to initialize their DataExtractor to pass in to the base class.
I ran the testsuite on macOS and on AArch64 Ubutnu. (btw David, I
ran it under qemu on my M4 mac with SME-no-SVE again, Ubuntu 25.10,
checked lshw(1) cpu capabilities, and qemu doesn't seem to be
virtualizing the SME, that explains why the testsuite passes)
rdar://148939795
---
lldb/include/lldb/Expression/ObjectFileJIT.h | 2 +-
lldb/include/lldb/Symbol/ObjectContainer.h | 4 +-
lldb/include/lldb/Symbol/ObjectFile.h | 6 +-
lldb/include/lldb/Utility/DataExtractor.h | 12 ++++
lldb/include/lldb/lldb-private-interfaces.h | 2 +-
lldb/source/Core/Module.cpp | 6 +-
lldb/source/Expression/ObjectFileJIT.cpp | 5 +-
.../BSD-Archive/ObjectContainerBSDArchive.cpp | 41 ++++++++------
.../BSD-Archive/ObjectContainerBSDArchive.h | 15 +++--
.../ObjectContainerMachOFileset.cpp | 14 ++---
.../ObjectContainerUniversalMachO.cpp | 8 +--
.../Breakpad/ObjectFileBreakpad.cpp | 26 +++++----
.../ObjectFile/Breakpad/ObjectFileBreakpad.h | 17 +++---
.../ObjectFile/COFF/ObjectFileCOFF.cpp | 29 ++++++----
.../Plugins/ObjectFile/COFF/ObjectFileCOFF.h | 19 ++++---
.../Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 34 ++++++++----
.../Plugins/ObjectFile/ELF/ObjectFileELF.h | 14 +++--
.../ObjectFile/JSON/ObjectFileJSON.cpp | 39 +++++++------
.../Plugins/ObjectFile/JSON/ObjectFileJSON.h | 19 ++++---
.../ObjectFile/Mach-O/ObjectFileMachO.cpp | 25 +++++----
.../ObjectFile/Mach-O/ObjectFileMachO.h | 10 ++--
.../Minidump/ObjectFileMinidump.cpp | 2 +-
.../ObjectFile/Minidump/ObjectFileMinidump.h | 7 ++-
.../Plugins/ObjectFile/PDB/ObjectFilePDB.cpp | 14 ++---
.../Plugins/ObjectFile/PDB/ObjectFilePDB.h | 4 +-
.../ObjectFile/PECOFF/ObjectFilePECOFF.cpp | 24 ++++----
.../ObjectFile/PECOFF/ObjectFilePECOFF.h | 13 +++--
.../ObjectFile/XCOFF/ObjectFileXCOFF.cpp | 27 +++++----
.../ObjectFile/XCOFF/ObjectFileXCOFF.h | 10 ++--
.../ObjectFile/wasm/ObjectFileWasm.cpp | 36 +++++++-----
.../Plugins/ObjectFile/wasm/ObjectFileWasm.h | 17 +++---
.../gdb-remote/GDBRemoteRegisterContext.cpp | 3 +-
.../SymbolFile/DWARF/SymbolFileDWARF.cpp | 6 +-
.../SymbolVendor/ELF/SymbolVendorELF.cpp | 8 +--
.../MacOSX/SymbolVendorMacOSX.cpp | 4 +-
.../PECOFF/SymbolVendorPECOFF.cpp | 4 +-
.../SymbolVendor/wasm/SymbolVendorWasm.cpp | 4 +-
lldb/source/Symbol/ObjectContainer.cpp | 8 ++-
lldb/source/Symbol/ObjectFile.cpp | 55 ++++++++++++-------
lldb/source/Symbol/SymbolVendor.cpp | 2 +-
lldb/source/Utility/DataExtractor.cpp | 9 +++
41 files changed, 362 insertions(+), 242 deletions(-)
diff --git a/lldb/include/lldb/Expression/ObjectFileJIT.h b/lldb/include/lldb/Expression/ObjectFileJIT.h
index 7e50340ca84bd..ff584f15248f1 100644
--- a/lldb/include/lldb/Expression/ObjectFileJIT.h
+++ b/lldb/include/lldb/Expression/ObjectFileJIT.h
@@ -49,7 +49,7 @@ class ObjectFileJIT : public ObjectFile {
}
static lldb_private::ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
+ CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataExtractorSP data_sp,
lldb::offset_t data_offset, const lldb_private::FileSpec *file,
lldb::offset_t file_offset, lldb::offset_t length);
diff --git a/lldb/include/lldb/Symbol/ObjectContainer.h b/lldb/include/lldb/Symbol/ObjectContainer.h
index 886ab46dc1e48..6f03c4d968707 100644
--- a/lldb/include/lldb/Symbol/ObjectContainer.h
+++ b/lldb/include/lldb/Symbol/ObjectContainer.h
@@ -97,7 +97,7 @@ class ObjectContainer : public PluginInterface, public ModuleChild {
/// Attempts to parse the object header.
///
/// This function is used as a test to see if a given plug-in instance can
- /// parse the header data already contained in ObjectContainer::m_data. If
+ /// parse the header data already contained in ObjectContainer::m_data_sp. If
/// an object file parser does not recognize that magic bytes in a header,
/// false should be returned and the next plug-in can attempt to parse an
/// object file.
@@ -140,7 +140,7 @@ class ObjectContainer : public PluginInterface, public ModuleChild {
lldb::addr_t m_length;
/// The data for this object file so things can be parsed lazily.
- DataExtractor m_data;
+ lldb::DataExtractorSP m_data_sp;
private:
ObjectContainer(const ObjectContainer &) = delete;
diff --git a/lldb/include/lldb/Symbol/ObjectFile.h b/lldb/include/lldb/Symbol/ObjectFile.h
index 993650b8888f5..0c9bf8fc03c63 100644
--- a/lldb/include/lldb/Symbol/ObjectFile.h
+++ b/lldb/include/lldb/Symbol/ObjectFile.h
@@ -105,10 +105,10 @@ class ObjectFile : public std::enable_shared_from_this<ObjectFile>,
/// more than one architecture or object.
ObjectFile(const lldb::ModuleSP &module_sp, const FileSpec *file_spec_ptr,
lldb::offset_t file_offset, lldb::offset_t length,
- lldb::DataBufferSP data_sp, lldb::offset_t data_offset);
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset);
ObjectFile(const lldb::ModuleSP &module_sp, const lldb::ProcessSP &process_sp,
- lldb::addr_t header_addr, lldb::DataBufferSP data_sp);
+ lldb::addr_t header_addr, lldb::DataExtractorSP extractor_sp);
/// Destructor.
///
@@ -152,7 +152,7 @@ class ObjectFile : public std::enable_shared_from_this<ObjectFile>,
static lldb::ObjectFileSP
FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file_spec,
lldb::offset_t file_offset, lldb::offset_t file_size,
- lldb::DataBufferSP &data_sp, lldb::offset_t &data_offset);
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t &data_offset);
/// Find a ObjectFile plug-in that can parse a file in memory.
///
diff --git a/lldb/include/lldb/Utility/DataExtractor.h b/lldb/include/lldb/Utility/DataExtractor.h
index db85b44debf43..56d4fd36198fe 100644
--- a/lldb/include/lldb/Utility/DataExtractor.h
+++ b/lldb/include/lldb/Utility/DataExtractor.h
@@ -109,6 +109,18 @@ class DataExtractor {
DataExtractor(const lldb::DataBufferSP &data_sp, lldb::ByteOrder byte_order,
uint32_t addr_size, uint32_t target_byte_size = 1);
+ /// Constructure with shared data, but no byte order/addr size unspecified.
+ ///
+ /// Copies the data shared pointer which adds a reference to the contained
+ /// in \a data_sp. The shared data reference is reference counted to ensure
+ /// the data lives as long as anyone still has a valid shared pointer to the
+ /// data in \a data_sp.
+ ///
+ /// \param[in] data_sp
+ /// A shared pointer to data.
+ DataExtractor(const lldb::DataBufferSP &data_sp,
+ uint32_t target_byte_size = 1);
+
/// Construct with a subset of \a data.
///
/// Initialize this object with a subset of the data bytes in \a data. If \a
diff --git a/lldb/include/lldb/lldb-private-interfaces.h b/lldb/include/lldb/lldb-private-interfaces.h
index 52806eea190a7..f7673b5dadc11 100644
--- a/lldb/include/lldb/lldb-private-interfaces.h
+++ b/lldb/include/lldb/lldb-private-interfaces.h
@@ -50,7 +50,7 @@ typedef size_t (*ObjectFileGetModuleSpecifications)(
lldb::offset_t data_offset, lldb::offset_t file_offset,
lldb::offset_t length, ModuleSpecList &module_specs);
typedef ObjectFile *(*ObjectFileCreateInstance)(const lldb::ModuleSP &module_sp,
- lldb::DataBufferSP data_sp,
+ lldb::DataExtractorSP data_sp,
lldb::offset_t data_offset,
const FileSpec *file,
lldb::offset_t file_offset,
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index da2c188899f03..3795321dd9025 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -1206,10 +1206,12 @@ ObjectFile *Module::GetObjectFile() {
m_did_load_objfile = true;
// FindPlugin will modify its data_sp argument. Do not let it
// modify our m_data_sp member.
- auto data_sp = m_data_sp;
+ DataExtractorSP extractor_sp;
+ if (m_data_sp)
+ extractor_sp = std::make_shared<DataExtractor>(m_data_sp);
m_objfile_sp = ObjectFile::FindPlugin(
shared_from_this(), &m_file, m_object_offset,
- file_size - m_object_offset, data_sp, data_offset);
+ file_size - m_object_offset, extractor_sp, data_offset);
if (m_objfile_sp) {
// Once we get the object file, update our module with the object
// file's architecture since it might differ in vendor/os if some
diff --git a/lldb/source/Expression/ObjectFileJIT.cpp b/lldb/source/Expression/ObjectFileJIT.cpp
index 46ceb75fbc721..431bcd9b5f198 100644
--- a/lldb/source/Expression/ObjectFileJIT.cpp
+++ b/lldb/source/Expression/ObjectFileJIT.cpp
@@ -41,7 +41,7 @@ void ObjectFileJIT::Terminate() {
}
ObjectFile *ObjectFileJIT::CreateInstance(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp,
+ DataExtractorSP data_sp,
lldb::offset_t data_offset,
const FileSpec *file,
lldb::offset_t file_offset,
@@ -70,7 +70,8 @@ size_t ObjectFileJIT::GetModuleSpecifications(
ObjectFileJIT::ObjectFileJIT(const lldb::ModuleSP &module_sp,
const ObjectFileJITDelegateSP &delegate_sp)
- : ObjectFile(module_sp, nullptr, 0, 0, DataBufferSP(), 0), m_delegate_wp() {
+ : ObjectFile(module_sp, nullptr, 0, 0, DataExtractorSP(), 0),
+ m_delegate_wp() {
if (delegate_sp) {
m_delegate_wp = delegate_sp;
m_data_nsp->SetByteOrder(delegate_sp->GetByteOrder());
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
index 6e5617664f7fe..50c67eea18200 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -68,21 +68,19 @@ void ObjectContainerBSDArchive::Object::Dump() const {
ObjectContainerBSDArchive::Archive::Archive(const lldb_private::ArchSpec &arch,
const llvm::sys::TimePoint<> &time,
lldb::offset_t file_offset,
- lldb_private::DataExtractor &data,
+ lldb::DataExtractorSP data,
ArchiveType archive_type)
: m_arch(arch), m_modification_time(time), m_file_offset(file_offset),
- m_objects(), m_data(data), m_archive_type(archive_type) {}
+ m_objects(), m_data_sp(data), m_archive_type(archive_type) {}
Log *l = GetLog(LLDBLog::Object);
ObjectContainerBSDArchive::Archive::~Archive() = default;
size_t ObjectContainerBSDArchive::Archive::ParseObjects() {
- DataExtractor &data = m_data;
-
std::unique_ptr<llvm::MemoryBuffer> mem_buffer =
llvm::MemoryBuffer::getMemBuffer(
- llvm::StringRef((const char *)data.GetDataStart(),
- data.GetByteSize()),
+ llvm::StringRef((const char *)m_data_sp->GetDataStart(),
+ m_data_sp->GetByteSize()),
llvm::StringRef(),
/*RequiresNullTerminator=*/false);
@@ -221,7 +219,7 @@ ObjectContainerBSDArchive::Archive::shared_ptr
ObjectContainerBSDArchive::Archive::ParseAndCacheArchiveForFile(
const FileSpec &file, const ArchSpec &arch,
const llvm::sys::TimePoint<> &time, lldb::offset_t file_offset,
- DataExtractor &data, ArchiveType archive_type) {
+ DataExtractorSP data, ArchiveType archive_type) {
shared_ptr archive_sp(
new Archive(arch, time, file_offset, data, archive_type));
if (archive_sp) {
@@ -368,16 +366,17 @@ ObjectContainerBSDArchive::~ObjectContainerBSDArchive() = default;
bool ObjectContainerBSDArchive::ParseHeader() {
if (m_archive_sp.get() == nullptr) {
- if (m_data.GetByteSize() > 0) {
+ if (m_data_sp->GetByteSize() > 0) {
ModuleSP module_sp(GetModule());
if (module_sp) {
m_archive_sp = Archive::ParseAndCacheArchiveForFile(
m_file, module_sp->GetArchitecture(),
- module_sp->GetModificationTime(), m_offset, m_data, m_archive_type);
+ module_sp->GetModificationTime(), m_offset, m_data_sp,
+ m_archive_type);
}
- // Clear the m_data that contains the entire archive data and let our
+ // Clear the m_data_sp that contains the entire archive data and let our
// m_archive_sp hold onto the data.
- m_data.Clear();
+ m_data_sp = std::make_shared<DataExtractor>();
}
}
return m_archive_sp.get() != nullptr;
@@ -416,14 +415,18 @@ ObjectFileSP ObjectContainerBSDArchive::GetObjectFile(const FileSpec *file) {
child_data_sp->GetByteSize() != object->file_size)
return ObjectFileSP();
lldb::offset_t data_offset = 0;
+ DataExtractorSP extractor_sp =
+ std::make_shared<DataExtractor>(child_data_sp);
return ObjectFile::FindPlugin(
module_sp, &child, m_offset + object->file_offset,
- object->file_size, child_data_sp, data_offset);
+ object->file_size, extractor_sp, data_offset);
}
lldb::offset_t data_offset = object->file_offset;
+ DataExtractorSP extractor_sp =
+ std::make_shared<DataExtractor>(m_archive_sp->GetData());
return ObjectFile::FindPlugin(
module_sp, file, m_offset + object->file_offset, object->file_size,
- m_archive_sp->GetData().GetSharedDataBuffer(), data_offset);
+ extractor_sp, data_offset);
}
}
}
@@ -438,9 +441,10 @@ size_t ObjectContainerBSDArchive::GetModuleSpecifications(
// We have data, which means this is the first 512 bytes of the file Check to
// see if the magic bytes match and if they do, read the entire table of
// contents for the archive and cache it
- DataExtractor data;
- data.SetData(data_sp, data_offset, data_sp->GetByteSize());
- ArchiveType archive_type = ObjectContainerBSDArchive::MagicBytesMatch(data);
+ DataExtractorSP extractor_sp = std::make_shared<DataExtractor>();
+ extractor_sp->SetData(data_sp, data_offset, data_sp->GetByteSize());
+ ArchiveType archive_type =
+ ObjectContainerBSDArchive::MagicBytesMatch(*extractor_sp.get());
if (!file || !data_sp || archive_type == ArchiveType::Invalid)
return 0;
@@ -455,9 +459,10 @@ size_t ObjectContainerBSDArchive::GetModuleSpecifications(
data_sp =
FileSystem::Instance().CreateDataBuffer(file, file_size, file_offset);
if (data_sp) {
- data.SetData(data_sp, 0, data_sp->GetByteSize());
+ extractor_sp->SetData(data_sp);
archive_sp = Archive::ParseAndCacheArchiveForFile(
- file, ArchSpec(), file_mod_time, file_offset, data, archive_type);
+ file, ArchSpec(), file_mod_time, file_offset, extractor_sp,
+ archive_type);
}
}
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
index fbecd1d27063e..1463c473a6d8b 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
@@ -13,7 +13,9 @@
#include "lldb/Symbol/ObjectContainer.h"
#include "lldb/Utility/ArchSpec.h"
#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/FileSpec.h"
+#include "lldb/Utility/NonNullSharedPtr.h"
#include "llvm/Object/Archive.h"
#include "llvm/Support/Chrono.h"
@@ -112,7 +114,7 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
Archive(const lldb_private::ArchSpec &arch,
const llvm::sys::TimePoint<> &mod_time, lldb::offset_t file_offset,
- lldb_private::DataExtractor &data, ArchiveType archive_type);
+ lldb::DataExtractorSP data, ArchiveType archive_type);
~Archive();
@@ -127,7 +129,7 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
static Archive::shared_ptr ParseAndCacheArchiveForFile(
const lldb_private::FileSpec &file, const lldb_private::ArchSpec &arch,
const llvm::sys::TimePoint<> &mod_time, lldb::offset_t file_offset,
- lldb_private::DataExtractor &data, ArchiveType archive_type);
+ lldb::DataExtractorSP data_sp, ArchiveType archive_type);
size_t GetNumObjects() const { return m_objects.size(); }
@@ -154,7 +156,8 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
bool HasNoExternalReferences() const;
- lldb_private::DataExtractor &GetData() { return m_data; }
+ lldb_private::DataExtractor &GetData() { return *m_data_sp.get(); }
+ lldb::DataExtractorSP &GetDataSP() { return m_data_sp; }
ArchiveType GetArchiveType() { return m_archive_type; }
@@ -166,9 +169,9 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
lldb::offset_t m_file_offset;
std::vector<Object> m_objects;
ObjectNameToIndexMap m_object_name_to_index_map;
- lldb_private::DataExtractor m_data; ///< The data for this object container
- ///so we don't lose data if the .a files
- ///gets modified
+ lldb::DataExtractorSP m_data_sp; ///< The data for this object container
+ /// so we don't lose data if the .a files
+ /// gets modified
ArchiveType m_archive_type;
};
diff --git a/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp b/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp
index 76141f7976413..7938a234e246f 100644
--- a/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp
+++ b/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp
@@ -197,24 +197,24 @@ bool ObjectContainerMachOFileset::ParseHeader() {
std::lock_guard<std::recursive_mutex> guard(module_sp->GetMutex());
- std::optional<mach_header> header = ParseMachOHeader(m_data);
+ std::optional<mach_header> header = ParseMachOHeader(*m_data_sp.get());
if (!header)
return false;
const size_t header_size = MachHeaderSizeFromMagic(header->magic);
const size_t header_and_lc_size = header_size + header->sizeofcmds;
- if (m_data.GetByteSize() < header_and_lc_size) {
+ if (m_data_sp->GetByteSize() < header_and_lc_size) {
ProcessSP process_sp(m_process_wp.lock());
DataBufferSP data_sp =
process_sp
? ObjectFile::ReadMemory(process_sp, m_memory_addr,
header_and_lc_size)
: ObjectFile::MapFileData(m_file, header_and_lc_size, m_offset);
- m_data.SetData(data_sp);
+ m_data_sp->SetData(data_sp);
}
- return ParseFileset(m_data, *header, m_entries, m_memory_addr);
+ return ParseFileset(*m_data_sp.get(), *header, m_entries, m_memory_addr);
}
size_t ObjectContainerMachOFileset::GetModuleSpecifications(
@@ -282,11 +282,11 @@ ObjectContainerMachOFileset::GetObjectFile(const lldb_private::FileSpec *file) {
if (!entry)
return {};
- DataBufferSP data_sp;
+ DataExtractorSP extractor_sp;
lldb::offset_t data_offset = 0;
return ObjectFile::FindPlugin(module_sp, file, m_offset + entry->fileoff,
- m_data.GetByteSize() - entry->fileoff, data_sp,
- data_offset);
+ m_data_sp->GetByteSize() - entry->fileoff,
+ extractor_sp, data_offset);
}
ObjectContainerMachOFileset::Entry *
diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
index 9af9c0120dd7d..b455fd34ec00b 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
@@ -74,10 +74,10 @@ ObjectContainerUniversalMachO::ObjectContainerUniversalMachO(
ObjectContainerUniversalMachO::~ObjectContainerUniversalMachO() = default;
bool ObjectContainerUniversalMachO::ParseHeader() {
- bool success = ParseHeader(m_data, m_header, m_fat_archs);
+ bool success = ParseHeader(*m_data_sp.get(), m_header, m_fat_archs);
// We no longer need any data, we parsed all we needed to parse and cached it
// in m_header and m_fat_archs
- m_data.Clear();
+ m_data_sp = std::make_shared<DataExtractor>();
return success;
}
@@ -177,11 +177,11 @@ ObjectContainerUniversalMachO::GetObjectFile(const FileSpec *file) {
}
if (arch_idx < m_header.nfat_arch) {
- DataBufferSP data_sp;
+ DataExtractorSP extractor_sp;
lldb::offset_t data_offset = 0;
return ObjectFile::FindPlugin(
module_sp, file, m_offset + m_fat_archs[arch_idx].GetOffset(),
- m_fat_archs[arch_idx].GetSize(), data_sp, data_offset);
+ m_fat_archs[arch_idx].GetSize(), extractor_sp, data_offset);
}
}
return ObjectFileSP();
diff --git a/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.cpp b/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.cpp
index 53ff6ef6613e9..079ca4adf62e2 100644
--- a/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.cpp
+++ b/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.cpp
@@ -57,29 +57,35 @@ void ObjectFileBreakpad::Terminate() {
PluginManager::UnregisterPlugin(CreateInstance);
}
-ObjectFile *ObjectFileBreakpad::CreateInstance(
- const ModuleSP &module_sp, DataBufferSP data_sp, offset_t data_offset,
- const FileSpec *file, offset_t file_offset, offset_t length) {
- if (!data_sp) {
- data_sp = MapFileData(*file, length, file_offset);
+ObjectFile *ObjectFileBreakpad::CreateInstance(const ModuleSP &module_sp,
+ DataExtractorSP extractor_sp,
+ offset_t data_offset,
+ const FileSpec *file,
+ offset_t file_offset,
+ offset_t length) {
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
data_offset = 0;
}
- auto text = toStringRef(data_sp->GetData());
+ auto text = toStringRef(extractor_sp->GetSharedDataBuffer()->GetData());
std::optional<Header> header = Header::parse(text);
if (!header)
return nullptr;
// Update the data to contain the entire file if it doesn't already
- if (data_sp->GetByteSize() < length) {
+ if (extractor_sp->GetByteSize() < length) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
data_offset = 0;
}
- return new ObjectFileBreakpad(module_sp, data_sp, data_offset, file,
+ return new ObjectFileBreakpad(module_sp, extractor_sp, data_offset, file,
file_offset, length, std::move(header->arch),
std::move(header->uuid));
}
@@ -104,12 +110,12 @@ size_t ObjectFileBreakpad::GetModuleSpecifications(
}
ObjectFileBreakpad::ObjectFileBreakpad(const ModuleSP &module_sp,
- DataBufferSP &data_sp,
+ DataExtractorSP extractor_sp,
offset_t data_offset,
const FileSpec *file, offset_t offset,
offset_t length, ArchSpec arch,
UUID uuid)
- : ObjectFile(module_sp, file, offset, length, data_sp, data_offset),
+ : ObjectFile(module_sp, file, offset, length, extractor_sp, data_offset),
m_arch(std::move(arch)), m_uuid(std::move(uuid)) {}
bool ObjectFileBreakpad::ParseHeader() {
diff --git a/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h b/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h
index 074d667c1ca57..7f9a05b28101c 100644
--- a/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h
+++ b/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h
@@ -26,10 +26,12 @@ class ObjectFileBreakpad : public ObjectFile {
return "Breakpad object file reader.";
}
- static ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length);
+ static ObjectFile *CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp,
+ lldb::offset_t data_offset,
+ const FileSpec *file,
+ lldb::offset_t file_offset,
+ lldb::offset_t length);
static ObjectFile *CreateMemoryInstance(const lldb::ModuleSP &module_sp,
lldb::WritableDataBufferSP data_sp,
@@ -94,9 +96,10 @@ class ObjectFileBreakpad : public ObjectFile {
UUID m_uuid;
ObjectFileBreakpad(const lldb::ModuleSP &module_sp,
- lldb::DataBufferSP &data_sp, lldb::offset_t data_offset,
- const FileSpec *file, lldb::offset_t offset,
- lldb::offset_t length, ArchSpec arch, UUID uuid);
+ lldb::DataExtractorSP extractor_sp,
+ lldb::offset_t data_offset, const FileSpec *file,
+ lldb::offset_t offset, lldb::offset_t length,
+ ArchSpec arch, UUID uuid);
};
} // namespace breakpad
diff --git a/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.cpp b/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.cpp
index e78f4f08783d7..01f2c6282c61b 100644
--- a/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.cpp
@@ -11,6 +11,7 @@
#include "lldb/Core/Module.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Core/PluginManager.h"
+#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/LLDBLog.h"
#include "llvm/Support/Error.h"
@@ -44,41 +45,45 @@ void ObjectFileCOFF::Terminate() {
}
lldb_private::ObjectFile *
-ObjectFileCOFF::CreateInstance(const ModuleSP &module_sp, DataBufferSP data_sp,
+ObjectFileCOFF::CreateInstance(const ModuleSP &module_sp,
+ DataExtractorSP extractor_sp,
offset_t data_offset, const FileSpec *file,
offset_t file_offset, offset_t length) {
Log *log = GetLog(LLDBLog::Object);
- if (!data_sp) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp) {
LLDB_LOG(log,
"Failed to create ObjectFileCOFF instance: cannot read file {0}",
file->GetPath());
return nullptr;
}
+ extractor_sp = std::make_shared<lldb_private::DataExtractor>(data_sp);
data_offset = 0;
}
- assert(data_sp && "must have mapped file at this point");
+ assert(extractor_sp && extractor_sp->GetByteSize() > 0 &&
+ "must have mapped file at this point");
- if (!IsCOFFObjectFile(data_sp))
+ if (!IsCOFFObjectFile(extractor_sp->GetSharedDataBuffer()))
return nullptr;
- if (data_sp->GetByteSize() < length) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (extractor_sp->GetByteSize() < length) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp) {
LLDB_LOG(log,
"Failed to create ObjectFileCOFF instance: cannot read file {0}",
file->GetPath());
return nullptr;
}
+ extractor_sp = std::make_shared<lldb_private::DataExtractor>(data_sp);
data_offset = 0;
}
-
- MemoryBufferRef buffer{toStringRef(data_sp->GetData()),
- file->GetFilename().GetStringRef()};
+ MemoryBufferRef buffer{
+ toStringRef(extractor_sp->GetSharedDataBuffer()->GetData()),
+ file->GetFilename().GetStringRef()};
Expected<std::unique_ptr<Binary>> binary = createBinary(buffer);
if (!binary) {
@@ -93,8 +98,8 @@ ObjectFileCOFF::CreateInstance(const ModuleSP &module_sp, DataBufferSP data_sp,
file->GetPath());
return new ObjectFileCOFF(unique_dyn_cast<COFFObjectFile>(std::move(*binary)),
- module_sp, data_sp, data_offset, file, file_offset,
- length);
+ module_sp, extractor_sp, data_offset, file,
+ file_offset, length);
}
lldb_private::ObjectFile *ObjectFileCOFF::CreateMemoryInstance(
diff --git a/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.h b/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.h
index 46c43f93f7ffc..eed491d183489 100644
--- a/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.h
+++ b/lldb/source/Plugins/ObjectFile/COFF/ObjectFileCOFF.h
@@ -24,11 +24,13 @@ class ObjectFileCOFF : public lldb_private::ObjectFile {
lldb_private::UUID m_uuid;
ObjectFileCOFF(std::unique_ptr<llvm::object::COFFObjectFile> object,
- const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length)
- : ObjectFile(module_sp, file, file_offset, length, data_sp, data_offset),
- m_object(std::move(object)) {}
+ const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file, lldb::offset_t file_offset,
+ lldb::offset_t length)
+ : ObjectFile(module_sp, file, file_offset, length, extractor_sp,
+ data_offset),
+ m_object(std::move(object)) {}
public:
~ObjectFileCOFF() override;
@@ -42,9 +44,10 @@ class ObjectFileCOFF : public lldb_private::ObjectFile {
}
static lldb_private::ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length);
+ CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file, lldb::offset_t file_offset,
+ lldb::offset_t length);
static lldb_private::ObjectFile *
CreateMemoryInstance(const lldb::ModuleSP &module_sp,
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 5d81b110cc7ae..e06ae21b5e319 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -387,21 +387,25 @@ void ObjectFileELF::Terminate() {
}
ObjectFile *ObjectFileELF::CreateInstance(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp,
+ DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const lldb_private::FileSpec *file,
lldb::offset_t file_offset,
lldb::offset_t length) {
bool mapped_writable = false;
- if (!data_sp) {
- data_sp = MapFileDataWritable(*file, length, file_offset);
- if (!data_sp)
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP buffer_sp = MapFileDataWritable(*file, length, file_offset);
+ if (!buffer_sp)
return nullptr;
+ extractor_sp = std::make_shared<DataExtractor>();
+ extractor_sp->SetData(buffer_sp, data_offset, buffer_sp->GetByteSize());
data_offset = 0;
mapped_writable = true;
}
- assert(data_sp);
+ assert(extractor_sp && extractor_sp->GetByteSize() > 0);
+
+ DataBufferSP data_sp = extractor_sp->GetSharedDataBuffer();
if (data_sp->GetByteSize() <= (llvm::ELF::EI_NIDENT + data_offset))
return nullptr;
@@ -418,6 +422,7 @@ ObjectFile *ObjectFileELF::CreateInstance(const lldb::ModuleSP &module_sp,
data_offset = 0;
mapped_writable = true;
magic = data_sp->GetBytes();
+ extractor_sp->SetData(data_sp);
}
// If we didn't map the data as writable take ownership of the buffer.
@@ -426,12 +431,14 @@ ObjectFile *ObjectFileELF::CreateInstance(const lldb::ModuleSP &module_sp,
data_sp->GetByteSize());
data_offset = 0;
magic = data_sp->GetBytes();
+ extractor_sp->SetData(data_sp);
}
unsigned address_size = ELFHeader::AddressSizeInBytes(magic);
if (address_size == 4 || address_size == 8) {
+ extractor_sp->SetAddressByteSize(address_size);
std::unique_ptr<ObjectFileELF> objfile_up(new ObjectFileELF(
- module_sp, data_sp, data_offset, file, file_offset, length));
+ module_sp, extractor_sp, data_offset, file, file_offset, length));
ArchSpec spec = objfile_up->GetArchitecture();
if (spec && objfile_up->SetModulesArchitecture(spec))
return objfile_up.release();
@@ -718,10 +725,11 @@ size_t ObjectFileELF::GetModuleSpecifications(
// ObjectFile protocol
ObjectFileELF::ObjectFileELF(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp, lldb::offset_t data_offset,
- const FileSpec *file, lldb::offset_t file_offset,
- lldb::offset_t length)
- : ObjectFile(module_sp, file, file_offset, length, data_sp, data_offset) {
+ DataExtractorSP extractor_sp,
+ lldb::offset_t data_offset, const FileSpec *file,
+ lldb::offset_t file_offset, lldb::offset_t length)
+ : ObjectFile(module_sp, file, file_offset, length, extractor_sp,
+ data_offset) {
if (file)
m_file = *file;
}
@@ -730,7 +738,8 @@ ObjectFileELF::ObjectFileELF(const lldb::ModuleSP &module_sp,
DataBufferSP header_data_sp,
const lldb::ProcessSP &process_sp,
addr_t header_addr)
- : ObjectFile(module_sp, process_sp, header_addr, header_data_sp) {}
+ : ObjectFile(module_sp, process_sp, header_addr,
+ std::make_shared<DataExtractor>(header_data_sp)) {}
bool ObjectFileELF::IsExecutable() const {
return ((m_header.e_type & ET_EXEC) != 0) || (m_header.e_entry != 0);
@@ -2046,10 +2055,11 @@ std::shared_ptr<ObjectFileELF> ObjectFileELF::GetGnuDebugDataObjectFile() {
// Construct ObjectFileELF object from decompressed buffer
DataBufferSP gdd_data_buf(
new DataBufferHeap(uncompressedData.data(), uncompressedData.size()));
+ DataExtractorSP extractor_sp = std::make_shared<DataExtractor>(gdd_data_buf);
auto fspec = GetFileSpec().CopyByAppendingPathComponent(
llvm::StringRef("gnu_debugdata"));
m_gnu_debug_data_object_file.reset(new ObjectFileELF(
- GetModule(), gdd_data_buf, 0, &fspec, 0, gdd_data_buf->GetByteSize()));
+ GetModule(), extractor_sp, 0, &fspec, 0, gdd_data_buf->GetByteSize()));
// This line is essential; otherwise a breakpoint can be set but not hit.
m_gnu_debug_data_object_file->SetType(ObjectFile::eTypeDebugInfo);
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
index 41b8ce189e41d..2927e6969230c 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
@@ -69,9 +69,10 @@ class ObjectFileELF : public lldb_private::ObjectFile {
}
static lldb_private::ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length);
+ CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file, lldb::offset_t file_offset,
+ lldb::offset_t length);
static lldb_private::ObjectFile *CreateMemoryInstance(
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,
@@ -165,9 +166,10 @@ class ObjectFileELF : public lldb_private::ObjectFile {
uint64_t Offset);
private:
- ObjectFileELF(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t offset, lldb::offset_t length);
+ ObjectFileELF(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file, lldb::offset_t offset,
+ lldb::offset_t length);
ObjectFileELF(const lldb::ModuleSP &module_sp,
lldb::DataBufferSP header_data_sp,
diff --git a/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp b/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp
index 69885aa53ca30..c48243cb16691 100644
--- a/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp
+++ b/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp
@@ -36,32 +36,37 @@ void ObjectFileJSON::Terminate() {
PluginManager::UnregisterPlugin(CreateInstance);
}
-ObjectFile *
-ObjectFileJSON::CreateInstance(const ModuleSP &module_sp, DataBufferSP data_sp,
- offset_t data_offset, const FileSpec *file,
- offset_t file_offset, offset_t length) {
- if (!data_sp) {
- data_sp = MapFileData(*file, length, file_offset);
+ObjectFile *ObjectFileJSON::CreateInstance(const ModuleSP &module_sp,
+ DataExtractorSP extractor_sp,
+ offset_t data_offset,
+ const FileSpec *file,
+ offset_t file_offset,
+ offset_t length) {
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
data_offset = 0;
}
- if (!MagicBytesMatch(data_sp, 0, data_sp->GetByteSize()))
+ if (!MagicBytesMatch(extractor_sp->GetSharedDataBuffer(), 0,
+ extractor_sp->GetByteSize()))
return nullptr;
// Update the data to contain the entire file if it doesn't already.
- if (data_sp->GetByteSize() < length) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (extractor_sp->GetByteSize() < length) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
+ extractor_sp->SetData(data_sp);
data_offset = 0;
}
Log *log = GetLog(LLDBLog::Symbols);
- auto text =
- llvm::StringRef(reinterpret_cast<const char *>(data_sp->GetBytes()));
+ auto text = llvm::StringRef(reinterpret_cast<const char *>(
+ extractor_sp->GetSharedDataBuffer()->GetBytes()));
Expected<json::Value> json = json::parse(text);
if (!json) {
@@ -90,9 +95,10 @@ ObjectFileJSON::CreateInstance(const ModuleSP &module_sp, DataBufferSP data_sp,
return nullptr;
}
- return new ObjectFileJSON(module_sp, data_sp, data_offset, file, file_offset,
- length, std::move(arch), std::move(uuid), type,
- std::move(body.symbols), std::move(body.sections));
+ return new ObjectFileJSON(module_sp, extractor_sp, data_offset, file,
+ file_offset, length, std::move(arch),
+ std::move(uuid), type, std::move(body.symbols),
+ std::move(body.sections));
}
ObjectFile *ObjectFileJSON::CreateMemoryInstance(const ModuleSP &module_sp,
@@ -146,13 +152,14 @@ size_t ObjectFileJSON::GetModuleSpecifications(
return 1;
}
-ObjectFileJSON::ObjectFileJSON(const ModuleSP &module_sp, DataBufferSP &data_sp,
+ObjectFileJSON::ObjectFileJSON(const ModuleSP &module_sp,
+ DataExtractorSP extractor_sp,
offset_t data_offset, const FileSpec *file,
offset_t offset, offset_t length, ArchSpec arch,
UUID uuid, Type type,
std::vector<JSONSymbol> symbols,
std::vector<JSONSection> sections)
- : ObjectFile(module_sp, file, offset, length, data_sp, data_offset),
+ : ObjectFile(module_sp, file, offset, length, extractor_sp, data_offset),
m_arch(std::move(arch)), m_uuid(std::move(uuid)), m_type(type),
m_symbols(std::move(symbols)), m_sections(std::move(sections)) {}
diff --git a/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.h b/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.h
index 029c8ff188934..8608cc30cb7a5 100644
--- a/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.h
+++ b/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.h
@@ -26,10 +26,12 @@ class ObjectFileJSON : public ObjectFile {
return "JSON object file reader.";
}
- static ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length);
+ static ObjectFile *CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp,
+ lldb::offset_t data_offset,
+ const FileSpec *file,
+ lldb::offset_t file_offset,
+ lldb::offset_t length);
static ObjectFile *CreateMemoryInstance(const lldb::ModuleSP &module_sp,
lldb::WritableDataBufferSP data_sp,
@@ -111,10 +113,11 @@ class ObjectFileJSON : public ObjectFile {
std::vector<JSONSymbol> m_symbols;
std::vector<JSONSection> m_sections;
- ObjectFileJSON(const lldb::ModuleSP &module_sp, lldb::DataBufferSP &data_sp,
- lldb::offset_t data_offset, const FileSpec *file,
- lldb::offset_t offset, lldb::offset_t length, ArchSpec arch,
- UUID uuid, Type type, std::vector<JSONSymbol> symbols,
+ ObjectFileJSON(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const FileSpec *file, lldb::offset_t offset,
+ lldb::offset_t length, ArchSpec arch, UUID uuid, Type type,
+ std::vector<JSONSymbol> symbols,
std::vector<JSONSection> sections);
};
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index dff9eab0e24d7..4af4a7acc9971 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -781,30 +781,33 @@ void ObjectFileMachO::Terminate() {
}
ObjectFile *ObjectFileMachO::CreateInstance(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp,
+ DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const FileSpec *file,
lldb::offset_t file_offset,
lldb::offset_t length) {
- if (!data_sp) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
data_offset = 0;
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
}
- if (!ObjectFileMachO::MagicBytesMatch(data_sp, data_offset, length))
+ if (!ObjectFileMachO::MagicBytesMatch(extractor_sp->GetSharedDataBuffer(),
+ data_offset, length))
return nullptr;
// Update the data to contain the entire file if it doesn't already
- if (data_sp->GetByteSize() < length) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (extractor_sp->GetByteSize() < length) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
data_offset = 0;
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
}
auto objfile_up = std::make_unique<ObjectFileMachO>(
- module_sp, data_sp, data_offset, file, file_offset, length);
+ module_sp, extractor_sp, data_offset, file, file_offset, length);
if (!objfile_up || !objfile_up->ParseHeader())
return nullptr;
@@ -925,12 +928,13 @@ bool ObjectFileMachO::MagicBytesMatch(DataBufferSP data_sp,
}
ObjectFileMachO::ObjectFileMachO(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp,
+ DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const FileSpec *file,
lldb::offset_t file_offset,
lldb::offset_t length)
- : ObjectFile(module_sp, file, file_offset, length, data_sp, data_offset),
+ : ObjectFile(module_sp, file, file_offset, length, extractor_sp,
+ data_offset),
m_mach_sections(), m_entry_point_address(), m_thread_context_offsets(),
m_thread_context_offsets_valid(false), m_reexported_dylibs(),
m_allow_assembly_emulation_unwind_plans(true) {
@@ -942,7 +946,8 @@ ObjectFileMachO::ObjectFileMachO(const lldb::ModuleSP &module_sp,
lldb::WritableDataBufferSP header_data_sp,
const lldb::ProcessSP &process_sp,
lldb::addr_t header_addr)
- : ObjectFile(module_sp, process_sp, header_addr, header_data_sp),
+ : ObjectFile(module_sp, process_sp, header_addr,
+ std::make_shared<DataExtractor>(header_data_sp)),
m_mach_sections(), m_entry_point_address(), m_thread_context_offsets(),
m_thread_context_offsets_valid(false), m_reexported_dylibs(),
m_allow_assembly_emulation_unwind_plans(true) {
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
index 5456f0315c942..b40621473e577 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
@@ -24,7 +24,8 @@
// will export the ObjectFile protocol
class ObjectFileMachO : public lldb_private::ObjectFile {
public:
- ObjectFileMachO(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
+ ObjectFileMachO(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const lldb_private::FileSpec *file, lldb::offset_t offset,
lldb::offset_t length);
@@ -47,9 +48,10 @@ class ObjectFileMachO : public lldb_private::ObjectFile {
}
static lldb_private::ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length);
+ CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file, lldb::offset_t file_offset,
+ lldb::offset_t length);
static lldb_private::ObjectFile *CreateMemoryInstance(
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
index be47991bb09fc..75ae172dad0da 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
+++ b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
@@ -35,7 +35,7 @@ void ObjectFileMinidump::Terminate() {
}
ObjectFile *ObjectFileMinidump::CreateInstance(
- const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
+ const lldb::ModuleSP &module_sp, lldb::DataExtractorSP extractor_sp,
lldb::offset_t data_offset, const lldb_private::FileSpec *file,
lldb::offset_t offset, lldb::offset_t length) {
return nullptr;
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
index 2f45f01558e66..8f5da230467d5 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
+++ b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
@@ -39,9 +39,10 @@ class ObjectFileMinidump : public lldb_private::PluginInterface {
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
static lldb_private::ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t offset, lldb::offset_t length);
+ CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file, lldb::offset_t offset,
+ lldb::offset_t length);
static lldb_private::ObjectFile *CreateMemoryInstance(
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,
diff --git a/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.cpp b/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.cpp
index f0832dbf07347..45385da2642c7 100644
--- a/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.cpp
+++ b/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.cpp
@@ -91,10 +91,9 @@ bool ObjectFilePDB::initPDBFile() {
return true;
}
-ObjectFile *
-ObjectFilePDB::CreateInstance(const ModuleSP &module_sp, DataBufferSP data_sp,
- offset_t data_offset, const FileSpec *file,
- offset_t file_offset, offset_t length) {
+ObjectFile *ObjectFilePDB::CreateInstance(
+ const ModuleSP &module_sp, DataExtractorSP data_sp, offset_t data_offset,
+ const FileSpec *file, offset_t file_offset, offset_t length) {
auto objfile_up = std::make_unique<ObjectFilePDB>(
module_sp, data_sp, data_offset, file, file_offset, length);
if (!objfile_up->initPDBFile())
@@ -158,9 +157,10 @@ size_t ObjectFilePDB::GetModuleSpecifications(
return specs.GetSize() - initial_count;
}
-ObjectFilePDB::ObjectFilePDB(const ModuleSP &module_sp, DataBufferSP &data_sp,
- offset_t data_offset, const FileSpec *file,
- offset_t offset, offset_t length)
+ObjectFilePDB::ObjectFilePDB(const ModuleSP &module_sp,
+ DataExtractorSP &data_sp, offset_t data_offset,
+ const FileSpec *file, offset_t offset,
+ offset_t length)
: ObjectFile(module_sp, file, offset, length, data_sp, data_offset) {}
std::unique_ptr<PDBFile>
diff --git a/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h b/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h
index c06e72650e011..5848bea896e43 100644
--- a/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h
+++ b/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h
@@ -31,7 +31,7 @@ class ObjectFilePDB : public ObjectFile {
loadPDBFile(std::string PdbPath, llvm::BumpPtrAllocator &Allocator);
static ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
+ CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataExtractorSP data_sp,
lldb::offset_t data_offset, const FileSpec *file,
lldb::offset_t file_offset, lldb::offset_t length);
@@ -89,7 +89,7 @@ class ObjectFilePDB : public ObjectFile {
llvm::pdb::PDBFile &GetPDBFile() { return *m_file_up; }
- ObjectFilePDB(const lldb::ModuleSP &module_sp, lldb::DataBufferSP &data_sp,
+ ObjectFilePDB(const lldb::ModuleSP &module_sp, lldb::DataExtractorSP &data_sp,
lldb::offset_t data_offset, const FileSpec *file,
lldb::offset_t offset, lldb::offset_t length);
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
index f25ed51001474..858f1d47db659 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@@ -203,29 +203,31 @@ llvm::StringRef ObjectFilePECOFF::GetPluginDescriptionStatic() {
}
ObjectFile *ObjectFilePECOFF::CreateInstance(
- const lldb::ModuleSP &module_sp, DataBufferSP data_sp,
+ const lldb::ModuleSP &module_sp, DataExtractorSP extractor_sp,
lldb::offset_t data_offset, const lldb_private::FileSpec *file_p,
lldb::offset_t file_offset, lldb::offset_t length) {
FileSpec file = file_p ? *file_p : FileSpec();
- if (!data_sp) {
- data_sp = MapFileData(file, length, file_offset);
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP data_sp = MapFileData(file, length, file_offset);
if (!data_sp)
return nullptr;
data_offset = 0;
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
}
- if (!ObjectFilePECOFF::MagicBytesMatch(data_sp))
+ if (!ObjectFilePECOFF::MagicBytesMatch(extractor_sp->GetSharedDataBuffer()))
return nullptr;
// Update the data to contain the entire file if it doesn't already
- if (data_sp->GetByteSize() < length) {
- data_sp = MapFileData(file, length, file_offset);
+ if (extractor_sp->GetByteSize() < length) {
+ DataBufferSP data_sp = MapFileData(file, length, file_offset);
if (!data_sp)
return nullptr;
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
}
auto objfile_up = std::make_unique<ObjectFilePECOFF>(
- module_sp, data_sp, data_offset, file_p, file_offset, length);
+ module_sp, extractor_sp, data_offset, file_p, file_offset, length);
if (!objfile_up || !objfile_up->ParseHeader())
return nullptr;
@@ -416,12 +418,13 @@ bool ObjectFilePECOFF::CreateBinary() {
}
ObjectFilePECOFF::ObjectFilePECOFF(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp,
+ DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const FileSpec *file,
lldb::offset_t file_offset,
lldb::offset_t length)
- : ObjectFile(module_sp, file, file_offset, length, data_sp, data_offset),
+ : ObjectFile(module_sp, file, file_offset, length, extractor_sp,
+ data_offset),
m_dos_header(), m_coff_header(), m_coff_header_opt(), m_sect_headers(),
m_image_base(LLDB_INVALID_ADDRESS), m_entry_point_address(),
m_deps_filespec() {}
@@ -430,7 +433,8 @@ ObjectFilePECOFF::ObjectFilePECOFF(const lldb::ModuleSP &module_sp,
WritableDataBufferSP header_data_sp,
const lldb::ProcessSP &process_sp,
addr_t header_addr)
- : ObjectFile(module_sp, process_sp, header_addr, header_data_sp),
+ : ObjectFile(module_sp, process_sp, header_addr,
+ std::make_shared<DataExtractor>(header_data_sp)),
m_dos_header(), m_coff_header(), m_coff_header_opt(), m_sect_headers(),
m_image_base(LLDB_INVALID_ADDRESS), m_entry_point_address(),
m_deps_filespec() {}
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
index 4f4dedf773c5b..d9e26cd167407 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
@@ -44,7 +44,8 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile {
MachineWcemIpsv2 = 0x169
};
- ObjectFilePECOFF(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
+ ObjectFilePECOFF(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const lldb_private::FileSpec *file,
lldb::offset_t file_offset, lldb::offset_t length);
@@ -66,10 +67,12 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile {
static llvm::StringRef GetPluginDescriptionStatic();
- static ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t offset, lldb::offset_t length);
+ static ObjectFile *CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp,
+ lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file,
+ lldb::offset_t offset,
+ lldb::offset_t length);
static lldb_private::ObjectFile *CreateMemoryInstance(
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,
diff --git a/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.cpp b/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.cpp
index bfe155609f3b1..7cdb599b2d123 100644
--- a/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.cpp
@@ -19,6 +19,7 @@
#include "lldb/Target/Target.h"
#include "lldb/Utility/ArchSpec.h"
#include "lldb/Utility/DataBufferHeap.h"
+#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/FileSpecList.h"
#include "lldb/Utility/LLDBLog.h"
#include "lldb/Utility/Log.h"
@@ -53,28 +54,31 @@ void ObjectFileXCOFF::Terminate() {
}
ObjectFile *ObjectFileXCOFF::CreateInstance(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp,
+ DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const lldb_private::FileSpec *file,
lldb::offset_t file_offset,
lldb::offset_t length) {
- if (!data_sp) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
data_offset = 0;
+ extractor_sp = std::make_shared<lldb_private::DataExtractor>(data_sp);
}
- if (!ObjectFileXCOFF::MagicBytesMatch(data_sp, data_offset, length))
+ if (!ObjectFileXCOFF::MagicBytesMatch(extractor_sp->GetSharedDataBuffer(),
+ data_offset, length))
return nullptr;
// Update the data to contain the entire file if it doesn't already
- if (data_sp->GetByteSize() < length) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (extractor_sp->GetByteSize() < length) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp)
return nullptr;
data_offset = 0;
+ extractor_sp = std::make_shared<lldb_private::DataExtractor>(data_sp);
}
auto objfile_up = std::make_unique<ObjectFileXCOFF>(
- module_sp, data_sp, data_offset, file, file_offset, length);
+ module_sp, extractor_sp, data_offset, file, file_offset, length);
if (!objfile_up)
return nullptr;
@@ -394,12 +398,13 @@ ObjectFileXCOFF::MapFileDataWritable(const FileSpec &file, uint64_t Size,
}
ObjectFileXCOFF::ObjectFileXCOFF(const lldb::ModuleSP &module_sp,
- DataBufferSP data_sp,
+ DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const FileSpec *file,
lldb::offset_t file_offset,
lldb::offset_t length)
- : ObjectFile(module_sp, file, file_offset, length, data_sp, data_offset) {
+ : ObjectFile(module_sp, file, file_offset, length, extractor_sp,
+ data_offset) {
if (file)
m_file = *file;
}
@@ -408,4 +413,6 @@ ObjectFileXCOFF::ObjectFileXCOFF(const lldb::ModuleSP &module_sp,
DataBufferSP header_data_sp,
const lldb::ProcessSP &process_sp,
addr_t header_addr)
- : ObjectFile(module_sp, process_sp, header_addr, header_data_sp) {}
+ : ObjectFile(
+ module_sp, process_sp, header_addr,
+ std::make_shared<lldb_private::DataExtractor>(header_data_sp)) {}
diff --git a/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h b/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h
index 2cecd0315463a..1d6f250aa4f16 100644
--- a/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h
+++ b/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h
@@ -38,9 +38,10 @@ class ObjectFileXCOFF : public lldb_private::ObjectFile {
}
static lldb_private::ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const lldb_private::FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length);
+ CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const lldb_private::FileSpec *file, lldb::offset_t file_offset,
+ lldb::offset_t length);
static lldb_private::ObjectFile *CreateMemoryInstance(
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,
@@ -88,7 +89,8 @@ class ObjectFileXCOFF : public lldb_private::ObjectFile {
ObjectFile::Strata CalculateStrata() override;
- ObjectFileXCOFF(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
+ ObjectFileXCOFF(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp,
lldb::offset_t data_offset,
const lldb_private::FileSpec *file, lldb::offset_t offset,
lldb::offset_t length);
diff --git a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp
index 4ab4cac68c5f8..8cc2b7bd50475 100644
--- a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp
+++ b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp
@@ -139,24 +139,27 @@ void ObjectFileWasm::Terminate() {
PluginManager::UnregisterPlugin(CreateInstance);
}
-ObjectFile *
-ObjectFileWasm::CreateInstance(const ModuleSP &module_sp, DataBufferSP data_sp,
- offset_t data_offset, const FileSpec *file,
- offset_t file_offset, offset_t length) {
+ObjectFile *ObjectFileWasm::CreateInstance(const ModuleSP &module_sp,
+ DataExtractorSP extractor_sp,
+ offset_t data_offset,
+ const FileSpec *file,
+ offset_t file_offset,
+ offset_t length) {
Log *log = GetLog(LLDBLog::Object);
- if (!data_sp) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp) {
LLDB_LOGF(log, "Failed to create ObjectFileWasm instance for file %s",
file->GetPath().c_str());
return nullptr;
}
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
data_offset = 0;
}
- assert(data_sp);
- if (!ValidateModuleHeader(data_sp)) {
+ assert(extractor_sp);
+ if (!ValidateModuleHeader(extractor_sp->GetSharedDataBuffer())) {
LLDB_LOGF(log,
"Failed to create ObjectFileWasm instance: invalid Wasm header");
return nullptr;
@@ -164,19 +167,20 @@ ObjectFileWasm::CreateInstance(const ModuleSP &module_sp, DataBufferSP data_sp,
// Update the data to contain the entire file if it doesn't contain it
// already.
- if (data_sp->GetByteSize() < length) {
- data_sp = MapFileData(*file, length, file_offset);
+ if (extractor_sp->GetByteSize() < length) {
+ DataBufferSP data_sp = MapFileData(*file, length, file_offset);
if (!data_sp) {
LLDB_LOGF(log,
"Failed to create ObjectFileWasm instance: cannot read file %s",
file->GetPath().c_str());
return nullptr;
}
+ extractor_sp = std::make_shared<DataExtractor>(data_sp);
data_offset = 0;
}
std::unique_ptr<ObjectFileWasm> objfile_up(new ObjectFileWasm(
- module_sp, data_sp, data_offset, file, file_offset, length));
+ module_sp, extractor_sp, data_offset, file, file_offset, length));
ArchSpec spec = objfile_up->GetArchitecture();
if (spec && objfile_up->SetModulesArchitecture(spec)) {
LLDB_LOGF(log,
@@ -282,10 +286,11 @@ size_t ObjectFileWasm::GetModuleSpecifications(
return 1;
}
-ObjectFileWasm::ObjectFileWasm(const ModuleSP &module_sp, DataBufferSP data_sp,
+ObjectFileWasm::ObjectFileWasm(const ModuleSP &module_sp,
+ DataExtractorSP extractor_sp,
offset_t data_offset, const FileSpec *file,
offset_t offset, offset_t length)
- : ObjectFile(module_sp, file, offset, length, data_sp, data_offset),
+ : ObjectFile(module_sp, file, offset, length, extractor_sp, data_offset),
m_arch("wasm32-unknown-unknown-wasm") {
m_data_nsp->SetAddressByteSize(4);
}
@@ -294,7 +299,8 @@ ObjectFileWasm::ObjectFileWasm(const lldb::ModuleSP &module_sp,
lldb::WritableDataBufferSP header_data_sp,
const lldb::ProcessSP &process_sp,
lldb::addr_t header_addr)
- : ObjectFile(module_sp, process_sp, header_addr, header_data_sp),
+ : ObjectFile(module_sp, process_sp, header_addr,
+ std::make_shared<DataExtractor>(header_data_sp)),
m_arch("wasm32-unknown-unknown-wasm") {}
bool ObjectFileWasm::ParseHeader() {
@@ -781,7 +787,7 @@ DataExtractor ObjectFileWasm::ReadImageData(offset_t offset, uint32_t size) {
offset, data_up->GetBytes(), data_up->GetByteSize(), readmem_error);
if (bytes_read > 0) {
DataBufferSP buffer_sp(data_up.release());
- data.SetData(buffer_sp, 0, buffer_sp->GetByteSize());
+ data.SetData(buffer_sp);
}
} else if (offset < m_data_nsp->GetByteSize()) {
size = std::min(static_cast<uint64_t>(size),
diff --git a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h
index 17fe23c1131d2..85155d64904c1 100644
--- a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h
+++ b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h
@@ -30,10 +30,12 @@ class ObjectFileWasm : public ObjectFile {
return "WebAssembly object file reader.";
}
- static ObjectFile *
- CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t length);
+ static ObjectFile *CreateInstance(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp,
+ lldb::offset_t data_offset,
+ const FileSpec *file,
+ lldb::offset_t file_offset,
+ lldb::offset_t length);
static ObjectFile *CreateMemoryInstance(const lldb::ModuleSP &module_sp,
lldb::WritableDataBufferSP data_sp,
@@ -112,9 +114,10 @@ class ObjectFileWasm : public ObjectFile {
std::optional<FileSpec> GetExternalDebugInfoFileSpec();
private:
- ObjectFileWasm(const lldb::ModuleSP &module_sp, lldb::DataBufferSP data_sp,
- lldb::offset_t data_offset, const FileSpec *file,
- lldb::offset_t offset, lldb::offset_t length);
+ ObjectFileWasm(const lldb::ModuleSP &module_sp,
+ lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
+ const FileSpec *file, lldb::offset_t offset,
+ lldb::offset_t length);
ObjectFileWasm(const lldb::ModuleSP &module_sp,
lldb::WritableDataBufferSP header_data_sp,
const lldb::ProcessSP &process_sp, lldb::addr_t header_addr);
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
index e9bd65fad1502..a33da483b74e4 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
@@ -162,7 +162,8 @@ bool GDBRemoteRegisterContext::PrivateSetRegisterValue(uint32_t reg,
InvalidateIfNeeded(false);
DataBufferSP buffer_sp(new DataBufferHeap(&new_reg_val, sizeof(new_reg_val)));
- DataExtractor data(buffer_sp, endian::InlHostByteOrder(), sizeof(void *));
+ DataExtractor data;
+ data.SetData(buffer_sp, 0, buffer_sp->GetByteSize());
// If our register context and our register info disagree, which should never
// happen, don't overwrite past the end of the buffer.
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index b755f3a6faaa0..e90a0b36337cb 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -1934,11 +1934,11 @@ SymbolFileDWARF::GetDwoSymbolFileForCompileUnit(
}
const lldb::offset_t file_offset = 0;
- DataBufferSP dwo_file_data_sp;
+ DataExtractorSP dwo_file_extractor_sp;
lldb::offset_t dwo_file_data_offset = 0;
ObjectFileSP dwo_obj_file = ObjectFile::FindPlugin(
GetObjectFile()->GetModule(), &dwo_file, file_offset,
- FileSystem::Instance().GetByteSize(dwo_file), dwo_file_data_sp,
+ FileSystem::Instance().GetByteSize(dwo_file), dwo_file_extractor_sp,
dwo_file_data_offset);
if (dwo_obj_file == nullptr) {
unit.SetDwoError(Status::FromErrorStringWithFormatv(
@@ -4474,7 +4474,7 @@ const std::shared_ptr<SymbolFileDWARFDwo> &SymbolFileDWARF::GetDwpSymbolFile() {
}
if (FileSystem::Instance().Exists(dwp_filespec)) {
LLDB_LOG(log, "Found DWP file: \"{0}\"", dwp_filespec);
- DataBufferSP dwp_file_data_sp;
+ DataExtractorSP dwp_file_data_sp;
lldb::offset_t dwp_file_data_offset = 0;
ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
GetObjectFile()->GetModule(), &dwp_filespec, 0,
diff --git a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
index 380986d8afab7..d245f05bc2e29 100644
--- a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
+++ b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
@@ -47,12 +47,12 @@ llvm::StringRef SymbolVendorELF::GetPluginDescriptionStatic() {
// If this is needed elsewhere, it can be exported/moved.
static bool IsDwpSymbolFile(const lldb::ModuleSP &module_sp,
const FileSpec &file_spec) {
- DataBufferSP dwp_file_data_sp;
+ DataExtractorSP dwp_file_extractor_sp;
lldb::offset_t dwp_file_data_offset = 0;
// Try to create an ObjectFile from the file_spec.
ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
module_sp, &file_spec, 0, FileSystem::Instance().GetByteSize(file_spec),
- dwp_file_data_sp, dwp_file_data_offset);
+ dwp_file_extractor_sp, dwp_file_data_offset);
// The presence of a debug_cu_index section is the key identifying feature of
// a DWP file. Make sure we don't fill in the section list on dwp_obj_file
// (by calling GetSectionList(false)) as this function could be called before
@@ -120,11 +120,11 @@ SymbolVendorELF::CreateInstance(const lldb::ModuleSP &module_sp,
dsym_fspec = unstripped_spec.GetFileSpec();
}
- DataBufferSP dsym_file_data_sp;
+ DataExtractorSP dsym_file_extractor_sp;
lldb::offset_t dsym_file_data_offset = 0;
ObjectFileSP dsym_objfile_sp = ObjectFile::FindPlugin(
module_sp, &dsym_fspec, 0, FileSystem::Instance().GetByteSize(dsym_fspec),
- dsym_file_data_sp, dsym_file_data_offset);
+ dsym_file_extractor_sp, dsym_file_data_offset);
if (!dsym_objfile_sp)
return nullptr;
// This objfile is for debugging purposes. Sadly, ObjectFileELF won't
diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
index 6a0b0ffee7e2d..c7e067caca4d4 100644
--- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
+++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
@@ -148,12 +148,12 @@ SymbolVendorMacOSX::CreateInstance(const lldb::ModuleSP &module_sp,
const size_t pos = dsym_root.find("/Contents/Resources/");
dsym_root = pos != std::string::npos ? dsym_root.substr(0, pos) : "";
- DataBufferSP dsym_file_data_sp;
+ DataExtractorSP dsym_file_extractor_sp;
lldb::offset_t dsym_file_data_offset = 0;
dsym_objfile_sp =
ObjectFile::FindPlugin(module_sp, &dsym_fspec, 0,
FileSystem::Instance().GetByteSize(dsym_fspec),
- dsym_file_data_sp, dsym_file_data_offset);
+ dsym_file_extractor_sp, dsym_file_data_offset);
// Important to save the dSYM FileSpec so we don't call
// PluginManager::LocateExecutableSymbolFile a second time while trying to
// add the symbol ObjectFile to this Module.
diff --git a/lldb/source/Plugins/SymbolVendor/PECOFF/SymbolVendorPECOFF.cpp b/lldb/source/Plugins/SymbolVendor/PECOFF/SymbolVendorPECOFF.cpp
index 33fdadce07dee..20ccfa54a106c 100644
--- a/lldb/source/Plugins/SymbolVendor/PECOFF/SymbolVendorPECOFF.cpp
+++ b/lldb/source/Plugins/SymbolVendor/PECOFF/SymbolVendorPECOFF.cpp
@@ -90,11 +90,11 @@ SymbolVendorPECOFF::CreateInstance(const lldb::ModuleSP &module_sp,
if (!dsym_fspec)
return nullptr;
- DataBufferSP dsym_file_data_sp;
+ DataExtractorSP dsym_file_extractor_sp;
lldb::offset_t dsym_file_data_offset = 0;
ObjectFileSP dsym_objfile_sp = ObjectFile::FindPlugin(
module_sp, &dsym_fspec, 0, FileSystem::Instance().GetByteSize(dsym_fspec),
- dsym_file_data_sp, dsym_file_data_offset);
+ dsym_file_extractor_sp, dsym_file_data_offset);
if (!dsym_objfile_sp)
return nullptr;
diff --git a/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp b/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
index c18af06fbdc98..62fb7fb4db13d 100644
--- a/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
+++ b/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
@@ -90,11 +90,11 @@ SymbolVendorWasm::CreateInstance(const lldb::ModuleSP &module_sp,
if (!sym_fspec)
return nullptr;
- DataBufferSP sym_file_data_sp;
+ DataExtractorSP sym_file_extractor_sp;
lldb::offset_t sym_file_data_offset = 0;
ObjectFileSP sym_objfile_sp = ObjectFile::FindPlugin(
module_sp, &sym_fspec, 0, FileSystem::Instance().GetByteSize(sym_fspec),
- sym_file_data_sp, sym_file_data_offset);
+ sym_file_extractor_sp, sym_file_data_offset);
if (!sym_objfile_sp)
return nullptr;
diff --git a/lldb/source/Symbol/ObjectContainer.cpp b/lldb/source/Symbol/ObjectContainer.cpp
index f4ac7a909b6cc..c0f03ecc567db 100644
--- a/lldb/source/Symbol/ObjectContainer.cpp
+++ b/lldb/source/Symbol/ObjectContainer.cpp
@@ -23,11 +23,13 @@ ObjectContainer::ObjectContainer(const lldb::ModuleSP &module_sp,
lldb::offset_t data_offset)
: ModuleChild(module_sp),
m_file(), // This file can be different than the module's file spec
- m_offset(file_offset), m_length(length) {
+ m_offset(file_offset), m_length(length),
+ m_data_sp(std::make_shared<DataExtractor>()) {
if (file)
m_file = *file;
- if (data_sp)
- m_data.SetData(data_sp, data_offset, length);
+ if (data_sp) {
+ m_data_sp->SetData(data_sp, data_offset, length);
+ }
}
ObjectContainerSP ObjectContainer::FindPlugin(const lldb::ModuleSP &module_sp,
diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp
index ab28c17f9732c..34a067f39e07b 100644
--- a/lldb/source/Symbol/ObjectFile.cpp
+++ b/lldb/source/Symbol/ObjectFile.cpp
@@ -49,10 +49,12 @@ CreateObjectFromContainer(const lldb::ModuleSP &module_sp, const FileSpec *file,
return {};
}
-ObjectFileSP
-ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
- lldb::offset_t file_offset, lldb::offset_t file_size,
- DataBufferSP &data_sp, lldb::offset_t &data_offset) {
+ObjectFileSP ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp,
+ const FileSpec *file,
+ lldb::offset_t file_offset,
+ lldb::offset_t file_size,
+ DataExtractorSP extractor_sp,
+ lldb::offset_t &data_offset) {
LLDB_SCOPED_TIMERF(
"ObjectFile::FindPlugin (module = %s, file = %p, file_offset = "
"0x%8.8" PRIx64 ", file_size = 0x%8.8" PRIx64 ")",
@@ -66,14 +68,14 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
if (!file)
return {};
- if (!data_sp) {
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
const bool file_exists = FileSystem::Instance().Exists(*file);
// We have an object name which most likely means we have a .o file in
// a static archive (.a file). Try and see if we have a cached archive
// first without reading any data first
if (file_exists && module_sp->GetObjectName()) {
ObjectFileSP object_file_sp = CreateObjectFromContainer(
- module_sp, file, file_offset, file_size, data_sp, data_offset);
+ module_sp, file, file_offset, file_size, DataBufferSP(), data_offset);
if (object_file_sp)
return object_file_sp;
}
@@ -82,13 +84,15 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
// container plug-ins can use these bytes to see if they can parse this
// file.
if (file_size > 0) {
- data_sp = FileSystem::Instance().CreateDataBuffer(
+ DataBufferSP buffer_sp = FileSystem::Instance().CreateDataBuffer(
file->GetPath(), g_initial_bytes_to_read, file_offset);
+ extractor_sp = std::make_shared<DataExtractor>();
+ extractor_sp->SetData(buffer_sp, data_offset, buffer_sp->GetByteSize());
data_offset = 0;
}
}
- if (!data_sp || data_sp->GetByteSize() == 0) {
+ if (!extractor_sp || extractor_sp->GetByteSize() == 0) {
// Check for archive file with format "/path/to/archive.a(object.o)"
llvm::SmallString<256> path_with_object;
module_sp->GetFileSpec().GetPath(path_with_object);
@@ -110,18 +114,20 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
// (like BSD archives caching the contained objects within an
// file).
ObjectFileSP object_file_sp = CreateObjectFromContainer(
- module_sp, file, file_offset, file_size, data_sp, data_offset);
+ module_sp, file, file_offset, file_size,
+ extractor_sp->GetSharedDataBuffer(), data_offset);
if (object_file_sp)
return object_file_sp;
// We failed to find any cached object files in the container plug-
// ins, so lets read the first 512 bytes and try again below...
- data_sp = FileSystem::Instance().CreateDataBuffer(
+ DataBufferSP buffer_sp = FileSystem::Instance().CreateDataBuffer(
archive_file.GetPath(), g_initial_bytes_to_read, file_offset);
+ extractor_sp = std::make_shared<DataExtractor>(buffer_sp);
}
}
}
- if (data_sp && data_sp->GetByteSize() > 0) {
+ if (extractor_sp && extractor_sp->GetByteSize() > 0) {
// Check if this is a normal object file by iterating through all
// object file plugin instances.
ObjectFileCreateInstance callback;
@@ -129,7 +135,7 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
(callback = PluginManager::GetObjectFileCreateCallbackAtIndex(idx)) !=
nullptr;
++idx) {
- ObjectFileSP object_file_sp(callback(module_sp, data_sp, data_offset,
+ ObjectFileSP object_file_sp(callback(module_sp, extractor_sp, data_offset,
file, file_offset, file_size));
if (object_file_sp.get())
return object_file_sp;
@@ -138,8 +144,9 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
// Check if this is a object container by iterating through all object
// container plugin instances and then trying to get an object file
// from the container.
+ DataBufferSP buffer_sp = extractor_sp->GetSharedDataBuffer();
ObjectFileSP object_file_sp = CreateObjectFromContainer(
- module_sp, file, file_offset, file_size, data_sp, data_offset);
+ module_sp, file, file_offset, file_size, buffer_sp, data_offset);
if (object_file_sp)
return object_file_sp;
}
@@ -185,12 +192,12 @@ ObjectFileSP ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp,
}
bool ObjectFile::IsObjectFile(lldb_private::FileSpec file_spec) {
- DataBufferSP data_sp;
+ DataExtractorSP extractor_sp;
offset_t data_offset = 0;
ModuleSP module_sp = std::make_shared<Module>(file_spec);
return static_cast<bool>(ObjectFile::FindPlugin(
module_sp, &file_spec, 0, FileSystem::Instance().GetByteSize(file_spec),
- data_sp, data_offset));
+ extractor_sp, data_offset));
}
size_t ObjectFile::GetModuleSpecifications(const FileSpec &file,
@@ -250,7 +257,8 @@ size_t ObjectFile::GetModuleSpecifications(
ObjectFile::ObjectFile(const lldb::ModuleSP &module_sp,
const FileSpec *file_spec_ptr,
lldb::offset_t file_offset, lldb::offset_t length,
- lldb::DataBufferSP data_sp, lldb::offset_t data_offset)
+ lldb::DataExtractorSP extractor_sp,
+ lldb::offset_t data_offset)
: ModuleChild(module_sp),
m_file(), // This file could be different from the original module's file
m_type(eTypeInvalid), m_strata(eStrataInvalid),
@@ -260,8 +268,13 @@ ObjectFile::ObjectFile(const lldb::ModuleSP &module_sp,
m_symtab_once_up(new llvm::once_flag()) {
if (file_spec_ptr)
m_file = *file_spec_ptr;
- if (data_sp)
- m_data_nsp->SetData(data_sp, data_offset, length);
+ if (extractor_sp && extractor_sp->GetByteSize() > 0) {
+ m_data_nsp = extractor_sp;
+ // the offset & length fields may be specifying a subset of the
+ // total data buffer.
+ m_data_nsp->SetData(extractor_sp->GetSharedDataBuffer(), data_offset,
+ length);
+ }
Log *log = GetLog(LLDBLog::Object);
LLDB_LOGF(log,
"%p ObjectFile::ObjectFile() module = %p (%s), file = %s, "
@@ -274,14 +287,14 @@ ObjectFile::ObjectFile(const lldb::ModuleSP &module_sp,
ObjectFile::ObjectFile(const lldb::ModuleSP &module_sp,
const ProcessSP &process_sp, lldb::addr_t header_addr,
- DataBufferSP header_data_sp)
+ DataExtractorSP header_extractor_sp)
: ModuleChild(module_sp), m_file(), m_type(eTypeInvalid),
m_strata(eStrataInvalid), m_file_offset(0), m_length(0),
m_data_nsp(std::make_shared<DataExtractor>()), m_process_wp(process_sp),
m_memory_addr(header_addr), m_sections_up(), m_symtab_up(),
m_symtab_once_up(new llvm::once_flag()) {
- if (header_data_sp)
- m_data_nsp->SetData(header_data_sp, 0, header_data_sp->GetByteSize());
+ if (header_extractor_sp && header_extractor_sp->GetByteSize() > 0)
+ m_data_nsp = header_extractor_sp;
Log *log = GetLog(LLDBLog::Object);
LLDB_LOGF(log,
"%p ObjectFile::ObjectFile() module = %p (%s), process = %p, "
diff --git a/lldb/source/Symbol/SymbolVendor.cpp b/lldb/source/Symbol/SymbolVendor.cpp
index d26363130e2df..7e028aaed54d6 100644
--- a/lldb/source/Symbol/SymbolVendor.cpp
+++ b/lldb/source/Symbol/SymbolVendor.cpp
@@ -43,7 +43,7 @@ SymbolVendor *SymbolVendor::FindPlugin(const lldb::ModuleSP &module_sp,
ObjectFileSP sym_objfile_sp;
FileSpec sym_spec = module_sp->GetSymbolFileFileSpec();
if (sym_spec && sym_spec != module_sp->GetObjectFile()->GetFileSpec()) {
- DataBufferSP data_sp;
+ DataExtractorSP data_sp;
offset_t data_offset = 0;
sym_objfile_sp = ObjectFile::FindPlugin(
module_sp, &sym_spec, 0, FileSystem::Instance().GetByteSize(sym_spec),
diff --git a/lldb/source/Utility/DataExtractor.cpp b/lldb/source/Utility/DataExtractor.cpp
index a9aea168acf41..31f33aec1a9e1 100644
--- a/lldb/source/Utility/DataExtractor.cpp
+++ b/lldb/source/Utility/DataExtractor.cpp
@@ -149,6 +149,15 @@ DataExtractor::DataExtractor(const DataBufferSP &data_sp, ByteOrder endian,
SetData(data_sp);
}
+// Make a shared pointer reference to the shared data in "data_sp".
+DataExtractor::DataExtractor(const DataBufferSP &data_sp,
+ uint32_t target_byte_size /*=1*/)
+ : m_byte_order(endian::InlHostByteOrder()), m_addr_size(sizeof(void *)),
+ m_data_sp(data_sp), m_target_byte_size(target_byte_size) {
+ if (data_sp)
+ SetData(data_sp);
+}
+
// Initialize this object with a subset of the data bytes in "data". If "data"
// contains shared data, then a reference to this shared data will added and
// the shared data will stay around as long as any object contains a reference
>From f2adc77f530b2a7c833e793d8eb8e7296f8628a5 Mon Sep 17 00:00:00 2001
From: Jason Molenda <jmolenda at apple.com>
Date: Wed, 10 Dec 2025 14:51:19 -0800
Subject: [PATCH 2/4] Fix DataExtractor.h method descriptions based on David's
feedback.
---
lldb/include/lldb/Utility/DataExtractor.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lldb/include/lldb/Utility/DataExtractor.h b/lldb/include/lldb/Utility/DataExtractor.h
index 56d4fd36198fe..0f0593dc1b784 100644
--- a/lldb/include/lldb/Utility/DataExtractor.h
+++ b/lldb/include/lldb/Utility/DataExtractor.h
@@ -90,10 +90,10 @@ class DataExtractor {
/// Construct with shared data.
///
- /// Copies the data shared pointer which adds a reference to the contained
- /// in \a data_sp. The shared data reference is reference counted to ensure
- /// the data lives as long as anyone still has a valid shared pointer to the
- /// data in \a data_sp.
+ /// Copies the data shared pointer which adds a reference to the data
+ /// contained in \a data_sp. The shared data reference is reference counted to
+ /// ensure the data lives as long as anyone still has a valid shared pointer
+ /// to the data in \a data_sp.
///
/// \param[in] data_sp
/// A shared pointer to data.
@@ -109,12 +109,12 @@ class DataExtractor {
DataExtractor(const lldb::DataBufferSP &data_sp, lldb::ByteOrder byte_order,
uint32_t addr_size, uint32_t target_byte_size = 1);
- /// Constructure with shared data, but no byte order/addr size unspecified.
+ /// Construct with shared data, but byte-order & addr-size are unspecified.
///
- /// Copies the data shared pointer which adds a reference to the contained
- /// in \a data_sp. The shared data reference is reference counted to ensure
- /// the data lives as long as anyone still has a valid shared pointer to the
- /// data in \a data_sp.
+ /// Copies the data shared pointer which adds a reference to the data
+ /// contained in \a data_sp. The shared data reference is reference counted to
+ /// ensure the data lives as long as anyone still has a valid shared pointer
+ /// to the data in \a data_sp.
///
/// \param[in] data_sp
/// A shared pointer to data.
>From 36ece8ed4eaf239ff55ffe47839948e356225cf0 Mon Sep 17 00:00:00 2001
From: Jason Molenda <github-mail at molenda.com>
Date: Wed, 10 Dec 2025 19:24:54 -0800
Subject: [PATCH 3/4] Update
lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
Co-authored-by: Jonas Devlieghere <jonas at devlieghere.com>
---
.../ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
index 1463c473a6d8b..16bab21014b07 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
@@ -169,9 +169,9 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
lldb::offset_t m_file_offset;
std::vector<Object> m_objects;
ObjectNameToIndexMap m_object_name_to_index_map;
- lldb::DataExtractorSP m_data_sp; ///< The data for this object container
- /// so we don't lose data if the .a files
- /// gets modified
+ /// The data for this object container so we don't lose data if the .a files
+ /// gets modified.
+ lldb::DataExtractorSP m_data_sp;
ArchiveType m_archive_type;
};
>From e19fefcc87c3598fe5ba5fefe8bb97dd7f7a48e6 Mon Sep 17 00:00:00 2001
From: Jason Molenda <github-mail at molenda.com>
Date: Wed, 10 Dec 2025 19:29:27 -0800
Subject: [PATCH 4/4] Update lldb/source/Symbol/ObjectFile.cpp
Co-authored-by: Jonas Devlieghere <jonas at devlieghere.com>
---
lldb/source/Symbol/ObjectFile.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp
index 34a067f39e07b..213e9fc657c5f 100644
--- a/lldb/source/Symbol/ObjectFile.cpp
+++ b/lldb/source/Symbol/ObjectFile.cpp
@@ -270,7 +270,7 @@ ObjectFile::ObjectFile(const lldb::ModuleSP &module_sp,
m_file = *file_spec_ptr;
if (extractor_sp && extractor_sp->GetByteSize() > 0) {
m_data_nsp = extractor_sp;
- // the offset & length fields may be specifying a subset of the
+ // The offset & length fields may be specifying a subset of the
// total data buffer.
m_data_nsp->SetData(extractor_sp->GetSharedDataBuffer(), data_offset,
length);
More information about the lldb-commits
mailing list