[lldb/crashlog] Update frame regex matcher

[mib]

Summary

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

Signed-off-by: Med Ismail Bennani <[e-mail]>

[kastiglione]

lldb/examples/python/crashlog.py

606

Can it be simplified to using {7,}, for "7 or more"?

Ex: r'(0x[0-9a-fA-F]{7,}

[JDevlieghere]

lldb/examples/python/crashlog.py

606

I like this idea (and learned something new)

[mib]

lldb/examples/python/crashlog.py

606

+1, thanks @kastiglione !

[mib]

Implement @kastiglione's suggestion

[JDevlieghere]

Can we test this by modifying an address in the existing test case?

[mib]

In D131032#3698108, @JDevlieghere wrote:

Can we test this by modifying an address in the existing test case?

Sure but we won't be able to symbolicate that frame anymore ... do we really want to do that ?

[JDevlieghere]

In D131032#3698163, @mib wrote:

In D131032#3698108, @JDevlieghere wrote:

Can we test this by modifying an address in the existing test case?

Sure but we won't be able to symbolicate that frame anymore ... do we really want to do that ?

I think that's a fair trade-off to get regression coverage.

[mib]

Add test

[JDevlieghere]

LGTM

lldb/examples/python/crashlog.py

 
 class TextCrashLogParser:
     parent_process_regex = re.compile('^Parent Process:\s*(.*)\[(\d+)\]')
     thread_state_regex = re.compile('^Thread ([0-9]+) crashed with')
     thread_instrs_regex = re.compile('^Thread ([0-9]+) instruction stream')
     thread_regex = re.compile('^Thread ([0-9]+)([^:]*):(.*)')
     app_backtrace_regex = re.compile('^Application Specific Backtrace ([0-9]+)([^:]*):(.*)')
     version = r'(\(.+\)|(arm|x86_)[0-9a-z]+)\s+'
-    frame_regex = re.compile(r'^([0-9]+)' r'\s'                # id
-                             r'+(.+?)'    r'\s+'               # img_name
-                             r'(' +version+ r')?'              # img_version
-                             r'(0x[0-9a-fA-F]{7}[0-9a-fA-F]+)' # addr
-                             r' +(.*)'                         # offs
+    frame_regex = re.compile(r'^([0-9]+)' r'\s+'                # id
+                             r'(.+?)' r'\s+'                    # img_name
+                             r'(' +version+ r')?'               # img_version
+                             r'(0x[0-9a-fA-F]{7,})'             # addr (7 chars or more)
+                             r' +(.*)'                          # offs
                             )
     null_frame_regex = re.compile(r'^([0-9]+)\s+\?\?\?\s+(0{7}0+) +(.*)')
     image_regex_uuid = re.compile(r'(0x[0-9a-fA-F]+)'            # img_lo
                                   r'\s+' '-' r'\s+'              #   -
                                   r'(0x[0-9a-fA-F]+)'     r'\s+' # img_hi
                                   r'[+]?(.+?)'            r'\s+' # img_name
                                   r'(' +version+ ')?'            # img_version
                                   r'(<([-0-9a-fA-F]+)>\s+)?'     # img_uuid

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash

 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@ 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
   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@

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test

 # RUN: %clang_host -g %S/Inputs/test.c -o %t.out
 # RUN: cp %S/Inputs/a.out.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