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/API/SBModule.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lldb/source/API/SBModule.cpp') diff --git a/lldb/source/API/SBModule.cpp b/lldb/source/API/SBModule.cpp index 461950f29e9d..e673a0aa4ed6 100644 --- a/lldb/source/API/SBModule.cpp +++ b/lldb/source/API/SBModule.cpp @@ -88,7 +88,7 @@ SBModule::Clear() SBFileSpec SBModule::GetFileSpec () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFileSpec file_spec; ModuleSP module_sp (GetSP ()); @@ -107,7 +107,7 @@ SBModule::GetFileSpec () const lldb::SBFileSpec SBModule::GetPlatformFileSpec () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFileSpec file_spec; ModuleSP module_sp (GetSP ()); @@ -128,7 +128,7 @@ bool SBModule::SetPlatformFileSpec (const lldb::SBFileSpec &platform_file) { bool result = false; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ModuleSP module_sp (GetSP ()); if (module_sp) @@ -155,7 +155,7 @@ SBModule::SetPlatformFileSpec (const lldb::SBFileSpec &platform_file) const uint8_t * SBModule::GetUUIDBytes () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const uint8_t *uuid_bytes = NULL; ModuleSP module_sp (GetSP ()); @@ -180,7 +180,7 @@ SBModule::GetUUIDBytes () const const char * SBModule::GetUUIDString () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); static char uuid_string[80]; const char * uuid_c_string = NULL; -- cgit v1.2.3