Skip to content

[lldb] Update crashlog.py to accept multiple results from mdfind #3233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions lldb/examples/python/crashlog.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,18 +293,24 @@ def locate_module_and_debug_symbols(self):
return False
if not self.resolved_path and not os.path.exists(self.path):
try:
dsym = subprocess.check_output(
mdfind_results = subprocess.check_output(
["/usr/bin/mdfind",
"com_apple_xcode_dsym_uuids == %s"%uuid_str]).decode("utf-8")[:-1]
if dsym and os.path.exists(dsym):
print(('falling back to binary inside "%s"'%dsym))
self.symfile = dsym
"com_apple_xcode_dsym_uuids == %s" % uuid_str]).decode("utf-8").splitlines()
found_matching_slice = False
for dsym in mdfind_results:
dwarf_dir = os.path.join(dsym, 'Contents/Resources/DWARF')
if not os.path.exists(dwarf_dir):
# Not a dSYM bundle, probably an Xcode archive.
continue
print('falling back to binary inside "%s"' % dsym)
self.symfile = dsym
for filename in os.listdir(dwarf_dir):
self.path = os.path.join(dwarf_dir, filename)
if not self.find_matching_slice():
return False
break
self.path = os.path.join(dwarf_dir, filename)
if self.find_matching_slice():
found_matching_slice = True
break
if found_matching_slice:
break
except:
pass
if (self.resolved_path and os.path.exists(self.resolved_path)) or (
Expand Down