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  <tom@tromey.com>

	* exec.c (add_target_sections_of_objfile): Simplify.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7a66a4ddeb827640bd193614d8158a02f7983205..6cf0b267418bb921354bfdf853f6ac225473af3d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-10-12  Tom Tromey  <tom@tromey.com>
+
+       * exec.c (add_target_sections_of_objfile): Simplify.
+
 2020-10-12  Tom Tromey  <tom@tromey.com>
 
        * solib.c (solib_map_sections): Update.

diff --git a/gdb/exec.c b/gdb/exec.c
index d4b9b7bcf6576e49230598ebf48d4cb2cc07368f..43385fe978f273fc1bb5cf087e0bc3b653ecc4da 100644 (file)
--- 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)