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
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index cf9f454..f581f07 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -91,7 +91,7 @@
m_breakpoint_list(false), m_internal_breakpoint_list(true),
m_watchpoint_list(), m_process_sp(), m_search_filter_sp(),
m_image_search_paths(ImageSearchPathsChanged, this), m_ast_importer_sp(),
- m_source_manager_ap(), m_stop_hooks(), m_stop_hook_next_id(0),
+ m_source_manager_up(), m_stop_hooks(), m_stop_hook_next_id(0),
m_valid(true), m_suppress_stop_hooks(false),
m_is_dummy_target(is_dummy_target),
m_stats_storage(static_cast<int>(StatisticKind::StatisticMax))
@@ -2468,9 +2468,9 @@
}
SourceManager &Target::GetSourceManager() {
- if (!m_source_manager_ap)
- m_source_manager_ap.reset(new SourceManager(shared_from_this()));
- return *m_source_manager_ap;
+ if (!m_source_manager_up)
+ m_source_manager_up.reset(new SourceManager(shared_from_this()));
+ return *m_source_manager_up;
}
ClangModulesDeclVendor *Target::GetClangModulesDeclVendor() {
@@ -2481,13 +2481,13 @@
{
std::lock_guard<std::mutex> guard(s_clang_modules_decl_vendor_mutex);
- if (!m_clang_modules_decl_vendor_ap) {
- m_clang_modules_decl_vendor_ap.reset(
+ if (!m_clang_modules_decl_vendor_up) {
+ m_clang_modules_decl_vendor_up.reset(
ClangModulesDeclVendor::Create(*this));
}
}
- return m_clang_modules_decl_vendor_ap.get();
+ return m_clang_modules_decl_vendor_up.get();
}
Target::StopHookSP Target::CreateStopHook() {
@@ -3143,14 +3143,14 @@
//--------------------------------------------------------------
Target::StopHook::StopHook(lldb::TargetSP target_sp, lldb::user_id_t uid)
: UserID(uid), m_target_sp(target_sp), m_commands(), m_specifier_sp(),
- m_thread_spec_ap(), m_active(true) {}
+ m_thread_spec_up(), m_active(true) {}
Target::StopHook::StopHook(const StopHook &rhs)
: UserID(rhs.GetID()), m_target_sp(rhs.m_target_sp),
m_commands(rhs.m_commands), m_specifier_sp(rhs.m_specifier_sp),
- m_thread_spec_ap(), m_active(rhs.m_active) {
- if (rhs.m_thread_spec_ap)
- m_thread_spec_ap.reset(new ThreadSpec(*rhs.m_thread_spec_ap));
+ m_thread_spec_up(), m_active(rhs.m_active) {
+ if (rhs.m_thread_spec_up)
+ m_thread_spec_up.reset(new ThreadSpec(*rhs.m_thread_spec_up));
}
Target::StopHook::~StopHook() = default;
@@ -3160,7 +3160,7 @@
}
void Target::StopHook::SetThreadSpecifier(ThreadSpec *specifier) {
- m_thread_spec_ap.reset(specifier);
+ m_thread_spec_up.reset(specifier);
}
void Target::StopHook::GetDescription(Stream *s,
@@ -3183,10 +3183,10 @@
s->SetIndentLevel(indent_level + 2);
}
- if (m_thread_spec_ap) {
+ if (m_thread_spec_up) {
StreamString tmp;
s->Indent("Thread:\n");
- m_thread_spec_ap->GetDescription(&tmp, level);
+ m_thread_spec_up->GetDescription(&tmp, level);
s->SetIndentLevel(indent_level + 4);
s->Indent(tmp.GetString());
s->PutCString("\n");