diff options
| author | Greg Clayton <gclayton@apple.com> | 2013-03-27 23:08:40 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2013-03-27 23:08:40 +0000 |
| commit | 5160ce5c72e5f55c2e83ca9914cd0f02e0c5ceb3 (patch) | |
| tree | b24bb5959b40d8f0e99ed6d8b13271270dbf08e3 /lldb/source/Symbol/ObjectFile.cpp | |
| parent | ccc266559f5c028442b6393362da14d866d9b32b (diff) | |
| download | bcm5719-llvm-5160ce5c72e5f55c2e83ca9914cd0f02e0c5ceb3.tar.gz bcm5719-llvm-5160ce5c72e5f55c2e83ca9914cd0f02e0c5ceb3.zip | |
<rdar://problem/13521159>
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
Diffstat (limited to 'lldb/source/Symbol/ObjectFile.cpp')
| -rw-r--r-- | lldb/source/Symbol/ObjectFile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp index 4ad515b94d8..5451f6941f7 100644 --- a/lldb/source/Symbol/ObjectFile.cpp +++ b/lldb/source/Symbol/ObjectFile.cpp @@ -208,7 +208,7 @@ ObjectFile::ObjectFile (const lldb::ModuleSP &module_sp, m_file = *file_spec_ptr; if (data_sp) m_data.SetData (data_sp, data_offset, length); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) { const ConstString object_name (module_sp->GetObjectName()); @@ -261,7 +261,7 @@ ObjectFile::ObjectFile (const lldb::ModuleSP &module_sp, { if (header_data_sp) m_data.SetData (header_data_sp, 0, header_data_sp->GetByteSize()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) { const ConstString object_name (module_sp->GetObjectName()); @@ -280,7 +280,7 @@ ObjectFile::ObjectFile (const lldb::ModuleSP &module_sp, ObjectFile::~ObjectFile() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p ObjectFile::~ObjectFile ()\n", this); } @@ -541,7 +541,7 @@ ObjectFile::ClearSymtab () if (module_sp) { lldb_private::Mutex::Locker locker(module_sp->GetMutex()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) { log->Printf ("%p ObjectFile::ClearSymtab () symtab = %p", |
