diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp --- a/lldb/source/API/SBTarget.cpp +++ b/lldb/source/API/SBTarget.cpp @@ -1117,8 +1117,8 @@ llvm::Expected> expected_vector = target_sp->GetBreakpointList().FindBreakpointsByName(name); if (!expected_vector) { - LLDB_LOG(GetLog(LLDBLog::Breakpoints), "invalid breakpoint name: {}", - llvm::toString(expected_vector.takeError())); + LLDB_LOG_ERROR(GetLog(LLDBLog::Breakpoints), expected_vector.takeError(), + "invalid breakpoint name: {0}"); return false; } for (BreakpointSP bkpt_sp : *expected_vector) { @@ -1591,7 +1591,7 @@ const char *SBTarget::GetABIName() { LLDB_INSTRUMENT_VA(this); - + TargetSP target_sp(GetSP()); if (!target_sp) return nullptr; diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -1915,8 +1915,8 @@ if (event_handler_thread) { m_event_handler_thread = *event_handler_thread; } else { - LLDB_LOG(GetLog(LLDBLog::Host), "failed to launch host thread: {}", - llvm::toString(event_handler_thread.takeError())); + LLDB_LOG_ERROR(GetLog(LLDBLog::Host), event_handler_thread.takeError(), + "failed to launch host thread: {0}"); } // Make sure DefaultEventHandler() is running and listening to events @@ -2056,8 +2056,8 @@ if (io_handler_thread) { m_io_handler_thread = *io_handler_thread; } else { - LLDB_LOG(GetLog(LLDBLog::Host), "failed to launch host thread: {}", - llvm::toString(io_handler_thread.takeError())); + LLDB_LOG_ERROR(GetLog(LLDBLog::Host), io_handler_thread.takeError(), + "failed to launch host thread: {0}"); } } return m_io_handler_thread.IsJoinable(); diff --git a/lldb/source/Core/ThreadedCommunication.cpp b/lldb/source/Core/ThreadedCommunication.cpp --- a/lldb/source/Core/ThreadedCommunication.cpp +++ b/lldb/source/Core/ThreadedCommunication.cpp @@ -177,8 +177,8 @@ if (error_ptr) *error_ptr = Status(maybe_thread.takeError()); else { - LLDB_LOG(GetLog(LLDBLog::Host), "failed to launch host thread: {}", - llvm::toString(maybe_thread.takeError())); + LLDB_LOG_ERROR(GetLog(LLDBLog::Host), maybe_thread.takeError(), + "failed to launch host thread: {0}"); } } diff --git a/lldb/source/Host/common/ProcessLaunchInfo.cpp b/lldb/source/Host/common/ProcessLaunchInfo.cpp --- a/lldb/source/Host/common/ProcessLaunchInfo.cpp +++ b/lldb/source/Host/common/ProcessLaunchInfo.cpp @@ -182,8 +182,8 @@ llvm::Expected maybe_thread = Host::StartMonitoringChildProcess(m_monitor_callback, GetProcessID()); if (!maybe_thread) - LLDB_LOG(GetLog(LLDBLog::Host), "failed to launch host thread: {}", - llvm::toString(maybe_thread.takeError())); + LLDB_LOG_ERROR(GetLog(LLDBLog::Host), maybe_thread.takeError(), + "failed to launch host thread: {0}"); return true; } return false; diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -3600,8 +3600,8 @@ }, 8 * 1024 * 1024); if (!private_state_thread) { - LLDB_LOG(GetLog(LLDBLog::Host), "failed to launch host thread: {}", - llvm::toString(private_state_thread.takeError())); + LLDB_LOG_ERROR(GetLog(LLDBLog::Host), private_state_thread.takeError(), + "failed to launch host thread: {0}"); return false; }