https://github.com/medismailben updated
https://github.com/llvm/llvm-project/pull/83861
>From 5cc9da6d222ff39f2939cdb725477e94f8fb24f8 Mon Sep 17 00:00:00 2001
From: Med Ismail Bennani <ism...@bennani.ma>
Date: Mon, 4 Mar 2024 15:41:45 -0800
Subject: [PATCH] [lldb/crashlog] Fix breaking changes in textual report format
This patch should address some register parsing issue in the legacy
report format.
rdar://107210149
rdar://119998761
Signed-off-by: Med Ismail Bennani <ism...@bennani.ma>
---
lldb/examples/python/crashlog.py | 11 ++--
.../Crashlog/Inputs/altered_threadState.crash | 50 +++++++++++++++++++
.../Python/Crashlog/altered_threadState.test | 13 +++++
3 files changed, 70 insertions(+), 4 deletions(-)
create mode 100644
lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/altered_threadState.crash
create mode 100644
lldb/test/Shell/ScriptInterpreter/Python/Crashlog/altered_threadState.test
diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py
index 9e4f94264037ae..c992348b24be17 100755
--- a/lldb/examples/python/crashlog.py
+++ b/lldb/examples/python/crashlog.py
@@ -849,10 +849,10 @@ def parse_errors(self, json_data):
class TextCrashLogParser(CrashLogParser):
parent_process_regex = re.compile(r"^Parent Process:\s*(.*)\[(\d+)\]")
- thread_state_regex = re.compile(r"^Thread \d+ crashed with")
+ thread_state_regex = re.compile(r"^Thread (\d+ crashed with|State)")
thread_instrs_regex = re.compile(r"^Thread \d+ instruction stream")
- thread_regex = re.compile(r"^Thread (\d+).*:")
- app_backtrace_regex = re.compile(r"^Application Specific Backtrace
(\d+).*:")
+ thread_regex = re.compile(r"^Thread (\d+).*")
+ app_backtrace_regex = re.compile(r"^Application Specific Backtrace
(\d+).*")
class VersionRegex:
version = r"\(.+\)|(?:arm|x86_)[0-9a-z]+"
@@ -1081,7 +1081,10 @@ def parse_normal(self, line):
if thread_state_match:
self.app_specific_backtrace = False
thread_state_match = self.thread_regex.search(line)
- thread_idx = int(thread_state_match.group(1))
+ if thread_state_match:
+ thread_idx = int(thread_state_match.group(1))
+ else:
+ thread_idx = self.crashlog.crashed_thread_idx
self.parse_mode = self.CrashLogParseMode.THREGS
self.thread = self.crashlog.threads[thread_idx]
return
diff --git
a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/altered_threadState.crash
b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/altered_threadState.crash
new file mode 100644
index 00000000000000..8fcbdd24b3cf38
--- /dev/null
+++
b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/altered_threadState.crash
@@ -0,0 +1,50 @@
+Process: a.out [21606]
+Path: /private/tmp/a.out
+Identifier: a.out
+Version: 0
+Code Type: X86-64 (Native)
+Parent Process: fish [88883]
+User ID: 501
+
+Date/Time: 2020-11-11 14:47:34.600 -0800
+OS Version: macOS 11.0.1
+Report Version: 12
+Bridge OS Version: redacted
+Anonymous UUID: DCEF35CB-68D5-F524-FF13-060901F52EA8
+
+
+Time Awake Since Boot: 400000 seconds
+
+System Integrity Protection: enabled
+
+Crashed Thread: 0 Dispatch queue: com.apple.main-thread
+
+Exception Type: EXC_BAD_ACCESS (SIGSEGV)
+Exception Codes: KERN_INVALID_ADDRESS at 0x0000000000000000
+Exception Note: EXC_CORPSE_NOTIFY
+
+Termination Signal: Segmentation fault: 11
+Termination Reason: Namespace SIGNAL, Code 0xb
+Terminating Process: exc handler [21606]
+
+Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
+0 a.out @foo@ foo + 16 (test.c:3)
+1 a.out @bar@
+2 a.out @main@ main + 20 (test.c:8)
+3 libdyld.dylib 0x1000000 start + 1
+
+Thread State
+ rax: 0x0000000000000000 rbx: 0x0000000000000000 rcx: 0x00007ffee42d81d0
rdx: 0x00007ffee42d8080
+ rdi: 0x0000000000000001 rsi: 0x00007ffee42d8070 rbp: 0x00007ffee42d8020
rsp: 0x00007ffee42d8020
+ r8: 0x0000000000000000 r9: 0x0000000000000000 r10: 0x0000000000000000
r11: 0x0000000000000000
+ r12: 0x0000000000000000 r13: 0x0000000000000000 r14: 0x0000000000000000
r15: 0x0000000000000000
+ rip: 0x000000010b92af70 rfl: 0x0000000000010202 cr2: 0x0000000000000000
+
+Logical CPU: 2
+Error Code: 0x00000006 (no mapping for user data write)
+Trap Number: 14
+
+
+Binary Images:
+ 0x100000000 - 0x200000000 +a.out (0) <@UUID@> @EXEC@
+ 0x0 - 0xffffffffffffffff ??? (*)
<00000000-0000-0000-0000-000000000000> ???
diff --git
a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/altered_threadState.test
b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/altered_threadState.test
new file mode 100644
index 00000000000000..5a946a38b19524
--- /dev/null
+++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/altered_threadState.test
@@ -0,0 +1,13 @@
+# RUN: %clang_host -g %S/Inputs/test.c -o %t.out
+# RUN: cp %S/Inputs/altered_threadState.crash %t.crash
+# RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.crash
--offsets '{"main":20, "bar":9, "foo":16}'
+# RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o
'crashlog %t.crash' 2>&1 | FileCheck %s
+
+# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help"
options on these commands
+
+# CHECK: Thread[0] EXC_BAD_ACCESS (SIGSEGV) (KERN_INVALID_ADDRESS at
0x0000000000000000)
+# CHECK: [ 0] {{.*}}out`foo + 16 at test.c
+# CHECK: [ 1] {{.*}}out`bar + 8 at test.c
+# CHECK: [ 2] {{.*}}out`main + 19 at test.c
+# CHECK: [ 3] 0x{{[0]+}}1000000 start + 1
+# CHECK: rbp = 0x00007ffee42d8020
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
