From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 11/24] gdb: use gdb::checked_static_cast when casting lm_info
Date: Tue, 10 Oct 2023 16:40:06 -0400 [thread overview]
Message-ID: <20231010204213.111285-12-simon.marchi@efficios.com> (raw)
In-Reply-To: <20231010204213.111285-1-simon.marchi@efficios.com>
Now that the lm_info class hierarchy has a virtual destructor and
therefore a vtable, use checked_static_cast instead of C-style cases to
ensure (when building in dev mode) that we're casting to the right kind
of lm_info.
Change-Id: I9a99b7d6aa9a44edbe76377d57a7008cfb75a744
---
gdb/nto-tdep.c | 2 +-
gdb/solib-aix.c | 2 +-
gdb/solib-darwin.c | 2 +-
gdb/solib-dsbt.c | 2 +-
gdb/solib-frv.c | 8 ++++----
gdb/solib-rocm.c | 4 ++--
gdb/solib-svr4.c | 16 ++++++++--------
gdb/solib-target.c | 2 +-
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 1d9c7340fcf7..67e3c7042754 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -247,7 +247,7 @@ nto_parse_redirection (char *pargv[], const char **pin, const char **pout,
static CORE_ADDR
lm_addr (const so_list &so)
{
- const lm_info_svr4 *li = (const lm_info_svr4 *) so.lm_info;
+ auto *li = gdb::checked_static_cast<const lm_info_svr4 *> (so.lm_info);
return li->l_addr;
}
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index 7ec6462a8de1..9d232a03ae7b 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -316,7 +316,7 @@ solib_aix_relocate_section_addresses (so_list &so, target_section *sec)
struct bfd_section *bfd_sect = sec->the_bfd_section;
bfd *abfd = bfd_sect->owner;
const char *section_name = bfd_section_name (bfd_sect);
- lm_info_aix *info = (lm_info_aix *) so.lm_info;
+ auto *info = gdb::checked_static_cast<lm_info_aix *> (so.lm_info);
if (strcmp (section_name, ".text") == 0)
{
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index cb6ed3a70afc..c42082cfb368 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -614,7 +614,7 @@ darwin_clear_solib (program_space *pspace)
static void
darwin_relocate_section_addresses (so_list &so, target_section *sec)
{
- lm_info_darwin *li = (lm_info_darwin *) so.lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_darwin *> (so.lm_info);
sec->addr += li->lm_addr;
sec->endaddr += li->lm_addr;
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index af99afc33caa..dca4080dee15 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -883,7 +883,7 @@ static void
dsbt_relocate_section_addresses (so_list &so, target_section *sec)
{
int seg;
- lm_info_dsbt *li = (lm_info_dsbt *) so.lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_dsbt *> (so.lm_info);
int_elf32_dsbt_loadmap *map = li->map;
for (seg = 0; seg < map->nsegs; seg++)
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 853d90a8c86c..47a81b88efe7 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -819,7 +819,7 @@ static void
frv_relocate_section_addresses (so_list &so, target_section *sec)
{
int seg;
- lm_info_frv *li = (lm_info_frv *) so.lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_frv *> (so.lm_info);
int_elf32_fdpic_loadmap *map = li->map;
for (seg = 0; seg < map->nsegs; seg++)
@@ -860,7 +860,7 @@ frv_fdpic_find_global_pointer (CORE_ADDR addr)
for (struct so_list *so : current_program_space->solibs ())
{
int seg;
- lm_info_frv *li = (lm_info_frv *) so->lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_frv *> (so->lm_info);
int_elf32_fdpic_loadmap *map = li->map;
for (seg = 0; seg < map->nsegs; seg++)
@@ -916,7 +916,7 @@ frv_fdpic_find_canonical_descriptor (CORE_ADDR entry_point)
{
for (struct so_list *so : current_program_space->solibs ())
{
- lm_info_frv *li = (lm_info_frv *) so->lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_frv *> (so->lm_info);
addr = find_canonical_descriptor_in_load_object
(entry_point, got_value, name, so->abfd, li);
@@ -1068,7 +1068,7 @@ frv_fetch_objfile_link_map (struct objfile *objfile)
of shared libraries. */
for (struct so_list *so : current_program_space->solibs ())
{
- lm_info_frv *li = (lm_info_frv *) so->lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_frv *> (so->lm_info);
if (so->objfile == objfile)
return li->lm_addr;
diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c
index e46d272b3339..403173ecc998 100644
--- a/gdb/solib-rocm.c
+++ b/gdb/solib-rocm.c
@@ -186,7 +186,7 @@ rocm_solib_relocate_section_addresses (so_list &so,
return;
}
- lm_info_svr4 *li = (lm_info_svr4 *) so.lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_svr4 *> (so.lm_info);
sec->addr = sec->addr + li->l_addr;
sec->endaddr = sec->endaddr + li->l_addr;
}
@@ -220,7 +220,7 @@ rocm_solib_copy_list (const so_list *src)
so_list *newobj = new so_list;
memcpy (newobj, src, sizeof (struct so_list));
- lm_info_svr4 *src_li = (lm_info_svr4 *) src->lm_info;
+ auto *src_li = gdb::checked_static_cast<lm_info_svr4 *> (src->lm_info);
newobj->lm_info = new lm_info_svr4 (*src_li);
newobj->next = nullptr;
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 0bf8bb8446c7..7d247fa455e9 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -181,8 +181,8 @@ svr4_same (const so_list &gdb, const so_list &inferior)
/* There may be different instances of the same library, in different
namespaces. Each instance, however, must have been loaded at a
different address so its relocation offset would be different. */
- const lm_info_svr4 *lmg = (const lm_info_svr4 *) gdb.lm_info;
- const lm_info_svr4 *lmi = (const lm_info_svr4 *) inferior.lm_info;
+ auto *lmg = gdb::checked_static_cast<const lm_info_svr4 *> (gdb.lm_info);
+ auto *lmi = gdb::checked_static_cast<const lm_info_svr4 *> (inferior.lm_info);
return (lmg->l_addr_inferior == lmi->l_addr_inferior);
}
@@ -231,7 +231,7 @@ has_lm_dynamic_from_link_map (void)
static CORE_ADDR
lm_addr_check (const so_list &so, bfd *abfd)
{
- lm_info_svr4 *li = (lm_info_svr4 *) so.lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_svr4 *> (so.lm_info);
if (!li->l_addr_p)
{
@@ -981,7 +981,7 @@ svr4_free_objfile_observer (struct objfile *objfile)
static void
svr4_clear_so (const so_list &so)
{
- lm_info_svr4 *li = (lm_info_svr4 *) so.lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_svr4 *> (so.lm_info);
if (li != NULL)
li->l_addr_p = 0;
@@ -1014,7 +1014,7 @@ svr4_copy_library_list (struct so_list *src)
so_list *newobj = new so_list;
memcpy (newobj, src, sizeof (struct so_list));
- lm_info_svr4 *src_li = (lm_info_svr4 *) src->lm_info;
+ auto *src_li = gdb::checked_static_cast<lm_info_svr4 *> (src->lm_info);
newobj->lm_info = new lm_info_svr4 (*src_li);
newobj->next = NULL;
@@ -1561,7 +1561,7 @@ svr4_current_sos (void)
[ 9] .dynamic DYNAMIC ffffffffff700580 000580 0000f0
*/
- lm_info_svr4 *li = (lm_info_svr4 *) so->lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_svr4 *> (so->lm_info);
if (address_in_mem_range (li->l_ld, &vsyscall_range))
{
@@ -1597,7 +1597,7 @@ svr4_fetch_objfile_link_map (struct objfile *objfile)
for (struct so_list *so : current_program_space->solibs ())
if (so->objfile == objfile)
{
- lm_info_svr4 *li = (lm_info_svr4 *) so->lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_svr4 *> (so->lm_info);
return li->lm_addr;
}
@@ -1880,7 +1880,7 @@ solist_update_incremental (svr4_info *info, CORE_ADDR debug_base,
for (; solist->next != nullptr; solist = solist->next)
/* Nothing. */;
- lm_info_svr4 *li = (lm_info_svr4 *) solist->lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_svr4 *> (solist->lm_info);
prev_lm = li->lm_addr;
pnext = &solist->next;
}
diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index f79b59a36de0..05b35103091e 100644
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -285,7 +285,7 @@ static void
solib_target_relocate_section_addresses (so_list &so, target_section *sec)
{
CORE_ADDR offset;
- lm_info_target *li = (lm_info_target *) so.lm_info;
+ auto *li = gdb::checked_static_cast<lm_info_target *> (so.lm_info);
/* Build the offset table only once per object file. We can not do
it any earlier, since we need to open the file first. */
--
2.42.0
next prev parent reply other threads:[~2023-10-10 20:44 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 20:39 [PATCH 00/24] C++ification of struct so_list Simon Marchi
2023-10-10 20:39 ` [PATCH 01/24] gdb: remove empty clear_solib functions Simon Marchi
2023-10-10 20:39 ` [PATCH 02/24] gdb: add program_space parameter to target_so_ops::clear_solib Simon Marchi
2023-10-17 14:57 ` Pedro Alves
2023-10-17 15:19 ` Simon Marchi
2023-10-10 20:39 ` [PATCH 03/24] gdb: make interps_notify work with references Simon Marchi
2023-10-11 8:48 ` Lancelot SIX
2023-10-11 14:18 ` Simon Marchi
2023-10-10 20:39 ` [PATCH 04/24] gdb: replace some so_list parameters to use references Simon Marchi
2023-10-19 11:07 ` [PATCH 4/24] " Lancelot SIX
2023-10-19 14:49 ` Simon Marchi
2023-10-19 15:20 ` Lancelot SIX
2023-10-19 16:07 ` Simon Marchi
2023-10-10 20:40 ` [PATCH 05/24] gdbsupport: use "reference" and "pointer" type aliases in intrusive_list Simon Marchi
2023-10-10 20:40 ` [PATCH 06/24] gdbsupport: make intrusive_list's disposer accept a reference Simon Marchi
2023-10-12 19:05 ` Pedro Alves
2023-10-14 20:12 ` Simon Marchi
2023-10-10 20:40 ` [PATCH 07/24] gdb: make get_cbfd_soname_build_id static Simon Marchi
2023-10-10 20:40 ` [PATCH 08/24] gdb: allocate so_list with new, deallocate with delete Simon Marchi
2023-10-10 20:40 ` [PATCH 09/24] gdb: rename lm_info_base to lm_info Simon Marchi
2023-10-10 20:40 ` [PATCH 10/24] gdb: remove target_so_ops::free_so Simon Marchi
2023-10-10 20:40 ` Simon Marchi [this message]
2023-10-10 20:40 ` [PATCH 12/24] gdb: make solib-svr4 not use so_list internally Simon Marchi
2023-10-13 17:52 ` Lancelot SIX
2023-10-14 19:59 ` Simon Marchi
2023-10-19 11:08 ` Lancelot SIX
2023-10-19 14:50 ` Simon Marchi
2023-10-10 20:40 ` [PATCH 13/24] gdb: make solib-rocm " Simon Marchi
2023-10-13 18:35 ` Lancelot SIX
2023-10-14 20:00 ` Simon Marchi
2023-10-17 15:23 ` Pedro Alves
2023-10-17 15:32 ` Simon Marchi
2023-10-10 20:40 ` [PATCH 14/24] gdb: remove lm_info_vector typedef Simon Marchi
2023-10-10 20:40 ` [PATCH 15/24] gdb: make so_list::lm_info a unique_ptr Simon Marchi
2023-10-10 20:40 ` [PATCH 16/24] gdb: make clear_so a method of struct so_list Simon Marchi
2023-10-19 11:08 ` Lancelot SIX
2023-10-19 14:52 ` Simon Marchi
2023-10-10 20:40 ` [PATCH 17/24] gdb: remove target_section_table typedef Simon Marchi
2023-10-10 20:40 ` [PATCH 18/24] gdb: make so_list::sections not a pointer Simon Marchi
2023-10-10 20:40 ` [PATCH 19/24] gdb: make so_list::abfd a gdb_bfd_ref_ptr Simon Marchi
2023-10-10 20:40 ` [PATCH 20/24] gdb: make so_list::{so_original_name, so_name} std::strings Simon Marchi
2023-10-13 22:28 ` Lancelot SIX
2023-10-14 20:01 ` Simon Marchi
2023-10-19 11:08 ` [PATCH 20/24] gdb: make so_list::{so_original_name,so_name} std::strings Lancelot SIX
2023-10-19 14:55 ` Simon Marchi
2023-10-10 20:40 ` [PATCH 21/24] gdb: link so_list using intrusive_list Simon Marchi
2023-10-17 19:14 ` Pedro Alves
2023-10-17 19:38 ` Simon Marchi
2023-10-10 20:40 ` [PATCH 22/24] gdb: don't call so_list::clear in free_so Simon Marchi
2023-10-10 20:40 ` [PATCH 23/24] gdb: remove free_so function Simon Marchi
2023-10-10 20:49 ` [PATCH 24/24] gdb: rename struct so_list to so Simon Marchi
2023-10-17 19:20 ` [PATCH 00/24] C++ification of struct so_list Pedro Alves
2023-10-17 19:53 ` Simon Marchi
2023-10-20 14:40 ` Pedro Alves
2023-10-19 11:09 ` [PATCH 0/24] " Lancelot SIX
2023-10-19 14:57 ` 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=20231010204213.111285-12-simon.marchi@efficios.com \
--to=simon.marchi@efficios.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