diff --git a/lldb/include/lldb/Target/ExecutionContext.h b/lldb/include/lldb/Target/ExecutionContext.h index d8c233a666bb4..aebd0d5308e72 100644 --- a/lldb/include/lldb/Target/ExecutionContext.h +++ b/lldb/include/lldb/Target/ExecutionContext.h @@ -318,7 +318,9 @@ class ExecutionContext { // These two variants take in a locker, and grab the target, lock the API // mutex into locker, then fill in the rest of the shared pointers. ExecutionContext(const ExecutionContextRef &exe_ctx_ref, - std::unique_lock &locker); + std::unique_lock &locker) + : ExecutionContext(&exe_ctx_ref, locker) {} + ExecutionContext(const ExecutionContextRef *exe_ctx_ref, std::unique_lock &locker); // Create execution contexts from execution context scopes diff --git a/lldb/source/Target/ExecutionContext.cpp b/lldb/source/Target/ExecutionContext.cpp index b1563d9ceb71b..3f54ea55c9c81 100644 --- a/lldb/source/Target/ExecutionContext.cpp +++ b/lldb/source/Target/ExecutionContext.cpp @@ -140,19 +140,6 @@ ExecutionContext::ExecutionContext(const ExecutionContextRef *exe_ctx_ref_ptr, } } -ExecutionContext::ExecutionContext(const ExecutionContextRef &exe_ctx_ref, - std::unique_lock &lock) - : m_target_sp(exe_ctx_ref.GetTargetSP()), m_process_sp(), m_thread_sp(), - m_frame_sp() { - if (m_target_sp) { - lock = std::unique_lock(m_target_sp->GetAPIMutex()); - - m_process_sp = exe_ctx_ref.GetProcessSP(); - m_thread_sp = exe_ctx_ref.GetThreadSP(); - m_frame_sp = exe_ctx_ref.GetFrameSP(); - } -} - ExecutionContext::ExecutionContext(ExecutionContextScope *exe_scope_ptr) : m_target_sp(), m_process_sp(), m_thread_sp(), m_frame_sp() { if (exe_scope_ptr)