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/Breakpoint/BreakpointLocation.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/Breakpoint/BreakpointLocation.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp index 1ec726d..17568c2 100644 --- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp +++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp @@ -291,9 +291,11 @@ BreakpointLocation::ConditionSaysStop (ExecutionContext &exe_ctx, Error &error) // constructor errors up to the debugger's Async I/O. ValueObjectSP result_value_sp; - const bool unwind_on_error = true; - const bool ignore_breakpoints = true; - const bool try_all_threads = true; + + EvaluateExpressionOptions options; + options.SetUnwindOnError(true); + options.SetIgnoreBreakpoints(true); + options.SetRunOthers(true); Error expr_error; @@ -304,12 +306,9 @@ BreakpointLocation::ConditionSaysStop (ExecutionContext &exe_ctx, Error &error) ExecutionResults result_code = m_user_expression_sp->Execute(execution_errors, exe_ctx, - unwind_on_error, - ignore_breakpoints, + options, m_user_expression_sp, - result_variable_sp, - try_all_threads, - ClangUserExpression::kDefaultTimeout); + result_variable_sp); bool ret; @@ -484,7 +483,7 @@ BreakpointLocation::ResolveBreakpointSite () if (process == NULL) return false; - lldb::break_id_t new_id = process->CreateBreakpointSite (shared_from_this(), false); + lldb::break_id_t new_id = process->CreateBreakpointSite (shared_from_this(), m_owner.IsHardware()); if (new_id == LLDB_INVALID_BREAK_ID) { |
