Page MenuHomePhabricator

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

Authored by flackr on May 20 2015, 2:17 PM.

Details

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.

Diff Detail

Repository
rL LLVM

Event Timeline

flackr updated this revision to Diff 26182.May 20 2015, 2:17 PM
flackr retitled this revision from to Only check for matching arch and UUID when looking for dsym in vincinity of executable..
flackr updated this object.
flackr edited the test plan for this revision. (Show Details)
flackr added a reviewer: jasonmolenda.
flackr set the repository for this revision to rL LLVM.
flackr added a subscriber: Unknown Object (MLST).
flackr updated this revision to Diff 26184.May 20 2015, 2:30 PM

Make static and use function indentation conventions.

jasonmolenda accepted this revision.May 20 2015, 3:37 PM
jasonmolenda edited edge metadata.

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!

This revision is now accepted and ready to land.May 20 2015, 3:37 PM
This revision was automatically updated to reflect the committed changes.