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

Change the code I added to LocateDSYMInVincinityOfExecutable to use 

the FileSpec methods for adding/removing file path components instead
of using std::strings; feedback from Sean on the change I added in
r305441.
<rdar://problem/31825940> 

llvm-svn: 305547
This commit is contained in:
Jason Molenda 2017-06-16 04:19:36 +00:00
parent c420d14b29
commit bbd1bf9951
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lldb/source/Host/common/Symbols.cpp
View File

@ -104,9 +104,10 @@ static bool LocateDSYMInVincinityOfExecutable(const ModuleSpec &module_spec,
}
return true;
} else {
// Get a clean copy of the executable path, without the final filename
FileSpec path_dir_fspec (exec_fspec->GetDirectory().AsCString(), true);
std::string path_dir_str = path_dir_fspec.GetPath();
FileSpec parent_dirs = exec_fspec;
// Remove the binary name from the FileSpec
parent_dirs.RemoveLastPathComponent();
// Add a ".dSYM" name to each directory component of the path, stripping
// off components. e.g. we may have a binary like
@ -121,24 +122,37 @@ static bool LocateDSYMInVincinityOfExecutable(const ModuleSpec &module_spec,
// need to continue.
for (int i = 0; i < 4; i++) {
std::string path_dir_plus_dsym (path_dir_str);
path_dir_plus_dsym += ".dSYM/Contents/Resources/DWARF/";
path_dir_plus_dsym += exec_fspec->GetFilename().AsCString();
dsym_fspec.SetFile (path_dir_plus_dsym, true);
if (dsym_fspec.Exists() &&
FileAtPathContainsArchAndUUID(
dsym_fspec, module_spec.GetArchitecturePtr(),
module_spec.GetUUIDPtr())) {
if (log) {
log->Printf("dSYM with matching UUID & arch found at %s",
path_dir_plus_dsym.c_str());
}
return true;
}
auto const last_slash = path_dir_str.rfind('/');
if (last_slash == std::string::npos)
// Does this part of the path have a "." character - could it be a bundle's
// top level directory?
const char *fn = parent_dirs.GetFilename().AsCString();
if (fn == nullptr)
break;
path_dir_str.resize(last_slash);
if (::strchr (fn, '.') != nullptr) {
dsym_fspec = parent_dirs;
dsym_fspec.RemoveLastPathComponent();
// If the current directory name is "Foundation.framework", see if
// "Foundation.framework.dSYM/Contents/Resources/DWARF/Foundation"
// exists & has the right uuid.
std::string dsym_fn = fn;
dsym_fn += ".dSYM";
dsym_fspec.AppendPathComponent(dsym_fn.c_str());
dsym_fspec.AppendPathComponent("Contents");
dsym_fspec.AppendPathComponent("Resources");
dsym_fspec.AppendPathComponent("DWARF");
dsym_fspec.AppendPathComponent(exec_fspec->GetFilename().AsCString());
if (dsym_fspec.Exists() &&
FileAtPathContainsArchAndUUID(
dsym_fspec, module_spec.GetArchitecturePtr(),
module_spec.GetUUIDPtr())) {
if (log) {
log->Printf("dSYM with matching UUID & arch found at %s",
dsym_fspec.GetPath().c_str());
}
return true;
}
}
parent_dirs.RemoveLastPathComponent();
}
}
}