bulbazord updated this revision to Diff 517725.
bulbazord added a comment.
Address @mib's comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149096/new/
https://reviews.llvm.org/D149096
Files:
lldb/source/Symbol/LocateSymbolFile.cpp
Index: lldb/source/Symbol/LocateSymbolFile.cpp
===================================================================
--- lldb/source/Symbol/LocateSymbolFile.cpp
+++ lldb/source/Symbol/LocateSymbolFile.cpp
@@ -80,58 +80,50 @@
// expanded/uncompressed dSYM and return that filepath in dsym_fspec.
static bool LookForDsymNextToExecutablePath(const ModuleSpec &mod_spec,
- const FileSpec &exec_fspec,
+ llvm::StringRef executable_path,
+ llvm::sys::path::Style path_style,
FileSpec &dsym_fspec) {
- ConstString filename = exec_fspec.GetFilename();
- FileSpec dsym_directory = exec_fspec;
- dsym_directory.RemoveLastPathComponent();
-
- std::string dsym_filename = filename.AsCString();
- dsym_filename += ".dSYM";
- dsym_directory.AppendPathComponent(dsym_filename);
- dsym_directory.AppendPathComponent("Contents");
- dsym_directory.AppendPathComponent("Resources");
- dsym_directory.AppendPathComponent("DWARF");
-
- if (FileSystem::Instance().Exists(dsym_directory)) {
-
- // See if the binary name exists in the dSYM DWARF
- // subdir.
- dsym_fspec = dsym_directory;
- dsym_fspec.AppendPathComponent(filename.AsCString());
- if (FileSystem::Instance().Exists(dsym_fspec) &&
- FileAtPathContainsArchAndUUID(dsym_fspec, mod_spec.GetArchitecturePtr(),
+ llvm::StringRef filename = llvm::sys::path::filename(executable_path, path_style);
+ llvm::SmallString<64> dsym_file = executable_path;
+
+ dsym_file.append(".dSYM");
+ llvm::sys::path::append(dsym_file, path_style, "Contents", "Resources",
+ "DWARF", filename);
+
+ // First, see if the binary name exists in the dSYM DWARF subdir
+ if (FileSystem::Instance().Exists(dsym_file)) {
+ dsym_fspec.SetFile(dsym_file, path_style);
+ if (FileAtPathContainsArchAndUUID(dsym_fspec, mod_spec.GetArchitecturePtr(),
mod_spec.GetUUIDPtr())) {
return true;
}
+ }
- // See if we have "../CF.framework" - so we'll look for
- // CF.framework.dSYM/Contents/Resources/DWARF/CF
- // We need to drop the last suffix after '.' to match
- // 'CF' in the DWARF subdir.
- std::string binary_name(filename.AsCString());
- auto last_dot = binary_name.find_last_of('.');
- if (last_dot != std::string::npos) {
- binary_name.erase(last_dot);
- dsym_fspec = dsym_directory;
- dsym_fspec.AppendPathComponent(binary_name);
- if (FileSystem::Instance().Exists(dsym_fspec) &&
- FileAtPathContainsArchAndUUID(dsym_fspec,
- mod_spec.GetArchitecturePtr(),
- mod_spec.GetUUIDPtr())) {
- return true;
+ // If the "executable path" is actually a framework bundle, e.g.
+ // /CF.framework, the dSYM's DWARF file may not have the `.framework`
+ // suffix (e.g. /CF.framework.dSYM/Contents/Resources/DWARF/CF).
+ // Given that `dsym_file` already will look like
+ // `/CF.framework.dSYM/Contents/Resources/DWARF/CF.framework` we an
+ // just drop the last `.framework` and check again.
+ if (filename.endswith(".framework")) {
+ const auto last_dot = dsym_file.find_last_of('.');
+ if (last_dot != llvm::StringRef::npos) {
+ dsym_file.truncate(last_dot - 1); // last_dot - 1 to include the dot
+ if (FileSystem::Instance().Exists(dsym_file)) {
+ dsym_fspec.SetFile(dsym_file, path_style);
+ if (FileAtPathContainsArchAndUUID(dsym_fspec,
+ mod_spec.GetArchitecturePtr(),
+ mod_spec.GetUUIDPtr())) {
+ return true;
+ }
}
}
}
// See if we have a .dSYM.yaa next to this executable path.
- FileSpec dsym_yaa_fspec = exec_fspec;
- dsym_yaa_fspec.RemoveLastPathComponent();
- std::string dsym_yaa_filename = filename.AsCString();
- dsym_yaa_filename += ".dSYM.yaa";
- dsym_yaa_fspec.AppendPathComponent(dsym_yaa_filename);
-
- if (FileSystem::Instance().Exists(dsym_yaa_fspec)) {
+ dsym_file = executable_path;
+ dsym_file.append(".dSYM.yaa");
+ if (FileSystem::Instance().Exists(dsym_file)) {
ModuleSpec mutable_mod_spec = mod_spec;
Status error;
if (Symbols::DownloadObjectAndSymbolFile(mutable_mod_spec, error, true) &&
@@ -160,52 +152,45 @@
FileSpec &dsym_fspec) {
Log *log = GetLog(LLDBLog::Host);
const FileSpec &exec_fspec = module_spec.GetFileSpec();
- if (exec_fspec) {
- if (::LookForDsymNextToExecutablePath(module_spec, exec_fspec,
- dsym_fspec)) {
- if (log) {
- LLDB_LOGF(log, "dSYM with matching UUID & arch found at %s",
- dsym_fspec.GetPath().c_str());
- }
+ if (!exec_fspec)
+ return false;
+
+ const llvm::sys::path::Style path_style = exec_fspec.GetPathStyle();
+ llvm::SmallString<64> executable_path;
+ exec_fspec.GetPath(executable_path, /* denormalize = */ false);
+ if (LookForDsymNextToExecutablePath(module_spec, executable_path.str(),
+ path_style, dsym_fspec)) {
+ LLDB_LOGF(log, "dSYM with matching UUID & arch found at %s",
+ dsym_fspec.GetPath().c_str());
+ return true;
+ }
+
+ // We may be in a framework bundle, in which case we want to look a few
+ // directories up for the dSYM, e.g. we may have a binary like
+ // /S/L/F/Foundation.framework/Versions/A/Foundation and the dSYM may be
+ // /S/L/F/Foundation.framework.dSYM/
+ llvm::StringRef parent_path = executable_path.str();
+ constexpr uint8_t num_parent_paths_to_check = 4;
+ for (uint8_t i = 0; i < num_parent_paths_to_check; i++) {
+ if (!llvm::sys::path::has_parent_path(parent_path, path_style))
+ break;
+ parent_path = llvm::sys::path::parent_path(parent_path, path_style);
+ llvm::StringRef filename =
+ llvm::sys::path::filename(parent_path, path_style);
+ // If we're in a framework bundle and the filename doesn't have a '.' in it,
+ // we need to continue going up until we find it. We don't want to stop at
+ // `/S/L/F/Foundation.framework/Versions`, the dSYM is probably not there.
+ if (filename.find('.') == llvm::StringRef::npos)
+ continue;
+
+ if (LookForDsymNextToExecutablePath(module_spec, parent_path, path_style,
+ dsym_fspec)) {
+ LLDB_LOGF(log, "dSYM with matching UUID & arch found at %s",
+ dsym_fspec.GetPath().c_str());
return true;
- } else {
- 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
- // /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.
-
- 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?
- const char *fn = parent_dirs.GetFilename().AsCString();
- if (fn == nullptr)
- break;
- if (::strchr(fn, '.') != nullptr) {
- if (::LookForDsymNextToExecutablePath(module_spec, parent_dirs,
- dsym_fspec)) {
- if (log) {
- LLDB_LOGF(log, "dSYM with matching UUID & arch found at %s",
- dsym_fspec.GetPath().c_str());
- }
- return true;
- }
- }
- parent_dirs.RemoveLastPathComponent();
- }
}
}
+
dsym_fspec.Clear();
return false;
}
@@ -262,7 +247,7 @@
FileSpec
Symbols::LocateExecutableSymbolFile(const ModuleSpec &module_spec,
const FileSpecList &default_search_paths) {
- FileSpec symbol_file_spec = module_spec.GetSymbolFileSpec();
+ const FileSpec &symbol_file_spec = module_spec.GetSymbolFileSpec();
if (symbol_file_spec.IsAbsolute() &&
FileSystem::Instance().Exists(symbol_file_spec))
return symbol_file_spec;
@@ -273,16 +258,15 @@
FileSpecList debug_file_search_paths = default_search_paths;
- // Add module directory.
FileSpec module_file_spec = module_spec.GetFileSpec();
// We keep the unresolved pathname if it fails.
FileSystem::Instance().ResolveSymbolicLink(module_file_spec,
module_file_spec);
ConstString file_dir = module_file_spec.GetDirectory();
+ // Add module directory.
{
FileSpec file_spec(file_dir.AsCString("."));
- FileSystem::Instance().Resolve(file_spec);
debug_file_search_paths.AppendIfUnique(file_spec);
}
@@ -291,7 +275,6 @@
// Add current working directory.
{
FileSpec file_spec(".");
- FileSystem::Instance().Resolve(file_spec);
debug_file_search_paths.AppendIfUnique(file_spec);
}
@@ -300,14 +283,12 @@
// Add /usr/libdata/debug directory.
{
FileSpec file_spec("/usr/libdata/debug");
- FileSystem::Instance().Resolve(file_spec);
debug_file_search_paths.AppendIfUnique(file_spec);
}
#else
// Add /usr/lib/debug directory.
{
FileSpec file_spec("/usr/lib/debug");
- FileSystem::Instance().Resolve(file_spec);
debug_file_search_paths.AppendIfUnique(file_spec);
}
#endif
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
