vendor/lldb/lldb-trunk-r375505vendor/lldb

1 files changed, 7 insertions, 9 deletions

diff --git a/source/Target/ThreadPlanStepOverBreakpoint.cpp b/source/Target/ThreadPlanStepOverBreakpoint.cpp
index 4770b57ab7f2e..725669b1e9a8b 100644
--- a/source/Target/ThreadPlanStepOverBreakpoint.cpp
+++ b/source/Target/ThreadPlanStepOverBreakpoint.cpp
@@ -62,11 +62,9 @@ bool ThreadPlanStepOverBreakpoint::DoPlanExplainsStop(Event *event_ptr) {
     StopReason reason = stop_info_sp->GetStopReason();
 
     Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_STEP));
+    LLDB_LOGF(log, "Step over breakpoint stopped for reason: %s.",
+              Thread::StopReasonAsCString(reason));
 
-    if (log)
-      log->Printf("Step over breakpoint stopped for reason: %s.", 
-          Thread::StopReasonAsCString(reason));
-  
     switch (reason) {
       case eStopReasonTrace:
       case eStopReasonNone:
@@ -91,9 +89,10 @@ bool ThreadPlanStepOverBreakpoint::DoPlanExplainsStop(Event *event_ptr) {
         lldb::addr_t pc_addr = m_thread.GetRegisterContext()->GetPC();
 
         if (pc_addr == m_breakpoint_addr) {
-          if (log)
-            log->Printf("Got breakpoint stop reason but pc: 0x%" PRIx64
-                        "hasn't changed.", pc_addr);
+          LLDB_LOGF(log,
+                    "Got breakpoint stop reason but pc: 0x%" PRIx64
+                    "hasn't changed.",
+                    pc_addr);
           return true;
         }
 
@@ -149,8 +148,7 @@ bool ThreadPlanStepOverBreakpoint::MischiefManaged() {
     return false;
   } else {
     Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_STEP));
-    if (log)
-      log->Printf("Completed step over breakpoint plan.");
+    LLDB_LOGF(log, "Completed step over breakpoint plan.");
     // Otherwise, re-enable the breakpoint we were stepping over, and we're
     // done.
     ReenableBreakpointSite();