summaryrefslogtreecommitdiffstats
path: root/lldb/source/Target/StopInfo.cpp
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2019-08-15 21:37:52 +0000
committerJim Ingham <jingham@apple.com>2019-08-15 21:37:52 +0000
commit7049b0ad4d610497939c9b2eaa72deb5f6dc989e (patch)
tree54c79e23887a0effb61178aeb82f64aa8508be3b /lldb/source/Target/StopInfo.cpp
parentfdee340beabd13f9bb5a3203ab4cbeaec48d4d9b (diff)
downloadbcm5719-llvm-7049b0ad4d610497939c9b2eaa72deb5f6dc989e.tar.gz
bcm5719-llvm-7049b0ad4d610497939c9b2eaa72deb5f6dc989e.zip
Stop-hooks weren't getting called on step-out. Fix that.
There was a little bit of logic in the StopInfoBreakpoint::PerformAction that would null out the StopInfo once we had a completed plan so that the next call to GetStopInfo would replace it with the StopInfoThreadPlan. But the stop-hooks check for whether a thread stopped for a reason didn't trigger this conversion. So I added an API to do that directly, and then called it where before we just reset the StopInfo. <rdar://problem/54270767> Differential Revision: https://reviews.llvm.org/D66241 llvm-svn: 369052
Diffstat (limited to 'lldb/source/Target/StopInfo.cpp')
-rw-r--r--lldb/source/Target/StopInfo.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Target/StopInfo.cpp b/lldb/source/Target/StopInfo.cpp
index 4b048a3ef4f..28179b7e1ce 100644
--- a/lldb/source/Target/StopInfo.cpp
+++ b/lldb/source/Target/StopInfo.cpp
@@ -543,10 +543,10 @@ protected:
// additionally to the breakpoint
m_should_stop = true;
- // Here we clean the preset stop info so the next GetStopInfo call will
- // find the appropriate stop info, which should be the stop info
- // related to the completed plan
- thread_sp->ResetStopInfo();
+ // We know we're stopping for a completed plan and we don't want to
+ // show the breakpoint stop, so compute the public stop info immediately
+ // here.
+ thread_sp->CalculatePublicStopInfo();
}
LLDB_LOGF(log,
OpenPOWER on IntegriCloud