Skip to content

Commit f8d889a

Browse files
committed
[lldb] Print message after loading 'crashlog' command
Previously, importing `crashlog` resulted in a message being printed. The message was about other commands (those in heap.py), not `crashlog`. The changes in D117237 made it so that the heap.py messages were printed only when importing `lldb.macosx.heap`, not when importing `lldb.macosx.crashlog`. Some users may see no output and think `crashlog` wasn't successfully loaded. This ensures users see that `crashlog` is loaded. rdar://88283132 Differential Revision: https://reviews.llvm.org/D119155
1 parent 7deaeb2 commit f8d889a

File tree

5 files changed

+11
-1
lines changed

5 files changed

+11
-1
lines changed

lldb/examples/python/crashlog.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,3 +1247,5 @@ def __lldb_init_module(debugger, internal_dict):
12471247
'command script add -c lldb.macosx.crashlog.Symbolicate crashlog')
12481248
debugger.HandleCommand(
12491249
'command script add -f lldb.macosx.crashlog.save_crashlog save_crashlog')
1250+
print('"crashlog" and "save_crashlog" commands have been installed, use '
1251+
'the "--help" options on these commands for detailed help.')

lldb/test/Shell/Heap/heap-cstr.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
br set -p return
77
command script import lldb.macosx.heap
88
run
9-
cstr "patatino"
9+
cstr_refs "patatino"
10+
11+
# CHECK: "cstr_refs", {{.*}} commands have been installed, use the "--help" options on these commands
1012

1113
# CHECK: {{.*}}: malloc( 16) -> {{.*}}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.nometadata.crash --offsets '{"main":20, "bar":9, "foo":16}' --json --no-metadata
99
# RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o 'crashlog %t.nometadata.crash' 2>&1 | FileCheck %s
1010

11+
# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help" options on these commands
12+
1113
# CHECK: Thread[0] Crashing Thread Name EXC_BAD_ACCESS (SIGSEGV) (KERN_INVALID_ADDRESS at 0x0000000000000000)
1214
# CHECK: [ 0] {{.*}}out`foo + 16 at test.c
1315
# CHECK: [ 1] {{.*}}out`bar + 8 at test.c

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.crash --offsets '{"main":20, "bar":9, "foo":16}' --json
55
# RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o 'crashlog %t.crash' 2>&1 | FileCheck %s
66

7+
# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help" options on these commands
8+
79
# CHECK: Thread[0] Crashing Thread Name EXC_BAD_ACCESS (SIGSEGV) (KERN_INVALID_ADDRESS at 0x0000000000000000)
810
# CHECK: [ 0] {{.*}}out`foo + 16 at test.c
911
# CHECK: [ 1] {{.*}}out`bar + 8 at test.c

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.crash --offsets '{"main":20, "bar":9, "foo":16}'
44
# RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o 'crashlog %t.crash' 2>&1 | FileCheck %s
55

6+
# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help" options on these commands
7+
68
# CHECK: Thread[0] EXC_BAD_ACCESS (SIGSEGV) (KERN_INVALID_ADDRESS at 0x0000000000000000)
79
# CHECK: [ 0] {{.*}}out`foo + 16 at test.c
810
# CHECK: [ 1] {{.*}}out`bar + 8 at test.c

0 commit comments

Comments
 (0)