Modified all logging calls to hand out shared pointers to make sure we

don't crash if we disable logging when some code already has a copy of the
logger. Prior to this fix, logs were handed out as pointers and if they were
held onto while a log got disabled, then it could cause a crash. Now all logs
are handed out as shared pointers so this problem shouldn't happen anymore.
We are also using our new shared pointers that put the shared pointer count
and the object into the same allocation for a tad better performance.

llvm-svn: 118319

1 files changed, 1 insertions, 4 deletions

diff --git a/lldb/source/Target/ThreadPlanTestCondition.cpp b/lldb/source/Target/ThreadPlanTestCondition.cpp
index 68d4a8af9d6..888de0c70e4 100644
--- a/lldb/source/Target/ThreadPlanTestCondition.cpp
+++ b/lldb/source/Target/ThreadPlanTestCondition.cpp
@@ -70,7 +70,7 @@ ThreadPlanTestCondition::GetDescription (Stream *s, lldb::DescriptionLevel level
 bool 
 ThreadPlanTestCondition::ShouldStop (Event *event_ptr)
 {    
-    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
+    LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
     if (m_thread.IsThreadPlanDone(m_expression_plan_sp.get()))
     {
         ClangExpressionVariable *expr_result = NULL;
@@ -89,13 +89,11 @@ ThreadPlanTestCondition::ShouldStop (Event *event_ptr)
                 else
                     m_did_stop = true;
             }
-            log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
             if (log)
                 log->Printf("Condition successfully evaluated, result is %s.\n", m_did_stop ? "true" : "false");
         }
         else
         {
-            log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
             if (log)
                 log->Printf("Failed to get a result from the expression, error: \"%s\"\n", error_stream.GetData());
             m_did_stop = true;
@@ -103,7 +101,6 @@ ThreadPlanTestCondition::ShouldStop (Event *event_ptr)
     }
     else if (m_exe_ctx.thread->WasThreadPlanDiscarded (m_expression_plan_sp.get()))
     {
-        log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
         if (log)
             log->Printf("ExecuteExpression thread plan was discarded.\n");
         m_did_stop = true;