diff options
| author | emaste <emaste@FreeBSD.org> | 2014-11-25 21:00:58 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-11-25 21:00:58 +0000 |
| commit | 01ee1789d6aa7294e5966a97f8d29387f6f81699 (patch) | |
| tree | c94307da318be46e5aeea1a325c1e91749506e4f /source/Target/StackFrame.cpp | |
| parent | 788502c6f6261e2d84ef85d1052b41a6c5be31b3 (diff) | |
| download | FreeBSD-src-01ee1789d6aa7294e5966a97f8d29387f6f81699.zip FreeBSD-src-01ee1789d6aa7294e5966a97f8d29387f6f81699.tar.gz | |
Import LLDB as of upstream SVN r216948 (git 50f7fe44)
This corresponds with the branchpoint for the 3.5 release.
A number of files not required for the FreeBSD build have been removed.
Sponsored by: DARPA, AFRL
Diffstat (limited to 'source/Target/StackFrame.cpp')
| -rw-r--r-- | source/Target/StackFrame.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source/Target/StackFrame.cpp b/source/Target/StackFrame.cpp index a936a57..e497b17 100644 --- a/source/Target/StackFrame.cpp +++ b/source/Target/StackFrame.cpp @@ -360,7 +360,7 @@ StackFrame::GetSymbolContext (uint32_t resolve_scope) } - // Resolve our PC to section offset if we haven't alreday done so + // Resolve our PC to section offset if we haven't already done so // and if we don't have a module. The resolved address section will // contain the module to which it belongs if (!m_sc.module_sp && m_flags.IsClear(RESOLVED_FRAME_CODE_ADDR)) @@ -861,7 +861,7 @@ StackFrame::GetValueForVariableExpressionPath (const char *var_expr_cstr, valobj_sp->GetTypeName().AsCString("<invalid type>"), var_expr_path_strm.GetString().c_str()); } - else if (child_index >= synthetic->GetNumChildren() /* synthetic does not have that many values */) + else if (static_cast<uint32_t>(child_index) >= synthetic->GetNumChildren() /* synthetic does not have that many values */) { valobj_sp->GetExpressionPath (var_expr_path_strm, false); error.SetErrorStringWithFormat ("array index %ld is not valid for \"(%s) %s\"", @@ -937,7 +937,7 @@ StackFrame::GetValueForVariableExpressionPath (const char *var_expr_cstr, valobj_sp->GetTypeName().AsCString("<invalid type>"), var_expr_path_strm.GetString().c_str()); } - else if (child_index >= synthetic->GetNumChildren() /* synthetic does not have that many values */) + else if (static_cast<uint32_t>(child_index) >= synthetic->GetNumChildren() /* synthetic does not have that many values */) { valobj_sp->GetExpressionPath (var_expr_path_strm, false); error.SetErrorStringWithFormat ("array index %ld is not valid for \"(%s) %s\"", @@ -1444,13 +1444,12 @@ StackFrame::GetStatus (Stream& strm, const uint32_t source_lines_after = debugger.GetStopSourceLineCount(false); disasm_display = debugger.GetStopDisassemblyDisplay (); - if (source_lines_before > 0 || source_lines_after > 0) + GetSymbolContext(eSymbolContextCompUnit | eSymbolContextLineEntry); + if (m_sc.comp_unit && m_sc.line_entry.IsValid()) { - GetSymbolContext(eSymbolContextCompUnit | eSymbolContextLineEntry); - - if (m_sc.comp_unit && m_sc.line_entry.IsValid()) + have_source = true; + if (source_lines_before > 0 || source_lines_after > 0) { - have_source = true; target->GetSourceManager().DisplaySourceLinesWithLineNumbers (m_sc.line_entry.file, m_sc.line_entry.line, source_lines_before, |
