https://github.com/medismailben updated
https://github.com/llvm/llvm-project/pull/91631
>From e2cd9670c20daac3f6a5f75806c7f48ed7b2ccd9 Mon Sep 17 00:00:00 2001
From: Med Ismail Bennani <ism...@bennani.ma>
Date: Thu, 9 May 2024 11:38:03 -0700
Subject: [PATCH] [lldb/crashlog] Fix module binary resolution
This patch fixes a bug in when resolving and loading modules from the
binary image list.
When loading a module, we would first use the UUID from the binary image
list with `dsymForUUID` to fetch the dSYM bundle from our remote build
records and copy the executable locally.
If we failed to find a matching dSYM bundle for that UUID on the build
record, let's say if that module was built locally, we use Spotlight
(`mdfind`) to find the dSYM bundle once again using the UUID.
Prior to this patch, we would set the image path to be the same as the
symbol file. This resulted in trying to load the dSYM as a module in
lldb, which isn't allowed.
This patch address that by looking for a binary matching the image
identifier, next to the dSYM bundle and try to load that instead.
rdar://127433616
Signed-off-by: Med Ismail Bennani <ism...@bennani.ma>
---
lldb/examples/python/crashlog.py | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py
index eb9af6ed3d95..4e79c718c9ea 100755
--- a/lldb/examples/python/crashlog.py
+++ b/lldb/examples/python/crashlog.py
@@ -418,9 +418,20 @@ def locate_module_and_debug_symbols(self):
with print_lock:
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 self.find_matching_slice():
+ # Look for the executable next to the dSYM bundle.
+ parent_dir = os.path.dirname(dsym)
+ executables = []
+ for root, dirs, files in os.walk(os.getcwd()):
+ for file in files:
+ abs_path = os.path.join(root, file)
+ if os.path.isfile(abs_path) and os.access(
+ abs_path, os.X_OK
+ ):
+ executables.append(abs_path)
+ for binary in executables:
+ basename = os.path.basename(binary)
+ if os.path.exists(abs_path) and basename ==
self.identifier:
+ self.path = abs_path
found_matching_slice = True
break
if found_matching_slice:
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
