From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 4/4] Use gdb::checked_static_cast for catchpoints
Date: Mon, 18 Sep 2023 08:25:38 -0600 [thread overview]
Message-ID: <20230918-watchpoint-casts-v2-4-f636ec38fdc4@adacore.com> (raw)
In-Reply-To: <20230918-watchpoint-casts-v2-0-f636ec38fdc4@adacore.com>
This replaces some casts to various kinds of catchpoint with
checked_static_cast.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
gdb/ada-lang.c | 2 +-
gdb/break-catch-sig.c | 10 ++++++----
gdb/break-catch-syscall.c | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 2496c099f19..b9a271bc126 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -12203,7 +12203,7 @@ ada_catchpoint::allocate_location ()
bool
ada_catchpoint::should_stop_exception (const struct bp_location *bl) const
{
- struct ada_catchpoint *c = (struct ada_catchpoint *) bl->owner;
+ ada_catchpoint *c = gdb::checked_static_cast<ada_catchpoint *> (bl->owner);
const struct ada_catchpoint_location *ada_loc
= (const struct ada_catchpoint_location *) bl;
bool stop;
diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c
index 10c8b81f8e8..7a07fb61100 100644
--- a/gdb/break-catch-sig.c
+++ b/gdb/break-catch-sig.c
@@ -103,7 +103,8 @@ signal_to_name_or_int (enum gdb_signal sig)
int
signal_catchpoint::insert_location (struct bp_location *bl)
{
- struct signal_catchpoint *c = (struct signal_catchpoint *) bl->owner;
+ signal_catchpoint *c
+ = gdb::checked_static_cast<signal_catchpoint *> (bl->owner);
if (!c->signals_to_be_caught.empty ())
{
@@ -130,7 +131,8 @@ int
signal_catchpoint::remove_location (struct bp_location *bl,
enum remove_bp_reason reason)
{
- struct signal_catchpoint *c = (struct signal_catchpoint *) bl->owner;
+ signal_catchpoint *c
+ = gdb::checked_static_cast<signal_catchpoint *> (bl->owner);
if (!c->signals_to_be_caught.empty ())
{
@@ -165,8 +167,8 @@ signal_catchpoint::breakpoint_hit (const struct bp_location *bl,
CORE_ADDR bp_addr,
const target_waitstatus &ws)
{
- const struct signal_catchpoint *c
- = (const struct signal_catchpoint *) bl->owner;
+ const signal_catchpoint *c
+ = gdb::checked_static_cast<const signal_catchpoint *> (bl->owner);
gdb_signal signal_number;
if (ws.kind () != TARGET_WAITKIND_STOPPED)
diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c
index 9abf8183984..9bdfcf73efa 100644
--- a/gdb/break-catch-syscall.c
+++ b/gdb/break-catch-syscall.c
@@ -480,10 +480,10 @@ catch_syscall_enabled (void)
static bool
catching_syscall_number_1 (struct breakpoint *b, int syscall_number)
{
-
if (is_syscall_catchpoint_enabled (b))
{
- struct syscall_catchpoint *c = (struct syscall_catchpoint *) b;
+ syscall_catchpoint *c
+ = gdb::checked_static_cast<syscall_catchpoint *> (b);
if (!c->syscalls_to_be_caught.empty ())
{
--
2.40.1
next prev parent reply other threads:[~2023-09-18 14:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 14:25 [PATCH v2 0/4] Use checked_static_cast for breakpoint casts Tom Tromey
2023-09-18 14:25 ` [PATCH v2 1/4] Use gdb::checked_static_cast for watchpoints Tom Tromey
2023-09-18 14:25 ` [PATCH v2 2/4] Use gdb::checked_static_cast for tracepoints Tom Tromey
2023-09-18 14:25 ` [PATCH v2 3/4] Use gdb::checked_static_cast for code_breakpoint Tom Tromey
2023-09-18 14:25 ` Tom Tromey [this message]
2023-09-19 14:00 ` [PATCH v2 0/4] Use checked_static_cast for breakpoint casts Simon Marchi
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=20230918-watchpoint-casts-v2-4-f636ec38fdc4@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@efficios.com \
/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).