maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Train LLDB to deal with bad linker N_SO entries that point to our source files for debug map + DWARF in .o file debugging. 

llvm-svn: 163417
This commit is contained in:
Greg Clayton 2012-09-07 20:29:13 +00:00
parent 1f57bcb1a0
commit 0662d966dc
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
View File

@ -1822,6 +1822,24 @@ ObjectFileMachO::ParseSymtab (bool minimize)
if (so_path && so_path[0])
{
std::string full_so_path (so_path);
const size_t double_slash_pos = full_so_path.find("//");
if (double_slash_pos != std::string::npos)
{
// The linker has been generating bad N_SO entries with doubled up paths
// in the format "%s%s" where the first stirng in the DW_AT_comp_dir,
// and the second is the directory for the source file so you end up with
// a path that looks like "/tmp/src//tmp/src/"
FileSpec so_dir(so_path, false);
if (!so_dir.Exists())
{
so_dir.SetFile(&full_so_path[double_slash_pos + 1], false);
if (so_dir.Exists())
{
// Trim off the incorrect path
full_so_path.erase(0, double_slash_pos + 1);
}
}
}
if (*full_so_path.rbegin() != '/')
full_so_path += '/';
full_so_path += symbol_name;
@ -2545,6 +2563,24 @@ ObjectFileMachO::ParseSymtab (bool minimize)
if (so_path && so_path[0])
{
std::string full_so_path (so_path);
const size_t double_slash_pos = full_so_path.find("//");
if (double_slash_pos != std::string::npos)
{
// The linker has been generating bad N_SO entries with doubled up paths
// in the format "%s%s" where the first stirng in the DW_AT_comp_dir,
// and the second is the directory for the source file so you end up with
// a path that looks like "/tmp/src//tmp/src/"
FileSpec so_dir(so_path, false);
if (!so_dir.Exists())
{
so_dir.SetFile(&full_so_path[double_slash_pos + 1], false);
if (so_dir.Exists())
{
// Trim off the incorrect path
full_so_path.erase(0, double_slash_pos + 1);
}
}
}
if (*full_so_path.rbegin() != '/')
full_so_path += '/';
full_so_path += symbol_name;