diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2025-03-10 14:40:59 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2025-03-10 16:09:02 -0400 |
| commit | b4f18de12c77d2838f413ca9b5f51f508123c277 (patch) | |
| tree | 88dc9bab3d872797475f2d23723daf0da15826ae | |
| parent | f62cf22157cf527f1cc5c91854b1be3373024d4a (diff) | |
| download | binutils-b4f18de12c77d2838f413ca9b5f51f508123c277.zip binutils-b4f18de12c77d2838f413ca9b5f51f508123c277.tar.gz binutils-b4f18de12c77d2838f413ca9b5f51f508123c277.tar.bz2 | |
gdb/dwarf: use ranged for loop in some pots
I noticed that these loops could be written to avoid the iteration
variable `i`.
Change-Id: Ia3717acbbf732f0337870d35ac60fe6400383324
| -rw-r--r-- | gdb/dwarf2/index-write.c | 14 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 6 |
2 files changed, 7 insertions, 13 deletions
diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 9d876b1..8fb5931 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -1317,11 +1317,9 @@ write_gdbindex (dwarf2_per_bfd *per_bfd, cooked_index *table, work here. */ int counter = 0; - for (int i = 0; i < per_bfd->all_units.size (); ++i) + for (const dwarf2_per_cu_up &per_cu : per_bfd->all_units) { - dwarf2_per_cu *per_cu = per_bfd->all_units[i].get (); - - const auto insertpair = cu_index_htab.emplace (per_cu, counter); + const auto insertpair = cu_index_htab.emplace (per_cu.get (), counter); gdb_assert (insertpair.second); /* See enhancement PR symtab/30838. */ @@ -1337,7 +1335,7 @@ write_gdbindex (dwarf2_per_bfd *per_bfd, cooked_index *table, to_underlying (per_cu->sect_off)); if (per_cu->is_debug_types) { - signatured_type *sig_type = (signatured_type *) per_cu; + signatured_type *sig_type = (signatured_type *) per_cu.get (); cu_list.append_uint (8, BFD_ENDIAN_LITTLE, to_underlying (sig_type->type_offset_in_tu)); cu_list.append_uint (8, BFD_ENDIAN_LITTLE, @@ -1400,14 +1398,12 @@ write_debug_names (dwarf2_per_bfd *per_bfd, cooked_index *table, debug_names nametable (per_bfd, dwarf5_is_dwarf64, dwarf5_byte_order); int counter = 0; int types_counter = 0; - for (int i = 0; i < per_bfd->all_units.size (); ++i) + for (const dwarf2_per_cu_up &per_cu : per_bfd->all_units) { - dwarf2_per_cu *per_cu = per_bfd->all_units[i].get (); - int &this_counter = per_cu->is_debug_types ? types_counter : counter; data_buf &this_list = per_cu->is_debug_types ? types_cu_list : cu_list; - nametable.add_cu (per_cu, this_counter); + nametable.add_cu (per_cu.get (), this_counter); this_list.append_uint (nametable.dwarf5_offset_size (), dwarf5_byte_order, to_underlying (per_cu->sect_off)); diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index a25daa3..c8c2ecd 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1968,16 +1968,14 @@ dwarf2_base_index_functions::expand_all_symtabs (struct objfile *objfile) dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); int total_units = per_objfile->per_bfd->all_units.size (); - for (int i = 0; i < total_units; ++i) + for (const dwarf2_per_cu_up &per_cu : per_objfile->per_bfd->all_units) { - dwarf2_per_cu *per_cu = per_objfile->per_bfd->get_cu (i); - /* We don't want to directly expand a partial CU, because if we read it with the wrong language, then assertion failures can be triggered later on. See PR symtab/23010. So, tell dw2_instantiate_symtab to skip partial CUs -- any important partial CU will be read via DW_TAG_imported_unit anyway. */ - dw2_instantiate_symtab (per_cu, per_objfile, true); + dw2_instantiate_symtab (per_cu.get (), per_objfile, true); } } |