summaryrefslogtreecommitdiffstats
path: root/lldb/source/Target/ThreadPlanCallFunction.cpp
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2012-05-11 23:47:32 +0000
committerJim Ingham <jingham@apple.com>2012-05-11 23:47:32 +0000
commit7ba6e991583603e0dbeb632a9086a9f9fbf5445c (patch)
tree600187733c0ecfc1bb7034a2d940c81a57be710e /lldb/source/Target/ThreadPlanCallFunction.cpp
parent87a170c1e60f0b0c109f4c94a96e4ba43ac160cb (diff)
downloadbcm5719-llvm-7ba6e991583603e0dbeb632a9086a9f9fbf5445c.tar.gz
bcm5719-llvm-7ba6e991583603e0dbeb632a9086a9f9fbf5445c.zip
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. llvm-svn: 156667
Diffstat (limited to 'lldb/source/Target/ThreadPlanCallFunction.cpp')
-rw-r--r--lldb/source/Target/ThreadPlanCallFunction.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/source/Target/ThreadPlanCallFunction.cpp b/lldb/source/Target/ThreadPlanCallFunction.cpp
index 8e91e8b35d6..3ab2a56f286 100644
--- a/lldb/source/Target/ThreadPlanCallFunction.cpp
+++ b/lldb/source/Target/ThreadPlanCallFunction.cpp
@@ -416,7 +416,7 @@ ThreadPlanCallFunction::PlanExplainsStop ()
bool
ThreadPlanCallFunction::ShouldStop (Event *event_ptr)
{
- if (PlanExplainsStop())
+ if (IsPlanComplete() || PlanExplainsStop())
{
ReportRegisterState ("Function completed. Register state was:");
OpenPOWER on IntegriCloud