Author: Med Ismail Bennani Date: 2022-11-03T14:44:52-07:00 New Revision: 42df155ae628b4ae756a858bd09b105ee10b86eb
URL: https://github.com/llvm/llvm-project/commit/42df155ae628b4ae756a858bd09b105ee10b86eb DIFF: https://github.com/llvm/llvm-project/commit/42df155ae628b4ae756a858bd09b105ee10b86eb.diff LOG: [lldb/crashlog] Fix the image_regex_uuid to skip null UUID images This patch updates the image_regex_uuid matcher to match null-UUID images in the plain text crashlog parser. It updates the regex to match one or more '?' characters or the image full path. rdar://100904019 Differential Revision: https://reviews.llvm.org/D135482 Signed-off-by: Med Ismail Bennani <medismail.benn...@gmail.com> Added: Modified: lldb/examples/python/crashlog.py lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash Removed: ################################################################################ diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py index 77d54ce303868..8aaf7c165684a 100755 --- a/lldb/examples/python/crashlog.py +++ b/lldb/examples/python/crashlog.py @@ -623,7 +623,7 @@ class TextCrashLogParser(CrashLogParser): r'[+]?(.+?)\s+' # img_name r'(?:(' +version+ r')\s+)?' # img_version r'(?:<([-0-9a-fA-F]+)>\s+)?' # img_uuid - r'(/.*)' # img_path + r'(\?+|/.*)' # img_path ) exception_type_regex = re.compile(r'^Exception Type:\s+(EXC_[A-Z_]+)(?:\s+\((.*)\))?') exception_codes_regex = re.compile(r'^Exception Codes:\s+(0x[0-9a-fA-F]+),\s*(0x[0-9a-fA-F]+)') diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash index c02150c7f15a9..16a95586a13b4 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash @@ -47,3 +47,4 @@ Trap Number: 14 Binary Images: 0x100000000 - 0x200000000 +a.out (0) <@UUID@> @EXEC@ + 0x0 - 0xffffffffffffffff ??? (*) <00000000-0000-0000-0000-000000000000> ??? _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
