diff options
author | Pedro Alves <pedro@palves.net> | 2023-01-27 18:07:56 +0000 |
---|---|---|
committer | Pedro Alves <pedro@palves.net> | 2023-02-08 17:28:42 +0000 |
commit | b885aea1bb987435929b4298982ac6fc27f69403 (patch) | |
tree | b2db58e6f0bf93350ea3eb52d1bb6bfc8ca41c44 /gdb/interps.h | |
parent | cdeb7b7de286078a1a0733a5cc9672c566917d61 (diff) | |
download | gdb-b885aea1bb987435929b4298982ac6fc27f69403.zip gdb-b885aea1bb987435929b4298982ac6fc27f69403.tar.gz gdb-b885aea1bb987435929b4298982ac6fc27f69403.tar.bz2 |
Simplify interp::exec / interp_exec - let exceptions propagate
This patch implements a simplication that I suggested here:
https://sourceware.org/pipermail/gdb-patches/2022-March/186320.html
Currently, the interp::exec virtual method interface is such that
subclass implementations must catch exceptions and then return them
via normal function return.
However, higher up the in chain, for the CLI we get to
interpreter_exec_cmd, which does:
for (i = 1; i < nrules; i++)
{
struct gdb_exception e = interp_exec (interp_to_use, prules[i]);
if (e.reason < 0)
{
interp_set (old_interp, 0);
error (_("error in command: \"%s\"."), prules[i]);
}
}
and for MI we get to mi_cmd_interpreter_exec, which has:
void
mi_cmd_interpreter_exec (const char *command, char **argv, int argc)
{
...
for (i = 1; i < argc; i++)
{
struct gdb_exception e = interp_exec (interp_to_use, argv[i]);
if (e.reason < 0)
error ("%s", e.what ());
}
}
Note that if those errors are reached, we lose the original
exception's error code. I can't see why we'd want that.
And, I can't see why we need to have interp_exec catch the exception
and return it via the normal return path. That's normally needed when
we need to handle propagating exceptions across C code, like across
readline or ncurses, but that's not the case here.
It seems to me that we can simplify things by removing some
try/catch-ing and just letting exceptions propagate normally.
Note, the "error in command" error shown above, which only exists in
the CLI interpreter-exec command, is only ever printed AFAICS if you
run "interpreter-exec console" when the top level interpreter is
already the console/tui. Like:
(gdb) interpreter-exec console "foobar"
Undefined command: "foobar". Try "help".
error in command: "foobar".
You won't see it with MI's "-interpreter-exec console" from a top
level MI interpreter:
(gdb)
-interpreter-exec console "foobar"
&"Undefined command: \"foobar\". Try \"help\".\n"
^error,msg="Undefined command: \"foobar\". Try \"help\"."
(gdb)
nor with MI's "-interpreter-exec mi" from a top level MI interpreter:
(gdb)
-interpreter-exec mi "-foobar"
^error,msg="Undefined MI command: foobar",code="undefined-command"
^done
(gdb)
in both these cases because MI's -interpreter-exec just does:
error ("%s", e.what ());
You won't see it either when running an MI command with the CLI's
"interpreter-exec mi":
(gdb) interpreter-exec mi "-foobar"
^error,msg="Undefined MI command: foobar",code="undefined-command"
(gdb)
This last case is because MI's interp::exec implementation never
returns an error:
gdb_exception
mi_interp::exec (const char *command)
{
mi_execute_command_wrapper (command);
return gdb_exception ();
}
Thus I think that "error in command" error is pretty pointless, and
since it simplifies things to not have it, the patch just removes it.
The patch also ends up addressing an old FIXME.
Change-Id: I5a6432a80496934ac7127594c53bf5221622e393
Approved-By: Tom Tromey <tromey@adacore.com>
Approved-By: Kevin Buettner <kevinb@redhat.com>
Diffstat (limited to 'gdb/interps.h')
-rw-r--r-- | gdb/interps.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdb/interps.h b/gdb/interps.h index 2caa7bf..01bec47 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -36,8 +36,7 @@ typedef struct interp *(*interp_factory_func) (const char *name); extern void interp_factory_register (const char *name, interp_factory_func func); -extern struct gdb_exception interp_exec (struct interp *interp, - const char *command); +extern void interp_exec (struct interp *interp, const char *command); class interp { @@ -51,7 +50,7 @@ public: virtual void resume () = 0; virtual void suspend () = 0; - virtual gdb_exception exec (const char *command) = 0; + virtual void exec (const char *command) = 0; /* Returns the ui_out currently used to collect results for this interpreter. It can be a formatter for stdout, as is the case |