diff options
author | emaste <emaste@FreeBSD.org> | 2014-03-19 13:11:35 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2014-03-19 13:11:35 +0000 |
commit | 958843c32b7a29741f2e45996b5b3e89f9e108b0 (patch) | |
tree | 95ae4ffabc848a86b94be3ad3cd42471cdb66b06 /contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp | |
parent | 2a9993c246f3a2463ccd6b8786781e5b97a35065 (diff) | |
download | FreeBSD-src-958843c32b7a29741f2e45996b5b3e89f9e108b0.zip FreeBSD-src-958843c32b7a29741f2e45996b5b3e89f9e108b0.tar.gz |
MFC r258054: Update LLDB to upstream r194122 snapshot
Inludes minor changes relative to upstream, for compatibility with
FreeBSD's in-tree LLVM 3.3:
- Reverted LLDB r191806, restoring use of previous API.
- Reverted part of LLDB r189317, restoring previous enum names.
- Work around missing LLVM r192504, using previous registerEHFrames API
(limited functionality).
- Removed PlatformWindows header include and init/terminate calls.
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp')
-rw-r--r-- | contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp index e1b5a05..62e05c7 100644 --- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp +++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp @@ -68,7 +68,7 @@ ThreadPlanStepUntil::ThreadPlanStepUntil { // TODO: add inline functionality m_return_addr = return_frame_sp->GetStackID().GetPC(); - Breakpoint *return_bp = target_sp->CreateBreakpoint (m_return_addr, true).get(); + Breakpoint *return_bp = target_sp->CreateBreakpoint (m_return_addr, true, false).get(); if (return_bp != NULL) { return_bp->SetThreadID(thread_id); @@ -82,7 +82,7 @@ ThreadPlanStepUntil::ThreadPlanStepUntil // Now set breakpoints on all our return addresses: for (size_t i = 0; i < num_addresses; i++) { - Breakpoint *until_bp = target_sp->CreateBreakpoint (address_list[i], true).get(); + Breakpoint *until_bp = target_sp->CreateBreakpoint (address_list[i], true, false).get(); if (until_bp != NULL) { until_bp->SetThreadID(thread_id); |