From da6f3d00b490caf570a8bda0bab1cd78388bb795 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 24 Sep 2022 13:38:42 -0600 Subject: [PATCH] More uses of checked_static_cast This patch changes a few more uses of static_cast to use checked_static_cast. In this patch, cast-to-references are converted by moving the dereference outside of the cast, as checked_static_cast only handles pointers. --- gdb/dwarf2/read.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 3f71ebd1d66..e62f9752a80 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -3155,8 +3155,8 @@ dwarf2_gdb_index::expand_matching_symbols const block_enum block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK; mapped_index &index - = (static_cast - (*per_objfile->per_bfd->index_table.get ())); + = *(gdb::checked_static_cast + (per_objfile->per_bfd->index_table.get ())); const char *match_name = name.ada ().lookup_name ().c_str (); auto matcher = [&] (const char *symname) @@ -4005,8 +4005,8 @@ dw2_expand_marked_cus offset_type vec_len, vec_idx; bool global_seen = false; mapped_index &index - = (static_cast - (*per_objfile->per_bfd->index_table.get ())); + = *(gdb::checked_static_cast + (per_objfile->per_bfd->index_table.get ())); offset_view vec (index.constant_pool.slice (index.symbol_vec_index (idx))); vec_len = vec[0]; @@ -4225,8 +4225,8 @@ dwarf2_gdb_index::expand_symtabs_matching } mapped_index &index - = (static_cast - (*per_objfile->per_bfd->index_table.get ())); + = *(gdb::checked_static_cast + (per_objfile->per_bfd->index_table.get ())); bool result = dw2_expand_symtabs_matching_symbol (index, *lookup_name, @@ -5208,8 +5208,8 @@ dwarf2_debug_names_index::expand_matching_symbols dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); mapped_debug_names &map - = (static_cast - (*per_objfile->per_bfd->index_table.get ())); + = *(gdb::checked_static_cast + (per_objfile->per_bfd->index_table.get ())); const block_search_flags block_flags = global ? SEARCH_GLOBAL_BLOCK : SEARCH_STATIC_BLOCK; @@ -5270,8 +5270,8 @@ dwarf2_debug_names_index::expand_symtabs_matching } mapped_debug_names &map - = (static_cast - (*per_objfile->per_bfd->index_table.get ())); + = *(gdb::checked_static_cast + (per_objfile->per_bfd->index_table.get ())); bool result = dw2_expand_symtabs_matching_symbol (map, *lookup_name, -- 2.30.2