Only check for matching arch and UUID when looking for dsym in vincinity of executable.

[flackr]

Summary

ModuleSpecs::FindMatchingModuleSpec looks for matching filenames but when looking for the dSYM we should only be looking for a matching architecture and and UUID. Jason pointed out this mistake in http://reviews.llvm.org/D9174 when this function was incorrectly converted to not be Mac specific.

[flackr]

Make static and use function indentation conventions.

[jasonmolenda]

Thanks Robert, that looks good and works correctly for me.

I'd either write the function decl as

static bool
FileAtPathContainsArchAndUUID (const FileSpec &file_fspec, const ArchSpec *arch, const lldb_private::UUID *uuid)
{

or

static bool
FileAtPathContainsArchAndUUID (

const FileSpec &file_fspec,
const ArchSpec *arch,
const lldb_private::UUID *uuid)

{

The first format is the most common -- the second format is present around the code base. A good example would be source/Target/Process.cpp -- most of the methods follow the first style and there's one or two that follow the second.

I know you were copying the style from other parts of this source file - but they're not to be emulated. :)

Thanks!

source/Host/common/Symbols.cpp

(
     FileSpec *out_dsym_fspec    // If non-NULL try and find the debug symbol file
 ) {
     // Cannot find MacOSX files using debug symbols on non MacOSX.
     return 0;
 }
 
 #endif
 
+bool FileAtPathContainsArchAndUUID (const FileSpec &file_fspec,
+                                    const ArchSpec *arch,
+                                    const lldb_private::UUID *uuid )
+{
+    ModuleSpecList module_specs;
+    if (ObjectFile::GetModuleSpecifications(file_fspec, 0, 0, module_specs))
+    {
+        ModuleSpec spec;
+        for (size_t i = 0; i < module_specs.GetSize(); ++i)
+        {
+            assert(module_specs.GetModuleSpecAtIndex(i, spec));
+            if ((uuid == NULL || (spec.GetUUIDPtr() && spec.GetUUID() == *uuid)) &&
+                (arch == NULL || (spec.GetArchitecturePtr() && spec.GetArchitecture().IsCompatibleMatch(*arch))))
+            {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 static bool
 LocateDSYMInVincinityOfExecutable (const ModuleSpec &module_spec, FileSpec &dsym_fspec)
 {
     const FileSpec *exec_fspec = module_spec.GetFileSpecPtr();
     if (exec_fspec)
     {
         char path[PATH_MAX];
         if (exec_fspec->GetPath(path, sizeof(path)))
         {
             // Make sure the module isn't already just a dSYM file...
             if (strcasestr(path, ".dSYM/Contents/Resources/DWARF") == NULL)
             {
                 size_t obj_file_path_length = strlen(path);
                 ::strncat(path, ".dSYM/Contents/Resources/DWARF/", sizeof(path) - strlen(path) - 1);
                 ::strncat(path, exec_fspec->GetFilename().AsCString(), sizeof(path) - strlen(path) - 1);
 
                 dsym_fspec.SetFile(path, false);
 
                 ModuleSpecList module_specs;
                 ModuleSpec matched_module_spec;
                 if (dsym_fspec.Exists() &&
-                    ObjectFile::GetModuleSpecifications(dsym_fspec, 0, 0, module_specs) &&
-                    module_specs.FindMatchingModuleSpec(module_spec, matched_module_spec))
+                    FileAtPathContainsArchAndUUID(dsym_fspec, module_spec.GetArchitecturePtr(), module_spec.GetUUIDPtr()))
                 {
                     return true;
                 }
                 else
                 {
                     path[obj_file_path_length] = '\0';
 
                     char *last_dot = strrchr(path, '.');
                     while (last_dot != NULL && last_dot[0])
                     {
                         char *next_slash = strchr(last_dot, '/');
                         if (next_slash != NULL)
                         {
                             *next_slash = '\0';
                             ::strncat(path, ".dSYM/Contents/Resources/DWARF/", sizeof(path) - strlen(path) - 1);
                             ::strncat(path, exec_fspec->GetFilename().AsCString(), sizeof(path) - strlen(path) - 1);
                             dsym_fspec.SetFile(path, false);
                             if (dsym_fspec.Exists() &&
-                                ObjectFile::GetModuleSpecifications(dsym_fspec, 0, 0, module_specs) &&
-                                module_specs.FindMatchingModuleSpec(module_spec, matched_module_spec))
+                                FileAtPathContainsArchAndUUID(dsym_fspec, module_spec.GetArchitecturePtr(), module_spec.GetUUIDPtr()))
                             {
                                 return true;
                             }
                             else
                             {
                                 *last_dot = '\0';
                                 char *prev_slash = strrchr(path, '/');
                                 if (prev_slash != NULL)