Log breakpoints and addresses when printing ThreadPLans at ShouldStop

Author: felipepiovezan

lldb/source/Target/Thread.cpp

@@ -805,19 +805,31 @@ bool Thread::ShouldStop(Event *event_ptr) {
   SetShouldRunBeforePublicStop(false);
 
   if (log) {
+    auto &sc =
+        GetStackFrameAtIndex(0)->GetSymbolContext(eSymbolContextEverything);
+    auto *funcname = sc.GetFunctionName(Mangled::ePreferMangled).AsCString();
     LLDB_LOGF(log,
               "Thread::%s(%p) for tid = 0x%4.4" PRIx64 " 0x%4.4" PRIx64
-              ", pc = 0x%16.16" PRIx64,
+              ", pc = 0x%16.16" PRIx64 " (%s)",
               __FUNCTION__, static_cast<void *>(this), GetID(), GetProtocolID(),
               GetRegisterContext() ? GetRegisterContext()->GetPC()
-                                   : LLDB_INVALID_ADDRESS);
+                                   : LLDB_INVALID_ADDRESS,
+              funcname);
     LLDB_LOGF(log, "^^^^^^^^ Thread::ShouldStop Begin ^^^^^^^^");
     StreamString s;
     s.IndentMore();
     GetProcess()->DumpThreadPlansForTID(
         s, GetID(), eDescriptionLevelVerbose, true /* internal */,
         false /* condense_trivial */, true /* skip_unreported */);
     LLDB_LOGF(log, "Plan stack initial state:\n%s", s.GetData());
+    s.Clear();
+    auto &external_bps = this->CalculateTarget()->GetBreakpointList(false);
+    for (const auto &bp : external_bps.Breakpoints())
+      bp->GetDescription(&s, lldb::DescriptionLevel::eDescriptionLevelFull);
+    auto &internal_bps = this->CalculateTarget()->GetBreakpointList(true);
+    for (const auto &bp : internal_bps.Breakpoints())
+      bp->GetDescription(&s, lldb::DescriptionLevel::eDescriptionLevelFull);
+    LLDB_LOGF(log, "Current breakpoints:\n%s", s.GetData());
   }
 
   // The top most plan always gets to do the trace log...
@@ -993,6 +1005,14 @@ bool Thread::ShouldStop(Event *event_ptr) {
     LLDB_LOGF(log, "Plan stack final state:\n%s", s.GetData());
     LLDB_LOGF(log, "vvvvvvvv Thread::ShouldStop End (returning %i) vvvvvvvv",
               should_stop);
+    s.Clear();
+    auto &external_bps = this->CalculateTarget()->GetBreakpointList(false);
+    for (const auto &bp : external_bps.Breakpoints())
+      bp->GetDescription(&s, lldb::DescriptionLevel::eDescriptionLevelFull);
+    auto &internal_bps = this->CalculateTarget()->GetBreakpointList(true);
+    for (const auto &bp : internal_bps.Breakpoints())
+      bp->GetDescription(&s, lldb::DescriptionLevel::eDescriptionLevelFull);
+    LLDB_LOGF(log, "Current breakpoints:\n%s", s.GetData());
   }
   return should_stop;
 }

lldb/source/Target/ThreadPlanStepOut.cpp

@@ -277,24 +277,22 @@ void ThreadPlanStepOut::GetDescription(Stream *s,
       s->Printf("Stepping out by stepping through inlined function.");
     else {
       s->Printf("Stepping out from ");
+      s->Printf("address 0x%" PRIx64 " ", (uint64_t)m_step_from_insn);
       Address tmp_address;
       if (tmp_address.SetLoadAddress(m_step_from_insn, &GetTarget())) {
         tmp_address.Dump(s, &m_process, Address::DumpStyleResolvedDescription,
                          Address::DumpStyleLoadAddress);
-      } else {
-        s->Printf("address 0x%" PRIx64 "", (uint64_t)m_step_from_insn);
       }
 
       // FIXME: find some useful way to present the m_return_id, since there may
       // be multiple copies of the
       // same function on the stack.
 
       s->Printf(" returning to frame at ");
+      s->Printf("address 0x%" PRIx64 " ", (uint64_t)m_return_addr);
       if (tmp_address.SetLoadAddress(m_return_addr, &GetTarget())) {
         tmp_address.Dump(s, &m_process, Address::DumpStyleResolvedDescription,
                          Address::DumpStyleLoadAddress);
-      } else {
-        s->Printf("address 0x%" PRIx64 "", (uint64_t)m_return_addr);
       }
 
       if (level == eDescriptionLevelVerbose)