From 91840ee38a1114bc02120935bf73dd5acda3b062 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 12 Oct 2020 15:53:16 -0600 Subject: [PATCH] Simplify add_target_sections_of_objfile Now that target_section_table uses std::vector, add_target_sections_of_objfile does not need to loop twice. This patch simplifies this code to have just a single loop. Also, the passed-in objfile can never be NULL, so this changes this function to assert that. gdb/ChangeLog 2020-10-12 Tom Tromey * exec.c (add_target_sections_of_objfile): Simplify. --- gdb/ChangeLog | 4 ++++ gdb/exec.c | 14 +------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7a66a4ddeb8..6cf0b267418 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2020-10-12 Tom Tromey + + * exec.c (add_target_sections_of_objfile): Simplify. + 2020-10-12 Tom Tromey * solib.c (solib_map_sections): Update. diff --git a/gdb/exec.c b/gdb/exec.c index d4b9b7bcf65..43385fe978f 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -661,22 +661,10 @@ add_target_sections_of_objfile (struct objfile *objfile) { struct target_section_table *table = current_target_sections; struct obj_section *osect; - unsigned count = 0; - if (objfile == NULL) - return; + gdb_assert (objfile != nullptr); /* Compute the number of sections to add. */ - ALL_OBJFILE_OSECTIONS (objfile, osect) - { - if (bfd_section_size (osect->the_bfd_section) == 0) - continue; - count++; - } - - if (count == 0) - return; - ALL_OBJFILE_OSECTIONS (objfile, osect) { if (bfd_section_size (osect->the_bfd_section) == 0) -- 2.30.2