Found one more place where the OkayToDiscard needs to be consulted.
Also changed the defaults for SBThread::Step* to not delete extant plans.
Also added some test cases to test more complex stepping scenarios.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@156667 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/Thread.cpp b/source/Target/Thread.cpp
index 822015a..1792aac 100644
--- a/source/Target/Thread.cpp
+++ b/source/Target/Thread.cpp
@@ -375,8 +375,8 @@
if (plan_ptr->MischiefManaged())
{
- // We're going to pop the plans up to AND INCLUDING the plan that explains the stop.
- plan_ptr = GetPreviousPlan(plan_ptr);
+ // We're going to pop the plans up to the plan that explains the stop.
+ ThreadPlan *prev_plan_ptr = GetPreviousPlan (plan_ptr);
do
{
@@ -384,8 +384,13 @@
current_plan->WillStop();
PopPlan();
}
- while ((current_plan = GetCurrentPlan()) != plan_ptr);
- done_processing_current_plan = false;
+ while ((current_plan = GetCurrentPlan()) != prev_plan_ptr);
+ // Now, if the responsible plan was not "Okay to discard" then we're done,
+ // otherwise we forward this to the next plan in the stack below.
+ if (plan_ptr->IsMasterPlan() && !plan_ptr->OkayToDiscard())
+ done_processing_current_plan = true;
+ else
+ done_processing_current_plan = false;
}
else
done_processing_current_plan = true;