From ad7b7cb1f4a4a21b18740e5972b772a82fb05faf Mon Sep 17 00:00:00 2001 From: Hannes Domani Date: Wed, 7 Feb 2024 19:51:26 +0100 Subject: Fix raw-frame-arguments in combination with frame-filters Currently, if frame-filters are active, raw-values is used instead of raw-frame-arguments to decide if a pretty-printer should be invoked for frame arguments in a backtrace. In this example, "super struct" is the output of the pretty-printer: (gdb) disable frame-filter global BasicFrameFilter (gdb) bt #0 foo (x=42, ss=super struct = {...}) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 If no frame-filter is active, then the raw-values print option does not affect the backtrace output: (gdb) set print raw-values on (gdb) bt #0 foo (x=42, ss=super struct = {...}) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 (gdb) set print raw-values off Instead, the raw-frame-arguments option disables the pretty-printer in the backtrace: (gdb) bt -raw-frame-arguments on #0 foo (x=42, ss=...) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 But if a frame-filter is active, the same rules don't apply. The option raw-frame-arguments is ignored, but raw-values decides if the pretty-printer is used: (gdb) enable frame-filter global BasicFrameFilter (gdb) bt #0 foo (x=42, ss=super struct = {...}) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 (gdb) set print raw-values on (gdb) bt #0 foo (x=42, ss=...) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 (gdb) set print raw-values off (gdb) bt -raw-frame-arguments on #0 foo (x=42, ss=super struct = {...}) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 So this adds the PRINT_RAW_FRAME_ARGUMENTS flag to frame_filter_flag, which is then used in the frame-filter to override the raw flag in enumerate_args. Then the output is the same if a frame-filter is active, the pretty-printer for backtraces is only disabled with the raw-frame-arguments option: (gdb) enable frame-filter global BasicFrameFilter (gdb) bt #0 foo (x=42, ss=super struct = {...}) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 (gdb) set print raw-values on (gdb) bt #0 foo (x=42, ss=super struct = {...}) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 (gdb) set print raw-values off (gdb) bt -raw-frame-arguments on #0 foo (x=42, ss=...) at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:47 #1 0x004016aa in main () at C:/src/repos/gdb-testsuite/gdb/testsuite/gdb.python/py-frame-args.c:57 Co-Authored-By: Andrew Burgess Approved-By: Tom Tromey --- gdb/testsuite/gdb.python/py-frame-args.exp | 36 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.python/py-frame-args.py | 14 ++++++++++++ 2 files changed, 50 insertions(+) (limited to 'gdb/testsuite/gdb.python') diff --git a/gdb/testsuite/gdb.python/py-frame-args.exp b/gdb/testsuite/gdb.python/py-frame-args.exp index 4e060d4..4fc8f0a 100644 --- a/gdb/testsuite/gdb.python/py-frame-args.exp +++ b/gdb/testsuite/gdb.python/py-frame-args.exp @@ -33,6 +33,42 @@ gdb_test_no_output "source ${remote_python_file}" "load python file" gdb_breakpoint [gdb_get_line_number "break-here"] gdb_continue_to_breakpoint "break-here" ".* break-here .*" +# Test raw-frame-arguments on backtrace with and without frame-filter +gdb_test "interpreter-exec mi \"-enable-frame-filters\"" \ + "done" +foreach_with_prefix filtered {enable disable} { + gdb_test_no_output "$filtered frame-filter global BasicFrameFilter" + + gdb_test "bt 1" \ + ".*foo \\(x=42, ss=super struct = {\[.\]{3}}\\).*" \ + "bt pretty" + + gdb_test "bt -raw-frame-arguments on 1" \ + ".*foo \\(x=42, ss=\[.\]{3}\\).*" \ + "bt raw" + + gdb_test "interpreter-exec mi \"-stack-list-arguments 1\"" \ + ".*name=\"ss\",value=\"super struct =.*" \ + "mi bt pretty" + + gdb_test_no_output "set print raw-frame-arguments on" + gdb_test "interpreter-exec mi \"-stack-list-arguments 1\"" \ + ".*name=\"ss\",value=\".a =.*" \ + "mi bt raw" + gdb_test_no_output "set print raw-frame-arguments off" + + # "set print raw-values" should not affect frame arguments + gdb_test_no_output "set print raw-values on" + gdb_test "bt 1" \ + ".*foo \\(x=42, ss=super struct = {\[.\]{3}}\\).*" \ + "bt pretty,raw-values" + + gdb_test "interpreter-exec mi \"-stack-list-arguments 1\"" \ + ".*name=\"ss\",value=\"super struct =.*" \ + "mi bt pretty,raw-values" + gdb_test_no_output "set print raw-values off" +} + # Test all combinations with raw off. gdb_test_no_output "set print raw-frame-arguments off" diff --git a/gdb/testsuite/gdb.python/py-frame-args.py b/gdb/testsuite/gdb.python/py-frame-args.py index ee875cb..abf89ac 100644 --- a/gdb/testsuite/gdb.python/py-frame-args.py +++ b/gdb/testsuite/gdb.python/py-frame-args.py @@ -76,3 +76,17 @@ pretty_printers_dict = {} register_pretty_printers() gdb.pretty_printers.append(lookup_function) + + +class BasicFrameFilter(object): + def __init__(self): + self.name = "BasicFrameFilter" + self.priority = 100 + self.enabled = True + gdb.frame_filters[self.name] = self + + def filter(self, frame_iter): + return frame_iter + + +BasicFrameFilter() -- cgit v1.1