diff options
Diffstat (limited to 'lldb/source/Target')
| -rw-r--r-- | lldb/source/Target/LanguageRuntime.cpp | 8 | ||||
| -rw-r--r-- | lldb/source/Target/Memory.cpp | 10 | ||||
| -rw-r--r-- | lldb/source/Target/ObjCLanguageRuntime.cpp | 4 | ||||
| -rw-r--r-- | lldb/source/Target/OperatingSystem.cpp | 12 | ||||
| -rw-r--r-- | lldb/source/Target/Process.cpp | 92 | ||||
| -rw-r--r-- | lldb/source/Target/StackFrameList.cpp | 24 | ||||
| -rw-r--r-- | lldb/source/Target/SystemRuntime.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Target/Target.cpp | 28 | ||||
| -rw-r--r-- | lldb/source/Target/Thread.cpp | 16 | ||||
| -rw-r--r-- | lldb/source/Target/ThreadPlanStepInRange.cpp | 8 | ||||
| -rw-r--r-- | lldb/source/Target/UnwindAssembly.cpp | 6 |
11 files changed, 107 insertions, 107 deletions
diff --git a/lldb/source/Target/LanguageRuntime.cpp b/lldb/source/Target/LanguageRuntime.cpp index 8203c9efa76..d00800683e9 100644 --- a/lldb/source/Target/LanguageRuntime.cpp +++ b/lldb/source/Target/LanguageRuntime.cpp @@ -201,7 +201,7 @@ protected: LanguageRuntime *LanguageRuntime::FindPlugin(Process *process, lldb::LanguageType language) { - std::unique_ptr<LanguageRuntime> language_runtime_ap; + std::unique_ptr<LanguageRuntime> language_runtime_up; LanguageRuntimeCreateInstance create_callback; for (uint32_t idx = 0; @@ -209,10 +209,10 @@ LanguageRuntime *LanguageRuntime::FindPlugin(Process *process, PluginManager::GetLanguageRuntimeCreateCallbackAtIndex(idx)) != nullptr; ++idx) { - language_runtime_ap.reset(create_callback(process, language)); + language_runtime_up.reset(create_callback(process, language)); - if (language_runtime_ap) - return language_runtime_ap.release(); + if (language_runtime_up) + return language_runtime_up.release(); } return nullptr; diff --git a/lldb/source/Target/Memory.cpp b/lldb/source/Target/Memory.cpp index c0597b687b9..979553ffa6a 100644 --- a/lldb/source/Target/Memory.cpp +++ b/lldb/source/Target/Memory.cpp @@ -229,17 +229,17 @@ size_t MemoryCache::Read(addr_t addr, void *dst, size_t dst_len, if (bytes_left > 0) { assert((curr_addr % cache_line_byte_size) == 0); - std::unique_ptr<DataBufferHeap> data_buffer_heap_ap( + std::unique_ptr<DataBufferHeap> data_buffer_heap_up( new DataBufferHeap(cache_line_byte_size, 0)); size_t process_bytes_read = m_process.ReadMemoryFromInferior( - curr_addr, data_buffer_heap_ap->GetBytes(), - data_buffer_heap_ap->GetByteSize(), error); + curr_addr, data_buffer_heap_up->GetBytes(), + data_buffer_heap_up->GetByteSize(), error); if (process_bytes_read == 0) return dst_len - bytes_left; if (process_bytes_read != cache_line_byte_size) - data_buffer_heap_ap->SetByteSize(process_bytes_read); - m_L2_cache[curr_addr] = DataBufferSP(data_buffer_heap_ap.release()); + data_buffer_heap_up->SetByteSize(process_bytes_read); + m_L2_cache[curr_addr] = DataBufferSP(data_buffer_heap_up.release()); // We have read data and put it into the cache, continue through the // loop again to get the data out of the cache... } diff --git a/lldb/source/Target/ObjCLanguageRuntime.cpp b/lldb/source/Target/ObjCLanguageRuntime.cpp index 7e0838e2de8..fac1fae68dc 100644 --- a/lldb/source/Target/ObjCLanguageRuntime.cpp +++ b/lldb/source/Target/ObjCLanguageRuntime.cpp @@ -302,8 +302,8 @@ ObjCLanguageRuntime::GetNonKVOClassDescriptor(ObjCISA isa) { CompilerType ObjCLanguageRuntime::EncodingToType::RealizeType(const char *name, bool for_expression) { - if (m_scratch_ast_ctx_ap) - return RealizeType(*m_scratch_ast_ctx_ap, name, for_expression); + if (m_scratch_ast_ctx_up) + return RealizeType(*m_scratch_ast_ctx_up, name, for_expression); return CompilerType(); } diff --git a/lldb/source/Target/OperatingSystem.cpp b/lldb/source/Target/OperatingSystem.cpp index a950f5e32a7..c78c197db5b 100644 --- a/lldb/source/Target/OperatingSystem.cpp +++ b/lldb/source/Target/OperatingSystem.cpp @@ -22,10 +22,10 @@ OperatingSystem *OperatingSystem::FindPlugin(Process *process, PluginManager::GetOperatingSystemCreateCallbackForPluginName( const_plugin_name); if (create_callback) { - std::unique_ptr<OperatingSystem> instance_ap( + std::unique_ptr<OperatingSystem> instance_up( create_callback(process, true)); - if (instance_ap) - return instance_ap.release(); + if (instance_up) + return instance_up.release(); } } else { for (uint32_t idx = 0; @@ -33,10 +33,10 @@ OperatingSystem *OperatingSystem::FindPlugin(Process *process, PluginManager::GetOperatingSystemCreateCallbackAtIndex(idx)) != nullptr; ++idx) { - std::unique_ptr<OperatingSystem> instance_ap( + std::unique_ptr<OperatingSystem> instance_up( create_callback(process, false)); - if (instance_ap) - return instance_ap.release(); + if (instance_up) + return instance_up.release(); } } return nullptr; diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 58d85a2d79a..994b52a9729 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -734,13 +734,13 @@ Process::Process(lldb::TargetSP target_sp, ListenerSP listener_sp, m_thread_list(this), m_extended_thread_list(this), m_extended_thread_stop_id(0), m_queue_list(this), m_queue_list_stop_id(0), m_notifications(), m_image_tokens(), m_listener_sp(listener_sp), - m_breakpoint_site_list(), m_dynamic_checkers_ap(), + m_breakpoint_site_list(), m_dynamic_checkers_up(), m_unix_signals_sp(unix_signals_sp), m_abi_sp(), m_process_input_reader(), m_stdio_communication("process.stdio"), m_stdio_communication_mutex(), m_stdin_forward(false), m_stdout_data(), m_stderr_data(), m_profile_data_comm_mutex(), m_profile_data(), m_iohandler_sync(0), m_memory_cache(*this), m_allocated_memory_cache(*this), - m_should_detach(false), m_next_event_action_ap(), m_public_run_lock(), + m_should_detach(false), m_next_event_action_up(), m_public_run_lock(), m_private_run_lock(), m_finalizing(false), m_finalize_called(false), m_clear_thread_plans_on_stop(false), m_force_next_event_delivery(false), m_last_broadcast_state(eStateInvalid), m_destroy_in_process(false), @@ -848,12 +848,12 @@ void Process::Finalize() { // We need to destroy the loader before the derived Process class gets // destroyed since it is very likely that undoing the loader will require // access to the real process. - m_dynamic_checkers_ap.reset(); + m_dynamic_checkers_up.reset(); m_abi_sp.reset(); - m_os_ap.reset(); - m_system_runtime_ap.reset(); - m_dyld_ap.reset(); - m_jit_loaders_ap.reset(); + m_os_up.reset(); + m_system_runtime_up.reset(); + m_dyld_up.reset(); + m_jit_loaders_up.reset(); m_thread_list_real.Destroy(); m_thread_list.Destroy(); m_extended_thread_list.Destroy(); @@ -866,7 +866,7 @@ void Process::Finalize() { m_allocated_memory_cache.Clear(); m_language_runtimes.clear(); m_instrumentation_runtimes.clear(); - m_next_event_action_ap.reset(); + m_next_event_action_up.reset(); // Clear the last natural stop ID since it has a strong reference to this // process m_mod_id.SetStopEventForLastNaturalStopID(EventSP()); @@ -1506,12 +1506,12 @@ void Process::UpdateThreadListIfNeeded() { } void Process::UpdateQueueListIfNeeded() { - if (m_system_runtime_ap) { + if (m_system_runtime_up) { if (m_queue_list.GetSize() == 0 || m_queue_list_stop_id != GetLastNaturalStopID()) { const StateType state = GetPrivateState(); if (StateIsStoppedState(state, true)) { - m_system_runtime_ap->PopulateQueueList(m_queue_list); + m_system_runtime_up->PopulateQueueList(m_queue_list); m_queue_list_stop_id = GetLastNaturalStopID(); } } @@ -1792,7 +1792,7 @@ bool Process::IsPossibleDynamicValue(ValueObject &in_value) { } void Process::SetDynamicCheckers(DynamicCheckerFunctions *dynamic_checkers) { - m_dynamic_checkers_ap.reset(dynamic_checkers); + m_dynamic_checkers_up.reset(dynamic_checkers); } BreakpointSiteList &Process::GetBreakpointSiteList() { @@ -2708,7 +2708,7 @@ Process::WaitForProcessStopPrivate(EventSP &event_sp, void Process::LoadOperatingSystemPlugin(bool flush) { if (flush) m_thread_list.Clear(); - m_os_ap.reset(OperatingSystem::FindPlugin(this, nullptr)); + m_os_up.reset(OperatingSystem::FindPlugin(this, nullptr)); if (flush) Flush(); } @@ -2716,10 +2716,10 @@ void Process::LoadOperatingSystemPlugin(bool flush) { Status Process::Launch(ProcessLaunchInfo &launch_info) { Status error; m_abi_sp.reset(); - m_dyld_ap.reset(); - m_jit_loaders_ap.reset(); - m_system_runtime_ap.reset(); - m_os_ap.reset(); + m_dyld_up.reset(); + m_jit_loaders_up.reset(); + m_system_runtime_up.reset(); + m_os_up.reset(); m_process_input_reader.reset(); Module *exe_module = GetTarget().GetExecutableModulePointer(); @@ -2789,8 +2789,8 @@ Status Process::Launch(ProcessLaunchInfo &launch_info) { if (system_runtime) system_runtime->DidLaunch(); - if (!m_os_ap) - LoadOperatingSystemPlugin(false); + if (!m_os_up) + LoadOperatingSystemPlugin(false); // We successfully launched the process and stopped, now it the // right time to set up signal filters before resuming. @@ -2850,7 +2850,7 @@ Status Process::LoadCore() { if (system_runtime) system_runtime->DidAttach(); - if (!m_os_ap) + if (!m_os_up) LoadOperatingSystemPlugin(false); // We successfully loaded a core file, now pretend we stopped so we can @@ -2876,25 +2876,25 @@ Status Process::LoadCore() { } DynamicLoader *Process::GetDynamicLoader() { - if (!m_dyld_ap) - m_dyld_ap.reset(DynamicLoader::FindPlugin(this, nullptr)); - return m_dyld_ap.get(); + if (!m_dyld_up) + m_dyld_up.reset(DynamicLoader::FindPlugin(this, nullptr)); + return m_dyld_up.get(); } const lldb::DataBufferSP Process::GetAuxvData() { return DataBufferSP(); } JITLoaderList &Process::GetJITLoaders() { - if (!m_jit_loaders_ap) { - m_jit_loaders_ap.reset(new JITLoaderList()); - JITLoader::LoadPlugins(this, *m_jit_loaders_ap); + if (!m_jit_loaders_up) { + m_jit_loaders_up.reset(new JITLoaderList()); + JITLoader::LoadPlugins(this, *m_jit_loaders_up); } - return *m_jit_loaders_ap; + return *m_jit_loaders_up; } SystemRuntime *Process::GetSystemRuntime() { - if (!m_system_runtime_ap) - m_system_runtime_ap.reset(SystemRuntime::FindPlugin(this)); - return m_system_runtime_ap.get(); + if (!m_system_runtime_up) + m_system_runtime_up.reset(SystemRuntime::FindPlugin(this)); + return m_system_runtime_up.get(); } Process::AttachCompletionHandler::AttachCompletionHandler(Process *process, @@ -2984,10 +2984,10 @@ ListenerSP ProcessAttachInfo::GetListenerForProcess(Debugger &debugger) { Status Process::Attach(ProcessAttachInfo &attach_info) { m_abi_sp.reset(); m_process_input_reader.reset(); - m_dyld_ap.reset(); - m_jit_loaders_ap.reset(); - m_system_runtime_ap.reset(); - m_os_ap.reset(); + m_dyld_up.reset(); + m_jit_loaders_up.reset(); + m_system_runtime_up.reset(); + m_os_up.reset(); lldb::pid_t attach_pid = attach_info.GetProcessID(); Status error; @@ -3193,7 +3193,7 @@ void Process::CompleteAttach() { } } - if (!m_os_ap) + if (!m_os_up) LoadOperatingSystemPlugin(false); // Figure out which one is the executable, and set that in our target: const ModuleList &target_modules = GetTarget().GetImages(); @@ -3851,9 +3851,9 @@ void Process::HandlePrivateEvent(EventSP &event_sp) { Process::ProcessEventData::GetStateFromEvent(event_sp.get()); // First check to see if anybody wants a shot at this event: - if (m_next_event_action_ap) { + if (m_next_event_action_up) { NextEventAction::EventActionResult action_result = - m_next_event_action_ap->PerformAction(event_sp); + m_next_event_action_up->PerformAction(event_sp); if (log) log->Printf("Ran next event action, result was %d.", action_result); @@ -3871,7 +3871,7 @@ void Process::HandlePrivateEvent(EventSP &event_sp) { // to exit so the next event will kill us. if (new_state != eStateExited) { // FIXME: should cons up an exited event, and discard this one. - SetExitStatus(0, m_next_event_action_ap->GetExitString()); + SetExitStatus(0, m_next_event_action_up->GetExitString()); SetNextEventAction(nullptr); return; } @@ -4658,11 +4658,11 @@ protected: void Process::SetSTDIOFileDescriptor(int fd) { // First set up the Read Thread for reading/handling process I/O - std::unique_ptr<ConnectionFileDescriptor> conn_ap( + std::unique_ptr<ConnectionFileDescriptor> conn_up( new ConnectionFileDescriptor(fd, true)); - if (conn_ap) { - m_stdio_communication.SetConnection(conn_ap.release()); + if (conn_up) { + m_stdio_communication.SetConnection(conn_up.release()); if (m_stdio_communication.IsConnected()) { m_stdio_communication.SetReadThreadBytesReceivedCallback( STDIOReadThreadBytesReceived, this); @@ -5783,12 +5783,12 @@ void Process::DidExec() { Target &target = GetTarget(); target.CleanupProcess(); target.ClearModules(false); - m_dynamic_checkers_ap.reset(); + m_dynamic_checkers_up.reset(); m_abi_sp.reset(); - m_system_runtime_ap.reset(); - m_os_ap.reset(); - m_dyld_ap.reset(); - m_jit_loaders_ap.reset(); + m_system_runtime_up.reset(); + m_os_up.reset(); + m_dyld_up.reset(); + m_jit_loaders_up.reset(); m_image_tokens.clear(); m_allocated_memory_cache.Clear(); m_language_runtimes.clear(); @@ -5872,7 +5872,7 @@ void Process::ModulesDidLoad(ModuleList &module_list) { // If we don't have an operating system plug-in, try to load one since // loading shared libraries might cause a new one to try and load - if (!m_os_ap) + if (!m_os_up) LoadOperatingSystemPlugin(false); // Give structured-data plugins a chance to see the modified modules. diff --git a/lldb/source/Target/StackFrameList.cpp b/lldb/source/Target/StackFrameList.cpp index a36fba45c5d..de80ae70f2b 100644 --- a/lldb/source/Target/StackFrameList.cpp +++ b/lldb/source/Target/StackFrameList.cpp @@ -819,11 +819,11 @@ void StackFrameList::Clear() { m_concrete_frames_fetched = 0; } -void StackFrameList::Merge(std::unique_ptr<StackFrameList> &curr_ap, +void StackFrameList::Merge(std::unique_ptr<StackFrameList> &curr_up, lldb::StackFrameListSP &prev_sp) { std::unique_lock<std::recursive_mutex> current_lock, previous_lock; - if (curr_ap) - current_lock = std::unique_lock<std::recursive_mutex>(curr_ap->m_mutex); + if (curr_up) + current_lock = std::unique_lock<std::recursive_mutex>(curr_up->m_mutex); if (prev_sp) previous_lock = std::unique_lock<std::recursive_mutex>(prev_sp->m_mutex); @@ -835,18 +835,18 @@ void StackFrameList::Merge(std::unique_ptr<StackFrameList> &curr_ap, else s.PutCString("NULL"); s.PutCString("\nCurr:\n"); - if (curr_ap) - curr_ap->Dump(&s); + if (curr_up) + curr_up->Dump(&s); else s.PutCString("NULL"); s.EOL(); #endif - if (!curr_ap || curr_ap->GetNumFrames(false) == 0) { + if (!curr_up || curr_up->GetNumFrames(false) == 0) { #if defined(DEBUG_STACK_FRAMES) s.PutCString("No current frames, leave previous frames alone...\n"); #endif - curr_ap.release(); + curr_up.release(); return; } @@ -857,11 +857,11 @@ void StackFrameList::Merge(std::unique_ptr<StackFrameList> &curr_ap, // We either don't have any previous frames, or since we have more than one // current frames it means we have all the frames and can safely replace // our previous frames. - prev_sp.reset(curr_ap.release()); + prev_sp.reset(curr_up.release()); return; } - const uint32_t num_curr_frames = curr_ap->GetNumFrames(false); + const uint32_t num_curr_frames = curr_up->GetNumFrames(false); if (num_curr_frames > 1) { #if defined(DEBUG_STACK_FRAMES) @@ -870,7 +870,7 @@ void StackFrameList::Merge(std::unique_ptr<StackFrameList> &curr_ap, #endif // We have more than one current frames it means we have all the frames and // can safely replace our previous frames. - prev_sp.reset(curr_ap.release()); + prev_sp.reset(curr_up.release()); #if defined(DEBUG_STACK_FRAMES) s.PutCString("\nMerged:\n"); @@ -880,7 +880,7 @@ void StackFrameList::Merge(std::unique_ptr<StackFrameList> &curr_ap, } StackFrameSP prev_frame_zero_sp(prev_sp->GetFrameAtIndex(0)); - StackFrameSP curr_frame_zero_sp(curr_ap->GetFrameAtIndex(0)); + StackFrameSP curr_frame_zero_sp(curr_up->GetFrameAtIndex(0)); StackID curr_stack_id(curr_frame_zero_sp->GetStackID()); StackID prev_stack_id(prev_frame_zero_sp->GetStackID()); @@ -910,7 +910,7 @@ void StackFrameList::Merge(std::unique_ptr<StackFrameList> &curr_ap, prev_sp->m_frames.insert(prev_sp->m_frames.begin(), curr_frame_zero_sp); } - curr_ap.release(); + curr_up.release(); #if defined(DEBUG_STACK_FRAMES) s.PutCString("\nMerged:\n"); diff --git a/lldb/source/Target/SystemRuntime.cpp b/lldb/source/Target/SystemRuntime.cpp index 2006ba58426..e53816acb9e 100644 --- a/lldb/source/Target/SystemRuntime.cpp +++ b/lldb/source/Target/SystemRuntime.cpp @@ -20,9 +20,9 @@ SystemRuntime *SystemRuntime::FindPlugin(Process *process) { (create_callback = PluginManager::GetSystemRuntimeCreateCallbackAtIndex( idx)) != nullptr; ++idx) { - std::unique_ptr<SystemRuntime> instance_ap(create_callback(process)); - if (instance_ap) - return instance_ap.release(); + std::unique_ptr<SystemRuntime> instance_up(create_callback(process)); + if (instance_up) + return instance_up.release(); } return nullptr; } diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index cf9f454c170..f581f073cde 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -91,7 +91,7 @@ Target::Target(Debugger &debugger, const ArchSpec &target_arch, 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 @@ lldb::addr_t Target::GetBreakableLoadAddress(lldb::addr_t addr) { } 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 @@ ClangModulesDeclVendor *Target::GetClangModulesDeclVendor() { { 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 @@ void Target::FinalizeFileActions(ProcessLaunchInfo &info) { //-------------------------------------------------------------- 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::SetSpecifier(SymbolContextSpecifier *specifier) { } 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 @@ void Target::StopHook::GetDescription(Stream *s, 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"); diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index 2bb3582357e..82564f7c5bd 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -256,7 +256,7 @@ Thread::Thread(Process &process, lldb::tid_t tid, bool use_invalid_index_id) m_curr_frames_sp(), m_prev_frames_sp(), m_resume_signal(LLDB_INVALID_SIGNAL_NUMBER), m_resume_state(eStateRunning), m_temporary_resume_state(eStateRunning), - m_unwinder_ap(), m_destroy_called(false), + m_unwinder_up(), m_destroy_called(false), m_override_should_notify(eLazyBoolCalculate), m_extended_info_fetched(false), m_extended_info() { Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_OBJECT)); @@ -306,7 +306,7 @@ void Thread::DestroyThread() { m_stop_info_sp.reset(); m_reg_context_sp.reset(); - m_unwinder_ap.reset(); + m_unwinder_up.reset(); std::lock_guard<std::recursive_mutex> guard(m_frame_mutex); m_curr_frames_sp.reset(); m_prev_frames_sp.reset(); @@ -562,8 +562,8 @@ bool Thread::RestoreRegisterStateFromCheckpoint( // Clear out all stack frames as our world just changed. ClearStackFrames(); reg_ctx_sp->InvalidateIfNeeded(true); - if (m_unwinder_ap) - m_unwinder_ap->Clear(); + if (m_unwinder_up) + m_unwinder_up->Clear(); return ret; } } @@ -2054,7 +2054,7 @@ size_t Thread::GetStackFrameStatus(Stream &strm, uint32_t first_frame, } Unwind *Thread::GetUnwinder() { - if (!m_unwinder_ap) { + if (!m_unwinder_up) { const ArchSpec target_arch(CalculateTarget()->GetArchitecture()); const llvm::Triple::ArchType machine = target_arch.GetMachine(); switch (machine) { @@ -2072,16 +2072,16 @@ Unwind *Thread::GetUnwinder() { case llvm::Triple::ppc64le: case llvm::Triple::systemz: case llvm::Triple::hexagon: - m_unwinder_ap.reset(new UnwindLLDB(*this)); + m_unwinder_up.reset(new UnwindLLDB(*this)); break; default: if (target_arch.GetTriple().getVendor() == llvm::Triple::Apple) - m_unwinder_ap.reset(new UnwindMacOSXFrameBackchain(*this)); + m_unwinder_up.reset(new UnwindMacOSXFrameBackchain(*this)); break; } } - return m_unwinder_ap.get(); + return m_unwinder_up.get(); } void Thread::Flush() { diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp index 98387b9aa63..6e8fc984158 100644 --- a/lldb/source/Target/ThreadPlanStepInRange.cpp +++ b/lldb/source/Target/ThreadPlanStepInRange.cpp @@ -314,10 +314,10 @@ bool ThreadPlanStepInRange::ShouldStop(Event *event_ptr) { void ThreadPlanStepInRange::SetAvoidRegexp(const char *name) { auto name_ref = llvm::StringRef::withNullAsEmpty(name); - if (!m_avoid_regexp_ap) - m_avoid_regexp_ap.reset(new RegularExpression(name_ref)); + if (!m_avoid_regexp_up) + m_avoid_regexp_up.reset(new RegularExpression(name_ref)); - m_avoid_regexp_ap->Compile(name_ref); + m_avoid_regexp_up->Compile(name_ref); } void ThreadPlanStepInRange::SetDefaultFlagValue(uint32_t new_value) { @@ -350,7 +350,7 @@ bool ThreadPlanStepInRange::FrameMatchesAvoidCriteria() { if (libraries_say_avoid) return true; - const RegularExpression *avoid_regexp_to_use = m_avoid_regexp_ap.get(); + const RegularExpression *avoid_regexp_to_use = m_avoid_regexp_up.get(); if (avoid_regexp_to_use == nullptr) avoid_regexp_to_use = GetThread().GetSymbolsToAvoidRegexp(); diff --git a/lldb/source/Target/UnwindAssembly.cpp b/lldb/source/Target/UnwindAssembly.cpp index 869cf84865a..d3d8068687c 100644 --- a/lldb/source/Target/UnwindAssembly.cpp +++ b/lldb/source/Target/UnwindAssembly.cpp @@ -21,9 +21,9 @@ UnwindAssemblySP UnwindAssembly::FindPlugin(const ArchSpec &arch) { (create_callback = PluginManager::GetUnwindAssemblyCreateCallbackAtIndex( idx)) != nullptr; ++idx) { - UnwindAssemblySP assembly_profiler_ap(create_callback(arch)); - if (assembly_profiler_ap) - return assembly_profiler_ap; + UnwindAssemblySP assembly_profiler_up(create_callback(arch)); + if (assembly_profiler_up) + return assembly_profiler_up; } return nullptr; } |
