Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Recover from a bad merge #8

Merged
merged 1 commit into from
Oct 21, 2019
Merged

Recover from a bad merge #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions lldb/source/Core/SourceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ static lldb_private::LineEntry FindEntryPoint(Module *exe_module) {
const std::vector<std::pair<ConstString, bool>> &entry_points(
GetEntryPointNames());
for (std::pair<ConstString, bool> entry_point : entry_points) {
#if 0 // llvm.org version
const ConstString entry_point_name = entry_point.first;
const bool skip_prologue = entry_point.second;
SymbolContextList sc_list;
Expand All @@ -352,6 +353,15 @@ static lldb_private::LineEntry FindEntryPoint(Module *exe_module) {
}
}
}
#else // FIXME: upstream this!
lldb_private::LineEntry line_entry(FindEntryPoint(executable_ptr));
if (line_entry.IsValid()) {
SetDefaultFileAndLine(line_entry.file, line_entry.line);
file_spec = m_last_file_sp->GetFileSpec();
line = m_last_line;
return true;
}
#endif
}
return LineEntry();
}
Expand Down