From: Kevin Buettner <kevinb@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v3 3/7] Catch gdb_exception_error instead of gdb_exception (in many places)
Date: Sat, 26 Feb 2022 17:00:47 -0700 [thread overview]
Message-ID: <20220227000051.3336149-4-kevinb@redhat.com> (raw)
In-Reply-To: <20220227000051.3336149-1-kevinb@redhat.com>
As described in the previous commit for this series, I became
concerned that there might be instances in which a QUIT (due to either
a SIGINT or SIGTERM) might not cause execution to return to the top
level. In some (though very few) instances, it is okay to not
propagate the exception for a Ctrl-C / SIGINT, but I don't think that
it is ever okay to swallow the exception caused by a SIGTERM.
Allowing that to happen would definitely be a deviation from the
current behavior in which GDB exits upon receipt of a SIGTERM.
I looked at all cases where an exception handler catches a
gdb_exception. Handlers which did NOT need modification were those
which satisifed one or more of the following conditions:
1) There is no call path to maybe_quit() in the try block. I used a
static analysis tool to help make this determination. In
instances where the tool didn't provide an answer of "yes, this
call path can result in maybe_quit() being called", I reviewed it
by hand.
2) The catch block contains a throw for conditions that it
doesn't want to handle; these "not handled" conditions
must include the quit exception and the new "forced quit" exception.
3) There was (also) a catch for gdb_exception_quit.
Any try/catch blocks not meeting the above conditions could
potentially swallow a QUIT exception.
My first thought was to add catch blocks for gdb_exception_quit and
then rethrow the exception. But Pedro pointed out that this can be
handled without adding additional code by simply catching
gdb_exception_error instead. That's what this patch series does.
There are some oddball cases which needed to be handled differently,
plus the extension languages, but those are handled in later patches.
---
gdb/ada-lang.c | 2 +-
gdb/breakpoint.c | 8 ++++----
gdb/cli/cli-interp.c | 2 +-
gdb/i386-linux-tdep.c | 2 +-
gdb/inf-loop.c | 2 +-
gdb/infcmd.c | 2 +-
gdb/infrun.c | 2 +-
gdb/jit.c | 2 +-
gdb/mi/mi-cmd-break.c | 2 +-
gdb/mi/mi-interp.c | 2 +-
gdb/objc-lang.c | 2 +-
gdb/parse.c | 2 +-
gdb/printcmd.c | 2 +-
gdb/record-btrace.c | 2 +-
gdb/record-full.c | 2 +-
gdb/solib.c | 2 +-
gdb/sparc64-linux-tdep.c | 2 +-
gdb/symfile-mem.c | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index d2f620cbb04..fa10429038e 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -11789,7 +11789,7 @@ should_stop_exception (const struct bp_location *bl)
stop = value_true (evaluate_expression (ada_loc->excep_cond_expr.get ()));
value_free_to_mark (mark);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_fprintf (gdb_stderr, ex,
_("Error in testing exception condition:\n"));
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index a3cfeea6989..134bdaf8d35 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2668,7 +2668,7 @@ insert_bp_location (struct bp_location *bl,
if (val)
bp_excpt = gdb_exception {RETURN_ERROR, GENERIC_ERROR};
}
- catch (gdb_exception &e)
+ catch (gdb_exception_error &e)
{
bp_excpt = std::move (e);
}
@@ -5067,7 +5067,7 @@ bpstat_check_watchpoint (bpstat *bs)
{
e = watchpoint_check (bs);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error evaluating expression "
@@ -5302,7 +5302,7 @@ bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread)
{
condition_result = breakpoint_cond_eval (cond);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error in testing breakpoint condition:\n");
@@ -13855,7 +13855,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
bpt->enable_state = bp_enabled;
update_watchpoint (w, 1 /* reparse */);
}
- catch (const gdb_exception &e)
+ catch (const gdb_exception_error &e)
{
bpt->enable_state = orig_enable_state;
exception_fprintf (gdb_stderr, e, _("Cannot enable watchpoint %d: "),
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 0190b4d32bc..abd5a04552e 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -368,7 +368,7 @@ safe_execute_command (struct ui_out *command_uiout, const char *command,
{
execute_command (command, from_tty);
}
- catch (gdb_exception &exception)
+ catch (gdb_exception_error &exception)
{
e = std::move (exception);
}
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 48191797cd5..0041b33c367 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -415,7 +415,7 @@ i386_linux_report_signal_info (struct gdbarch *gdbarch, struct ui_out *uiout,
access
= parse_and_eval_long ("$_siginfo._sifields._sigfault.si_addr");
}
- catch (const gdb_exception &exception)
+ catch (const gdb_exception_error &exception)
{
return;
}
diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index 2002c4b8966..5455832a8f9 100644
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -69,7 +69,7 @@ inferior_event_handler (enum inferior_event_type event_type)
{
bpstat_do_actions ();
}
- catch (const gdb_exception &e)
+ catch (const gdb_exception_error &e)
{
/* If the user was running a foreground execution
command, then propagate the error so that the prompt
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 682bebe1229..34c985535cd 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1565,7 +1565,7 @@ print_return_value (struct ui_out *uiout, struct return_value_info *rv)
delete the breakpoint. */
print_return_value_1 (uiout, rv);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_print (gdb_stdout, ex);
}
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 5311822fcb8..b7d19a163a3 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -8581,7 +8581,7 @@ normal_stop (void)
{
execute_cmd_pre_hook (stop_command);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error while running hook_stop:\n");
diff --git a/gdb/jit.c b/gdb/jit.c
index 9f57d521a8b..625a8c0df18 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -721,7 +721,7 @@ jit_reader_try_read_symtab (gdbarch *gdbarch, jit_code_entry *code_entry,
code_entry->symfile_size))
status = 0;
}
- catch (const gdb_exception &e)
+ catch (const gdb_exception_error &e)
{
status = 0;
}
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 05eac3553ae..ac310f5e597 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -58,7 +58,7 @@ breakpoint_notify (struct breakpoint *b)
{
print_breakpoint (b);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_print (gdb_stderr, ex);
}
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 2c47024d5e6..d26194c87fd 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -856,7 +856,7 @@ mi_print_breakpoint_for_event (struct mi_interp *mi, breakpoint *bp)
print_breakpoint (bp);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_print (gdb_stderr, ex);
}
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 3bb9588ad48..1cffe2c4256 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1279,7 +1279,7 @@ find_objc_msgcall_submethod (int (*f) (CORE_ADDR, CORE_ADDR *),
if (f (pc, new_pc) == 0)
return 1;
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_fprintf (gdb_stderr, ex,
"Unable to determine target of "
diff --git a/gdb/parse.c b/gdb/parse.c
index 23f0e66bf27..d495a77e567 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -510,7 +510,7 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
{
lang->parser (&ps);
}
- catch (const gdb_exception &except)
+ catch (const gdb_exception_error &except)
{
/* If parsing for completion, allow this to succeed; but if no
expression elements have been written, then there's nothing
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 6f9be820b0c..ae3e865782b 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -2116,7 +2116,7 @@ do_one_display (struct display *d)
d->exp = parse_expression (d->exp_string.c_str (), &tracker);
d->block = tracker.block ();
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
/* Can't re-parse the expression. Disable this display item. */
d->enabled_p = false;
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 3dfdf592dd5..f41f3e86428 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -2934,7 +2934,7 @@ cmd_record_btrace_start (const char *args, int from_tty)
{
execute_command ("target record-btrace", from_tty);
}
- catch (const gdb_exception &exception)
+ catch (const gdb_exception_error &exception)
{
record_btrace_conf.format = BTRACE_FORMAT_BTS;
diff --git a/gdb/record-full.c b/gdb/record-full.c
index bd8c49c1abe..94bca4b8ec8 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -784,7 +784,7 @@ record_full_message_wrapper_safe (struct regcache *regcache,
{
record_full_message (regcache, signal);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_print (gdb_stderr, ex);
return false;
diff --git a/gdb/solib.c b/gdb/solib.c
index b9b1d037187..9d1e02598ec 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -739,7 +739,7 @@ update_solib_list (int from_tty)
{
ops->open_symbol_file_object (from_tty);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error reading attached "
diff --git a/gdb/sparc64-linux-tdep.c b/gdb/sparc64-linux-tdep.c
index 9ea72331e93..23d00a4540d 100644
--- a/gdb/sparc64-linux-tdep.c
+++ b/gdb/sparc64-linux-tdep.c
@@ -139,7 +139,7 @@ sparc64_linux_report_signal_info (struct gdbarch *gdbarch, struct ui_out *uiout,
if (si_code >= SEGV_ACCADI && si_code <= SEGV_ADIPERR)
addr = parse_and_eval_long ("$_siginfo._sifields._sigfault.si_addr");
}
- catch (const gdb_exception &exception)
+ catch (const gdb_exception_error &exception)
{
return;
}
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index b4c359ccd31..e1dca07cef3 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -197,7 +197,7 @@ add_vsyscall_page (inferior *inf)
name.c_str (),
0 /* from_tty */);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_print (gdb_stderr, ex);
}
--
2.35.1
next prev parent reply other threads:[~2022-02-27 0:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-27 0:00 [PATCH v3 0/7] glibc-2.34: Fix gdb.base/gdb-sigterm.exp failure/error Kevin Buettner
2022-02-27 0:00 ` [PATCH v3 1/7] Introduce gdb_exception_forced_quit Kevin Buettner
2022-02-27 0:00 ` [PATCH v3 2/7] Handle gdb SIGTERM by throwing / catching gdb_exception_force_quit Kevin Buettner
2022-02-27 0:00 ` Kevin Buettner [this message]
2022-03-03 21:11 ` [PATCH v3 3/7] Catch gdb_exception_error instead of gdb_exception (in many places) Pedro Alves
2022-02-27 0:00 ` [PATCH v3 4/7] Python QUIT processing updates Kevin Buettner
2022-02-27 0:00 ` [PATCH v3 5/7] Guile " Kevin Buettner
2022-02-27 0:00 ` [PATCH v3 6/7] QUIT processing w/ explicit throw for gdb_exception_forced_quit Kevin Buettner
2022-03-03 21:26 ` Pedro Alves
2022-02-27 0:00 ` [PATCH v3 7/7] Handle QUIT processing in the scoped_switch_fork_info destructor Kevin Buettner
2022-07-20 1:53 ` [PATCH v3 0/7] glibc-2.34: Fix gdb.base/gdb-sigterm.exp failure/error Simon Marchi
2023-01-05 13:35 ` Tom de Vries
2023-01-10 15:19 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220227000051.3336149-4-kevinb@redhat.com \
--to=kevinb@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).