diff options
| author | Tom Tromey <tromey@adacore.com> | 2025-09-03 09:26:25 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2025-09-26 09:29:13 -0600 |
| commit | ecac42af735c3fa6abe49ec7cf9ebcd34096b2ac (patch) | |
| tree | 850ee951cb01feaae32bbbb3174e08cafe06eaea /gdb/python | |
| parent | e14efc5bf7c1af686976cae532acf3d6ad31b2a1 (diff) | |
| download | binutils-ecac42af735c3fa6abe49ec7cf9ebcd34096b2ac.zip binutils-ecac42af735c3fa6abe49ec7cf9ebcd34096b2ac.tar.gz binutils-ecac42af735c3fa6abe49ec7cf9ebcd34096b2ac.tar.bz2 | |
Always propagate exceptions in DAP
This changes the DAP exec_and_log function to always transform an
exception into a DAPException and propagate it.
As the bug points out, we haven't always wrapped calls when
appropriate. I think it's better to cause the request to fail by
default; if any spot truly needs to ignore errors, that is readily
done at the point of call.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33346
Diffstat (limited to 'gdb/python')
| -rw-r--r-- | gdb/python/lib/gdb/dap/events.py | 4 | ||||
| -rw-r--r-- | gdb/python/lib/gdb/dap/next.py | 2 | ||||
| -rw-r--r-- | gdb/python/lib/gdb/dap/startup.py | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gdb/python/lib/gdb/dap/events.py b/gdb/python/lib/gdb/dap/events.py index e8f2655..778acc5 100644 --- a/gdb/python/lib/gdb/dap/events.py +++ b/gdb/python/lib/gdb/dap/events.py @@ -161,7 +161,7 @@ _expected_pause = False @in_gdb_thread -def exec_and_expect_stop(cmd, expected_pause=False, propagate_exception=False): +def exec_and_expect_stop(cmd, expected_pause=False): """A wrapper for exec_and_log that sets the continue-suppression flag. When EXPECTED_PAUSE is True, a stop that looks like a pause (e.g., @@ -174,7 +174,7 @@ def exec_and_expect_stop(cmd, expected_pause=False, propagate_exception=False): # continuing. _suppress_cont = not expected_pause # FIXME if the call fails should we clear _suppress_cont? - exec_and_log(cmd, propagate_exception) + exec_and_log(cmd) # Map from gdb stop reasons to DAP stop reasons. Some of these can't diff --git a/gdb/python/lib/gdb/dap/next.py b/gdb/python/lib/gdb/dap/next.py index 898fff1..a0fa18e 100644 --- a/gdb/python/lib/gdb/dap/next.py +++ b/gdb/python/lib/gdb/dap/next.py @@ -76,7 +76,7 @@ def step_in( @request("stepOut") def step_out(*, threadId: int, singleThread: bool = False, **args): _handle_thread_step(threadId, singleThread, True) - exec_and_expect_stop("finish &", propagate_exception=True) + exec_and_expect_stop("finish &") @request("continue") diff --git a/gdb/python/lib/gdb/dap/startup.py b/gdb/python/lib/gdb/dap/startup.py index ab3e8fd..0c95ada 100644 --- a/gdb/python/lib/gdb/dap/startup.py +++ b/gdb/python/lib/gdb/dap/startup.py @@ -204,7 +204,7 @@ def log_stack(level=LogLevel.DEFAULT): @in_gdb_thread -def exec_and_log(cmd, propagate_exception=False): +def exec_and_log(cmd): """Execute the gdb command CMD. If logging is enabled, log the command and its output.""" log("+++ " + cmd) @@ -213,10 +213,10 @@ def exec_and_log(cmd, propagate_exception=False): if output != "": log(">>> " + output) except gdb.error as e: - if propagate_exception: - raise DAPException(str(e)) from e - else: - log_stack() + # Don't normally want to see this, as it interferes with the + # test suite. + log_stack(LogLevel.FULL) + raise DAPException(str(e)) from e @in_gdb_thread |