Merge commit '353ca7d215c7' from swift/release/5.7 into stable/20211026

git apple-llvm automerger · git apple-llvm automerger · commit 1d75a24ee862 · 2022-07-06T13:19:00.000-07:00
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
@@ -1354,6 +1354,7 @@ ThreadPlanSP Process::DoesStackExplainStopNoLock(ThreadPlanStack &stack,
   ThreadPlanSP plan_sp = stack.GetCurrentPlan();
   plan_sp->SetTID(thread.GetID());
   if (plan_sp->DoPlanExplainsStop(event_ptr)) {
+    stack.SetTID(thread.GetID());
     m_thread_plans.Activate(stack);
     return plan_sp;
   }

Original file line number	Diff line number	Diff line change
`@@ -1354,6 +1354,7 @@ ThreadPlanSP Process::DoesStackExplainStopNoLock(ThreadPlanStack &stack,`
`1354`	`1354`	`ThreadPlanSP plan_sp = stack.GetCurrentPlan();`
`1355`	`1355`	`plan_sp->SetTID(thread.GetID());`
`1356`	`1356`	`if (plan_sp->DoPlanExplainsStop(event_ptr)) {`
	`1357`	`+ stack.SetTID(thread.GetID());`
`1357`	`1358`	`m_thread_plans.Activate(stack);`
`1358`	`1359`	`return plan_sp;`
`1359`	`1360`	`}`