From 5160ce5c72e5f55c2e83ca9914cd0f02e0c5ceb3 Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Wed, 27 Mar 2013 23:08:40 +0000 Subject: LLDB is crashing when logging is enabled from lldb-perf-clang. This has to do with the global destructor chain as the process and its threads are being torn down. All logging channels now make one and only one instance that is kept in a global pointer which is never freed. This guarantees that logging can correctly continue as the process tears itself down. llvm-svn: 178191 --- lldb/source/Target/StackFrameList.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lldb/source/Target/StackFrameList.cpp') diff --git a/lldb/source/Target/StackFrameList.cpp b/lldb/source/Target/StackFrameList.cpp index 913456d2419..5b290e3ebfa 100644 --- a/lldb/source/Target/StackFrameList.cpp +++ b/lldb/source/Target/StackFrameList.cpp @@ -87,7 +87,7 @@ StackFrameList::GetCurrentInlinedDepth () { m_current_inlined_pc = LLDB_INVALID_ADDRESS; m_current_inlined_depth = UINT32_MAX; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("GetCurrentInlinedDepth: invalidating current inlined depth.\n"); } @@ -109,7 +109,7 @@ StackFrameList::ResetCurrentInlinedDepth () { m_current_inlined_depth = UINT32_MAX; m_current_inlined_pc = LLDB_INVALID_ADDRESS; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("ResetCurrentInlinedDepth: Invalidating current inlined depth.\n"); } @@ -204,7 +204,7 @@ StackFrameList::ResetCurrentInlinedDepth () } m_current_inlined_pc = curr_pc; m_current_inlined_depth = num_inlined_functions + 1; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("ResetCurrentInlinedDepth: setting inlined depth: %d 0x%" PRIx64 ".\n", m_current_inlined_depth, curr_pc); -- cgit v1.2.3