gdb/dwarf: remove per_objfile parameter from read_and_check_comp_unit_head

It is no longer needed.

Change-Id: I22b21b12dc9f74a423bca355d4d83f0167e75f34
Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/dwarf2/comp-unit-head.c b/gdb/dwarf2/comp-unit-head.c
index bc80c632cee038946cc6f0ba063025c6fa003959..a35d6641d2efa9217874ba4dc45095ffea358372 100644 (file)
--- a/gdb/dwarf2/comp-unit-head.c
+++ b/gdb/dwarf2/comp-unit-head.c
@@ -26,7 +26,6 @@
 
 #include "dwarf2/comp-unit-head.h"
 #include "dwarf2/leb.h"
-#include "dwarf2/read.h"
 #include "dwarf2/section.h"
 #include "dwarf2/stringify.h"
 #include "dwarf2/error.h"
@@ -149,10 +148,9 @@ read_comp_unit_head (struct comp_unit_head *cu_header,
    Perform various error checking on the header.  */
 
 static void
-error_check_comp_unit_head (dwarf2_per_objfile *per_objfile,
-                           struct comp_unit_head *header,
-                           struct dwarf2_section_info *section,
-                           struct dwarf2_section_info *abbrev_section)
+error_check_comp_unit_head (comp_unit_head *header,
+                           dwarf2_section_info *section,
+                           dwarf2_section_info *abbrev_section)
 {
   const char *filename = section->get_file_name ();
 
@@ -178,12 +176,10 @@ error_check_comp_unit_head (dwarf2_per_objfile *per_objfile,
 /* See comp-unit-head.h.  */
 
 const gdb_byte *
-read_and_check_comp_unit_head (dwarf2_per_objfile *per_objfile,
-                              struct comp_unit_head *header,
-                              struct dwarf2_section_info *section,
-                              struct dwarf2_section_info *abbrev_section,
-                              const gdb_byte *info_ptr,
-                              rcuh_kind section_kind)
+read_and_check_comp_unit_head (comp_unit_head *header,
+                              dwarf2_section_info *section,
+                              dwarf2_section_info *abbrev_section,
+                              const gdb_byte *info_ptr, rcuh_kind section_kind)
 {
   const gdb_byte *beg_of_comp_unit = info_ptr;
 
@@ -193,7 +189,7 @@ read_and_check_comp_unit_head (dwarf2_per_objfile *per_objfile,
 
   header->first_die_cu_offset = (cu_offset) (info_ptr - beg_of_comp_unit);
 
-  error_check_comp_unit_head (per_objfile, header, section, abbrev_section);
+  error_check_comp_unit_head (header, section, abbrev_section);
 
   return info_ptr;
 }

diff --git a/gdb/dwarf2/comp-unit-head.h b/gdb/dwarf2/comp-unit-head.h
index 513489394d99e9a02a0551ff44d384828e12a76a..ea0915337cce477e52116908840c25022e05ffc2 100644 (file)
--- a/gdb/dwarf2/comp-unit-head.h
+++ b/gdb/dwarf2/comp-unit-head.h
@@ -129,11 +129,8 @@ extern const gdb_byte *read_comp_unit_head
    The contents of the header are stored in HEADER.
    The result is a pointer to the start of the first DIE.  */
 extern const gdb_byte *read_and_check_comp_unit_head
-  (dwarf2_per_objfile *per_objfile,
-   struct comp_unit_head *header,
-   struct dwarf2_section_info *section,
-   struct dwarf2_section_info *abbrev_section,
-   const gdb_byte *info_ptr,
+  (comp_unit_head *header, dwarf2_section_info *section,
+   dwarf2_section_info *abbrev_section, const gdb_byte *info_ptr,
    rcuh_kind section_kind);
 
 #endif /* GDB_DWARF2_COMP_UNIT_HEAD_H */

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 28872146344c0af679cc9e4d192ee5b754bd80c4..ebd1ad61f37aa7da490351e8592550a2051b059a 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -2432,8 +2432,8 @@ create_dwo_debug_type_hash_table (dwarf2_per_objfile *per_objfile,
       /* We need to read the type's signature in order to build the hash
         table, but we don't need anything else just yet.  */
 
-      ptr = read_and_check_comp_unit_head (per_objfile, &header, section,
-                                          abbrev_section, ptr, section_kind);
+      ptr = read_and_check_comp_unit_head (&header, section, abbrev_section,
+                                          ptr, section_kind);
 
       length = header.get_length_with_initial ();
 
@@ -2712,9 +2712,8 @@ cutu_reader::read_cutu_die_from_dwo (dwarf2_cu *cu, dwo_unit *dwo_unit,
                                     die_info *stub_comp_unit_die,
                                     const char *stub_comp_dir)
 {
-  dwarf2_per_objfile *per_objfile = cu->per_objfile;
   dwarf2_per_cu *per_cu = cu->per_cu;
-  struct objfile *objfile = per_objfile->objfile;
+  struct objfile *objfile = cu->per_objfile->objfile;
   bfd *abfd;
   struct dwarf2_section_info *dwo_abbrev_section;
 
@@ -2790,9 +2789,10 @@ cutu_reader::read_cutu_die_from_dwo (dwarf2_cu *cu, dwo_unit *dwo_unit,
     {
       signatured_type *sig_type = (struct signatured_type *) per_cu;
 
-      m_info_ptr = read_and_check_comp_unit_head (per_objfile, &cu->header,
-                                                 section, dwo_abbrev_section,
+      m_info_ptr = read_and_check_comp_unit_head (&cu->header, section,
+                                                 dwo_abbrev_section,
                                                  m_info_ptr, rcuh_kind::TYPE);
+
       /* This is not an assert because it can be caused by bad debug info.  */
       if (sig_type->signature != cu->header.signature)
        {
@@ -2818,7 +2818,7 @@ cutu_reader::read_cutu_die_from_dwo (dwarf2_cu *cu, dwo_unit *dwo_unit,
   else
     {
       m_info_ptr
-       = read_and_check_comp_unit_head (per_objfile, &cu->header, section,
+       = read_and_check_comp_unit_head (&cu->header, section,
                                         dwo_abbrev_section, m_info_ptr,
                                         rcuh_kind::COMPILE);
       gdb_assert (dwo_unit->sect_off == cu->header.sect_off);
@@ -3047,7 +3047,7 @@ cutu_reader::cutu_reader (dwarf2_per_cu &this_cu,
       if (this_cu.is_debug_types)
        {
          m_info_ptr
-           = read_and_check_comp_unit_head (&per_objfile, &cu->header, section,
+           = read_and_check_comp_unit_head (&cu->header, section,
                                             abbrev_section, m_info_ptr,
                                             rcuh_kind::TYPE);
 
@@ -3070,7 +3070,7 @@ cutu_reader::cutu_reader (dwarf2_per_cu &this_cu,
       else
        {
          m_info_ptr
-           = read_and_check_comp_unit_head (&per_objfile, &cu->header, section,
+           = read_and_check_comp_unit_head (&cu->header, section,
                                             abbrev_section, m_info_ptr,
                                             rcuh_kind::COMPILE);
 
@@ -3204,12 +3204,11 @@ cutu_reader::cutu_reader (dwarf2_per_cu &this_cu,
 
   m_info_ptr = section->buffer + to_underlying (this_cu.sect_off);
   const gdb_byte *begin_info_ptr = m_info_ptr;
-  m_info_ptr
-    = read_and_check_comp_unit_head (&per_objfile, &m_new_cu->header, section,
-                                    abbrev_section, m_info_ptr,
-                                    (this_cu.is_debug_types
-                                     ? rcuh_kind::TYPE
-                                     : rcuh_kind::COMPILE));
+  m_info_ptr = read_and_check_comp_unit_head (&m_new_cu->header, section,
+                                             abbrev_section, m_info_ptr,
+                                             (this_cu.is_debug_types
+                                                ? rcuh_kind::TYPE
+                                                : rcuh_kind::COMPILE));
 
   m_new_cu->str_offsets_base = parent_cu.str_offsets_base;
   m_new_cu->addr_base = parent_cu.addr_base;
@@ -3692,6 +3691,7 @@ read_comp_units_from_section (dwarf2_per_objfile *per_objfile,
 {
   const gdb_byte *info_ptr;
   struct objfile *objfile = per_objfile->objfile;
+  dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
 
   dwarf_read_debug_printf ("Reading %s for %s",
                           section->get_name (),
@@ -3708,20 +3708,19 @@ read_comp_units_from_section (dwarf2_per_objfile *per_objfile,
       sect_offset sect_off = (sect_offset) (info_ptr - section->buffer);
 
       comp_unit_head cu_header;
-      read_and_check_comp_unit_head (per_objfile, &cu_header, section,
-                                    abbrev_section, info_ptr,
-                                    section_kind);
+      read_and_check_comp_unit_head (&cu_header, section, abbrev_section,
+                                    info_ptr, section_kind);
 
       unsigned int length = cu_header.get_length_with_initial ();
 
       /* Save the compilation unit for later lookup.  */
       if (cu_header.unit_type != DW_UT_type)
-       this_cu
-         = per_objfile->per_bfd->allocate_per_cu (section, sect_off, length, is_dwz);
+       this_cu = per_bfd->allocate_per_cu (section, sect_off, length, is_dwz);
       else
        {
-         auto sig_type = per_objfile->per_bfd->allocate_signatured_type
-           (section, sect_off, length, is_dwz, cu_header.signature);
+         auto sig_type
+           = per_bfd->allocate_signatured_type (section, sect_off, length,
+                                                is_dwz, cu_header.signature);
          signatured_type *sig_ptr = sig_type.get ();
          sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
          this_cu.reset (sig_type.release ());
@@ -3737,7 +3736,7 @@ read_comp_units_from_section (dwarf2_per_objfile *per_objfile,
        }
 
       info_ptr = info_ptr + this_cu->length ();
-      per_objfile->per_bfd->all_units.push_back (std::move (this_cu));
+      per_bfd->all_units.push_back (std::move (this_cu));
     }
 }