From 81cbc294571fbcc609666ee4aeb86fbb68a7ec23 Mon Sep 17 00:00:00 2001 From: Med Ismail Bennani Date: Thu, 4 Aug 2022 10:34:41 -0700 Subject: [lldb/crashlog] Update frame regex matcher This patch updates the regular expression matching stackframes in crashlog to allow addresses that are 7 characters long and more (vs. 8 characters previously). It changes the `0x[0-9a-fA-F]{7}[0-9a-fA-F]+` by `0x[0-9a-fA-F]{7,}`. rdar://97684839 Differential Revision: https://reviews.llvm.org/D131032 Signed-off-by: Med Ismail Bennani --- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash | 2 +- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lldb/test/Shell/ScriptInterpreter/Python/Crashlog') 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 27ffd9e..c02150c 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash @@ -31,7 +31,7 @@ Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 a.out @foo@ foo + 16 (test.c:3) 1 a.out @bar@ bar + 9 (test.c:6) 2 a.out @main@ main + 20 (test.c:8) -3 libdyld.dylib 0x0000000100000000 start + 1 +3 libdyld.dylib 0x1000000 start + 1 Thread 0 crashed with X86 Thread State (64-bit): rax: 0x0000000000000000 rbx: 0x0000000000000000 rcx: 0x00007ffee42d81d0 rdx: 0x00007ffee42d8080 diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test index 4e5e3fc..e9d1c5e 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test @@ -9,4 +9,5 @@ # 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 -- cgit v1.1