forked from OSchip/llvm-project
Run clang-format on source/Host/common/Symbols.cpp
I saw a bunch of style errors so this fixes them. llvm-svn: 318886
This commit is contained in:
parent
3fba1bfb77
commit
fd3ffabfc3
|
@ -109,25 +109,25 @@ static bool LocateDSYMInVincinityOfExecutable(const ModuleSpec &module_spec,
|
|||
// 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
|
||||
// Add a ".dSYM" name to each directory component of the path,
|
||||
// stripping off components. e.g. we may have a binary like
|
||||
// /S/L/F/Foundation.framework/Versions/A/Foundation
|
||||
// and
|
||||
// /S/L/F/Foundation.framework.dSYM
|
||||
//
|
||||
// so we'll need to start with /S/L/F/Foundation.framework/Versions/A,
|
||||
// add the .dSYM part to the "A", and if that doesn't exist, strip off
|
||||
// the "A" and try it again with "Versions", etc., until we find a dSYM
|
||||
// bundle or we've stripped off enough path components that there's no
|
||||
// need to continue.
|
||||
// the "A" and try it again with "Versions", etc., until we find a
|
||||
// dSYM bundle or we've stripped off enough path components that
|
||||
// there's no need to continue.
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
// Does this part of the path have a "." character - could it be a bundle's
|
||||
// top level directory?
|
||||
// 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;
|
||||
if (::strchr (fn, '.') != nullptr) {
|
||||
break;
|
||||
if (::strchr(fn, '.') != nullptr) {
|
||||
dsym_fspec = parent_dirs;
|
||||
dsym_fspec.RemoveLastPathComponent();
|
||||
|
||||
|
@ -140,16 +140,17 @@ static bool LocateDSYMInVincinityOfExecutable(const ModuleSpec &module_spec,
|
|||
dsym_fspec.AppendPathComponent("Contents");
|
||||
dsym_fspec.AppendPathComponent("Resources");
|
||||
dsym_fspec.AppendPathComponent("DWARF");
|
||||
dsym_fspec.AppendPathComponent(exec_fspec->GetFilename().AsCString());
|
||||
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;
|
||||
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();
|
||||
|
@ -231,7 +232,8 @@ FileSpec Symbols::LocateExecutableSymbolFile(const ModuleSpec &module_spec) {
|
|||
#ifndef LLVM_ON_WIN32
|
||||
#if defined(__NetBSD__)
|
||||
// Add /usr/libdata/debug directory.
|
||||
debug_file_search_paths.AppendIfUnique(FileSpec("/usr/libdata/debug", true));
|
||||
debug_file_search_paths.AppendIfUnique(
|
||||
FileSpec("/usr/libdata/debug", true));
|
||||
#else
|
||||
// Add /usr/lib/debug directory.
|
||||
debug_file_search_paths.AppendIfUnique(FileSpec("/usr/lib/debug", true));
|
||||
|
@ -289,8 +291,7 @@ FileSpec Symbols::LocateExecutableSymbolFile(const ModuleSpec &module_spec) {
|
|||
// For example, this happens for *.dwp files since
|
||||
// at the moment llvm-dwp doesn't output build ids,
|
||||
// nor does binutils dwp.
|
||||
if (!module_uuid.IsValid() ||
|
||||
module_uuid == mspec.GetUUID())
|
||||
if (!module_uuid.IsValid() || module_uuid == mspec.GetUUID())
|
||||
return file_spec;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue