Skip to content

Commit 53534ba

Browse files
jasonmolendajasonmolenda
committed
Implement stricter naming convention of
DataExtractos being "extractor", DataBuffers being "data" in all the files being touched by this PR.
1 parent 40a9db6 commit 53534ba

File tree

15 files changed

+147
-137
lines changed

15 files changed

+147
-137
lines changed

‎lldb/include/lldb/Expression/ObjectFileJIT.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ class ObjectFileJIT : public ObjectFile {
4949
}
5050

5151
static lldb_private::ObjectFile *
52-
CreateInstance(const lldb::ModuleSP &module_sp, lldb::DataExtractorSP data_sp,
53-
lldb::offset_t data_offset, const lldb_private::FileSpec *file,
54-
lldb::offset_t file_offset, lldb::offset_t length);
52+
CreateInstance(const lldb::ModuleSP &module_sp,
53+
lldb::DataExtractorSP extractor_sp, lldb::offset_t data_offset,
54+
const lldb_private::FileSpec *file, lldb::offset_t file_offset,
55+
lldb::offset_t length);
5556

5657
static lldb_private::ObjectFile *CreateMemoryInstance(
5758
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,

‎lldb/include/lldb/Symbol/ObjectContainer.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ class ObjectContainer : public PluginInterface, public ModuleChild {
9797
/// Attempts to parse the object header.
9898
///
9999
/// This function is used as a test to see if a given plug-in instance can
100-
/// parse the header data already contained in ObjectContainer::m_data_sp. If
101-
/// an object file parser does not recognize that magic bytes in a header,
102-
/// false should be returned and the next plug-in can attempt to parse an
103-
/// object file.
100+
/// parse the header data already contained in
101+
/// ObjectContainer::m_extractor_sp. If an object file parser does not
102+
/// recognize that magic bytes in a header, false should be returned and the
103+
/// next plug-in can attempt to parse an object file.
104104
///
105105
/// \return
106106
/// Returns \b true if the header was parsed successfully, \b
@@ -140,7 +140,7 @@ class ObjectContainer : public PluginInterface, public ModuleChild {
140140
lldb::addr_t m_length;
141141

142142
/// The data for this object file so things can be parsed lazily.
143-
lldb::DataExtractorSP m_data_sp;
143+
lldb::DataExtractorSP m_extractor_sp;
144144

145145
private:
146146
ObjectContainer(const ObjectContainer &) = delete;

‎lldb/include/lldb/lldb-private-interfaces.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,10 @@ typedef size_t (*ObjectFileGetModuleSpecifications)(
4949
const FileSpec &file, lldb::DataBufferSP &data_sp,
5050
lldb::offset_t data_offset, lldb::offset_t file_offset,
5151
lldb::offset_t length, ModuleSpecList &module_specs);
52-
typedef ObjectFile *(*ObjectFileCreateInstance)(const lldb::ModuleSP &module_sp,
53-
lldb::DataExtractorSP data_sp,
54-
lldb::offset_t data_offset,
55-
const FileSpec *file,
56-
lldb::offset_t file_offset,
57-
lldb::offset_t length);
52+
typedef ObjectFile *(*ObjectFileCreateInstance)(
53+
const lldb::ModuleSP &module_sp, lldb::DataExtractorSP extractor_sp,
54+
lldb::offset_t data_offset, const FileSpec *file,
55+
lldb::offset_t file_offset, lldb::offset_t length);
5856
typedef ObjectFile *(*ObjectFileCreateMemoryInstance)(
5957
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,
6058
const lldb::ProcessSP &process_sp, lldb::addr_t offset);

‎lldb/source/Expression/ObjectFileJIT.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void ObjectFileJIT::Terminate() {
4141
}
4242

4343
ObjectFile *ObjectFileJIT::CreateInstance(const lldb::ModuleSP &module_sp,
44-
DataExtractorSP data_sp,
44+
DataExtractorSP extractor_sp,
4545
lldb::offset_t data_offset,
4646
const FileSpec *file,
4747
lldb::offset_t file_offset,

‎lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ void ObjectContainerBSDArchive::Object::Dump() const {
6868
ObjectContainerBSDArchive::Archive::Archive(const lldb_private::ArchSpec &arch,
6969
const llvm::sys::TimePoint<> &time,
7070
lldb::offset_t file_offset,
71-
lldb::DataExtractorSP data,
71+
lldb::DataExtractorSP extractor_sp,
7272
ArchiveType archive_type)
7373
: m_arch(arch), m_modification_time(time), m_file_offset(file_offset),
74-
m_objects(), m_data_sp(data), m_archive_type(archive_type) {}
74+
m_objects(), m_extractor_sp(extractor_sp), m_archive_type(archive_type) {}
7575

7676
Log *l = GetLog(LLDBLog::Object);
7777
ObjectContainerBSDArchive::Archive::~Archive() = default;
7878

7979
size_t ObjectContainerBSDArchive::Archive::ParseObjects() {
8080
std::unique_ptr<llvm::MemoryBuffer> mem_buffer =
8181
llvm::MemoryBuffer::getMemBuffer(
82-
llvm::StringRef((const char *)m_data_sp->GetDataStart(),
83-
m_data_sp->GetByteSize()),
82+
llvm::StringRef((const char *)m_extractor_sp->GetDataStart(),
83+
m_extractor_sp->GetByteSize()),
8484
llvm::StringRef(),
8585
/*RequiresNullTerminator=*/false);
8686

@@ -219,9 +219,9 @@ ObjectContainerBSDArchive::Archive::shared_ptr
219219
ObjectContainerBSDArchive::Archive::ParseAndCacheArchiveForFile(
220220
const FileSpec &file, const ArchSpec &arch,
221221
const llvm::sys::TimePoint<> &time, lldb::offset_t file_offset,
222-
DataExtractorSP data, ArchiveType archive_type) {
222+
DataExtractorSP extractor_sp, ArchiveType archive_type) {
223223
shared_ptr archive_sp(
224-
new Archive(arch, time, file_offset, data, archive_type));
224+
new Archive(arch, time, file_offset, extractor_sp, archive_type));
225225
if (archive_sp) {
226226
const size_t num_objects = archive_sp->ParseObjects();
227227
if (num_objects > 0) {
@@ -366,17 +366,17 @@ ObjectContainerBSDArchive::~ObjectContainerBSDArchive() = default;
366366

367367
bool ObjectContainerBSDArchive::ParseHeader() {
368368
if (m_archive_sp.get() == nullptr) {
369-
if (m_data_sp->GetByteSize() > 0) {
369+
if (m_extractor_sp->GetByteSize() > 0) {
370370
ModuleSP module_sp(GetModule());
371371
if (module_sp) {
372372
m_archive_sp = Archive::ParseAndCacheArchiveForFile(
373373
m_file, module_sp->GetArchitecture(),
374-
module_sp->GetModificationTime(), m_offset, m_data_sp,
374+
module_sp->GetModificationTime(), m_offset, m_extractor_sp,
375375
m_archive_type);
376376
}
377-
// Clear the m_data_sp that contains the entire archive data and let our
378-
// m_archive_sp hold onto the data.
379-
m_data_sp = std::make_shared<DataExtractor>();
377+
// Clear the m_extractor_sp that contains the entire archive data and let
378+
// our m_archive_sp hold onto the data.
379+
m_extractor_sp = std::make_shared<DataExtractor>();
380380
}
381381
}
382382
return m_archive_sp.get() != nullptr;

‎lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
6161
lldb::offset_t length,
6262
lldb_private::ModuleSpecList &specs);
6363

64-
static ArchiveType MagicBytesMatch(const lldb_private::DataExtractor &data);
64+
static ArchiveType
65+
MagicBytesMatch(const lldb_private::DataExtractor &extractor);
6566

6667
// Member Functions
6768
bool ParseHeader() override;
@@ -83,11 +84,11 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
8384

8485
void Clear();
8586

86-
lldb::offset_t ExtractFromThin(const lldb_private::DataExtractor &data,
87+
lldb::offset_t ExtractFromThin(const lldb_private::DataExtractor &extractor,
8788
lldb::offset_t offset,
8889
llvm::StringRef stringTable);
8990

90-
lldb::offset_t Extract(const lldb_private::DataExtractor &data,
91+
lldb::offset_t Extract(const lldb_private::DataExtractor &extractor,
9192
lldb::offset_t offset);
9293
/// Object name in the archive.
9394
lldb_private::ConstString ar_name;
@@ -114,7 +115,7 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
114115

115116
Archive(const lldb_private::ArchSpec &arch,
116117
const llvm::sys::TimePoint<> &mod_time, lldb::offset_t file_offset,
117-
lldb::DataExtractorSP data, ArchiveType archive_type);
118+
lldb::DataExtractorSP extractor_sp, ArchiveType archive_type);
118119

119120
~Archive();
120121

@@ -129,7 +130,7 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
129130
static Archive::shared_ptr ParseAndCacheArchiveForFile(
130131
const lldb_private::FileSpec &file, const lldb_private::ArchSpec &arch,
131132
const llvm::sys::TimePoint<> &mod_time, lldb::offset_t file_offset,
132-
lldb::DataExtractorSP data_sp, ArchiveType archive_type);
133+
lldb::DataExtractorSP extractor_sp, ArchiveType archive_type);
133134

134135
size_t GetNumObjects() const { return m_objects.size(); }
135136

@@ -156,8 +157,8 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
156157

157158
bool HasNoExternalReferences() const;
158159

159-
lldb_private::DataExtractor &GetData() { return *m_data_sp.get(); }
160-
lldb::DataExtractorSP &GetDataSP() { return m_data_sp; }
160+
lldb_private::DataExtractor &GetData() { return *m_extractor_sp.get(); }
161+
lldb::DataExtractorSP &GetDataSP() { return m_extractor_sp; }
161162

162163
ArchiveType GetArchiveType() { return m_archive_type; }
163164

@@ -171,7 +172,7 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
171172
ObjectNameToIndexMap m_object_name_to_index_map;
172173
/// The data for this object container so we don't lose data if the .a files
173174
/// gets modified.
174-
lldb::DataExtractorSP m_data_sp;
175+
lldb::DataExtractorSP m_extractor_sp;
175176
ArchiveType m_archive_type;
176177
};
177178

0 commit comments

Comments
 (0)