diff options
| author | Tom Tromey <tromey@adacore.com> | 2025-01-06 07:45:33 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2025-01-13 07:37:19 -0700 |
| commit | 28e585134434ee2c65df5001e4494c1b4adcd204 (patch) | |
| tree | 5816c3d32e9bcd75f0af955980b1a87864d58f9d /gdb/python/lib | |
| parent | d41df13ab36b224a622c0bdf28a96a0dee79db77 (diff) | |
| download | binutils-28e585134434ee2c65df5001e4494c1b4adcd204.zip binutils-28e585134434ee2c65df5001e4494c1b4adcd204.tar.gz binutils-28e585134434ee2c65df5001e4494c1b4adcd204.tar.bz2 | |
Handle case where DAP line can be None
A comment in bugzilla pointed out a bug in my earlier patch to handle
the DAP "linesStartAt1" setting. In particular, in the backtrace
code, "line" can be None, which would lead to an exception from
export_line.
This patch fixes the problem.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32468
Diffstat (limited to 'gdb/python/lib')
| -rw-r--r-- | gdb/python/lib/gdb/dap/bt.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/python/lib/gdb/dap/bt.py b/gdb/python/lib/gdb/dap/bt.py index a27c61a..0fefa69 100644 --- a/gdb/python/lib/gdb/dap/bt.py +++ b/gdb/python/lib/gdb/dap/bt.py @@ -84,9 +84,9 @@ def _backtrace(thread_id, levels, startFrame, stack_format): "column": 0, "instructionPointerReference": hex(pc), } - line = export_line(current_frame.line()) + line = current_frame.line() if line is not None: - newframe["line"] = line + newframe["line"] = export_line(line) if stack_format["line"]: # Unclear whether export_line should be called # here, but since it's just for users we pick the |