replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an issue where breakpoint were being displayed when using the "source list" 

command when the file was implicit or found from a symbol.

llvm-svn: 129867
This commit is contained in:
Greg Clayton 2011-04-20 18:52:45 +00:00
parent 28d1282a0f
commit 3300d778ab
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/include/lldb/Core/SourceManager.h
View File

@ -47,6 +47,12 @@ public:
bool
FileSpecMatches (const FileSpec &file_spec);
const FileSpec &
GetFileSpec ()
{
return m_file_spec;
}
protected:
bool
@ -73,6 +79,12 @@ public:
FileSP
GetFile (const FileSpec &file_spec);
FileSP
GetLastFile ()
{
return m_last_file_sp;
}
size_t
DisplaySourceLines (const FileSpec &file,
uint32_t line,

28
lldb/source/Commands/CommandObjectSource.cpp
View File

@ -417,13 +417,25 @@ public:
char path_buf[PATH_MAX];
start_file.GetPath(path_buf, sizeof(path_buf));
if (m_options.show_bp_locs && exe_ctx.target)
{
const bool show_inlines = true;
m_breakpoint_locations.Reset (start_file, 0, show_inlines);
SearchFilter target_search_filter (exe_ctx.target->GetSP());
target_search_filter.Search (m_breakpoint_locations);
}
else
m_breakpoint_locations.Clear();
result.AppendMessageWithFormat("File: %s.\n", path_buf);
m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (start_file,
line_no,
0,
m_options.num_lines,
"",
&result.GetOutputStream());
&result.GetOutputStream(),
GetBreakpointLocations ());
result.SetStatus (eReturnStatusSuccessFinishResult);
return true;
@ -445,6 +457,20 @@ public:
}
else
{
if (m_options.show_bp_locs && exe_ctx.target)
{
SourceManager::FileSP last_file_sp (m_interpreter.GetDebugger().GetSourceManager().GetLastFile ());
if (last_file_sp)
{
const bool show_inlines = true;
m_breakpoint_locations.Reset (last_file_sp->GetFileSpec(), 0, show_inlines);
SearchFilter target_search_filter (exe_ctx.target->GetSP());
target_search_filter.Search (m_breakpoint_locations);
}
}
else
m_breakpoint_locations.Clear();
if (m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbersUsingLastFile(
m_options.start_line, // Line to display
0, // Lines before line to display