llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Raphael Isemann (Teemperor) <details> <summary>Changes</summary> This code accesses the completed thread plan (even if it's private one). However, the logging code does not pass `skip_private=false` and instead accesses only the public completed thread plan. In case there is no public thread plan, the logging code could also crash. This is just some minor refactoring that ensures we use the same thread plan in the logging code. --- Full diff: https://github.com/llvm/llvm-project/pull/188198.diff 1 Files Affected: - (modified) lldb/source/Target/Thread.cpp (+4-3) ``````````diff diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index 8bc109340c618..53aa551b4c68c 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -1084,14 +1084,15 @@ Vote Thread::ShouldReportRun(Event *event_ptr) { if (GetPlans().AnyCompletedPlans()) { // Pass skip_private = false to GetCompletedPlan, since we want to ask // the last plan, regardless of whether it is private or not. + ThreadPlanSP plan = GetPlans().GetCompletedPlan(/*skip_private=*/false); + LLDB_LOGF(log, "Current Plan for thread %d(%p) (0x%4.4" PRIx64 ", %s): %s being asked whether we should report run.", GetIndexID(), static_cast<void *>(this), GetID(), - StateAsCString(GetTemporaryResumeState()), - GetCompletedPlan()->GetName()); + StateAsCString(GetTemporaryResumeState()), plan->GetName()); - return GetPlans().GetCompletedPlan(false)->ShouldReportRun(event_ptr); + return plan->ShouldReportRun(event_ptr); } else { LLDB_LOGF(log, "Current Plan for thread %d(%p) (0x%4.4" PRIx64 `````````` </details> https://github.com/llvm/llvm-project/pull/188198 _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
