summaryrefslogtreecommitdiffstats
path: root/lldb/source/Symbol/ObjectFile.cpp
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2019-02-13 06:25:41 +0000
committerJonas Devlieghere <jonas@devlieghere.com>2019-02-13 06:25:41 +0000
commitd5b440369dbb0d41e6ecd47d6ac7410201e27f17 (patch)
tree4dc2e3c44bcd3e14143715fa86584862b2290f9f /lldb/source/Symbol/ObjectFile.cpp
parent5cf777e41387c84518a9ff2ec1222058daf54e58 (diff)
downloadbcm5719-llvm-d5b440369dbb0d41e6ecd47d6ac7410201e27f17.tar.gz
bcm5719-llvm-d5b440369dbb0d41e6ecd47d6ac7410201e27f17.zip
Replace 'ap' with 'up' suffix in variable names. (NFC)
The `ap` suffix is a remnant of lldb's former use of auto pointers, before they got deprecated. Although all their uses were replaced by unique pointers, some variables still carried the suffix. In r353795 I removed another auto_ptr remnant, namely redundant calls to ::get for unique_pointers. Jim justly noted that this is a good opportunity to clean up the variable names as well. I went over all the changes to ensure my find-and-replace didn't have any undesired side-effects. I hope I didn't miss any, but if you end up at this commit doing a git blame on a weirdly named variable, please know that the change was unintentional. llvm-svn: 353912
Diffstat (limited to 'lldb/source/Symbol/ObjectFile.cpp')
-rw-r--r--lldb/source/Symbol/ObjectFile.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp
index 8d9545029a4..5c7c1b7c3ad 100644
--- a/lldb/source/Symbol/ObjectFile.cpp
+++ b/lldb/source/Symbol/ObjectFile.cpp
@@ -56,13 +56,13 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
PluginManager::GetObjectContainerCreateCallbackAtIndex(
idx)) != nullptr;
++idx) {
- std::unique_ptr<ObjectContainer> object_container_ap(
+ std::unique_ptr<ObjectContainer> object_container_up(
create_object_container_callback(module_sp, data_sp,
data_offset, file, file_offset,
file_size));
- if (object_container_ap)
- object_file_sp = object_container_ap->GetObjectFile(file);
+ if (object_container_up)
+ object_file_sp = object_container_up->GetObjectFile(file);
if (object_file_sp.get())
return object_file_sp;
@@ -105,13 +105,13 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
PluginManager::GetObjectContainerCreateCallbackAtIndex(
idx)) != nullptr;
++idx) {
- std::unique_ptr<ObjectContainer> object_container_ap(
+ std::unique_ptr<ObjectContainer> object_container_up(
create_object_container_callback(module_sp, data_sp,
data_offset, file,
file_offset, file_size));
- if (object_container_ap)
- object_file_sp = object_container_ap->GetObjectFile(file);
+ if (object_container_up)
+ object_file_sp = object_container_up->GetObjectFile(file);
if (object_file_sp.get())
return object_file_sp;
@@ -147,12 +147,12 @@ ObjectFile::FindPlugin(const lldb::ModuleSP &module_sp, const FileSpec *file,
PluginManager::GetObjectContainerCreateCallbackAtIndex(
idx)) != nullptr;
++idx) {
- std::unique_ptr<ObjectContainer> object_container_ap(
+ std::unique_ptr<ObjectContainer> object_container_up(
create_object_container_callback(module_sp, data_sp, data_offset,
file, file_offset, file_size));
- if (object_container_ap)
- object_file_sp = object_container_ap->GetObjectFile(file);
+ if (object_container_up)
+ object_file_sp = object_container_up->GetObjectFile(file);
if (object_file_sp.get())
return object_file_sp;
@@ -265,7 +265,7 @@ ObjectFile::ObjectFile(const lldb::ModuleSP &module_sp,
m_type(eTypeInvalid), m_strata(eStrataInvalid),
m_file_offset(file_offset), m_length(length), m_data(),
m_unwind_table(*this), m_process_wp(),
- m_memory_addr(LLDB_INVALID_ADDRESS), m_sections_ap(), m_symtab_ap(),
+ m_memory_addr(LLDB_INVALID_ADDRESS), m_sections_up(), m_symtab_up(),
m_synthetic_symbol_idx(0) {
if (file_spec_ptr)
m_file = *file_spec_ptr;
@@ -287,7 +287,7 @@ ObjectFile::ObjectFile(const lldb::ModuleSP &module_sp,
: ModuleChild(module_sp), m_file(), m_type(eTypeInvalid),
m_strata(eStrataInvalid), m_file_offset(0), m_length(0), m_data(),
m_unwind_table(*this), m_process_wp(process_sp),
- m_memory_addr(header_addr), m_sections_ap(), m_symtab_ap(),
+ m_memory_addr(header_addr), m_sections_up(), m_symtab_up(),
m_synthetic_symbol_idx(0) {
if (header_data_sp)
m_data.SetData(header_data_sp, 0, header_data_sp->GetByteSize());
@@ -463,12 +463,12 @@ DataBufferSP ObjectFile::ReadMemory(const ProcessSP &process_sp,
lldb::addr_t addr, size_t byte_size) {
DataBufferSP data_sp;
if (process_sp) {
- std::unique_ptr<DataBufferHeap> data_ap(new DataBufferHeap(byte_size, 0));
+ std::unique_ptr<DataBufferHeap> data_up(new DataBufferHeap(byte_size, 0));
Status error;
const size_t bytes_read = process_sp->ReadMemory(
- addr, data_ap->GetBytes(), data_ap->GetByteSize(), error);
+ addr, data_up->GetBytes(), data_up->GetByteSize(), error);
if (bytes_read == byte_size)
- data_sp.reset(data_ap.release());
+ data_sp.reset(data_up.release());
}
return data_sp;
}
@@ -601,13 +601,13 @@ void ObjectFile::ClearSymtab() {
if (log)
log->Printf("%p ObjectFile::ClearSymtab () symtab = %p",
static_cast<void *>(this),
- static_cast<void *>(m_symtab_ap.get()));
- m_symtab_ap.reset();
+ static_cast<void *>(m_symtab_up.get()));
+ m_symtab_up.reset();
}
}
SectionList *ObjectFile::GetSectionList(bool update_module_section_list) {
- if (m_sections_ap == nullptr) {
+ if (m_sections_up == nullptr) {
if (update_module_section_list) {
ModuleSP module_sp(GetModule());
if (module_sp) {
@@ -619,7 +619,7 @@ SectionList *ObjectFile::GetSectionList(bool update_module_section_list) {
CreateSections(unified_section_list);
}
}
- return m_sections_ap.get();
+ return m_sections_up.get();
}
lldb::SymbolType
OpenPOWER on IntegriCloud