Use a const line_header in macro reader

This changes the DWARF macro reader to use a const line_header.

gdb/ChangeLog
2020-03-26  Tom Tromey  <tom@tromey.com>

	* dwarf2/read.c (dwarf_decode_macros): Make "lh" const.
	* dwarf2/macro.h (dwarf_decode_macros): Constify "lh" parameter.
	* dwarf2/macro.c (macro_start_file): Constify "lh" parameter.
	(dwarf_decode_macro_bytes, dwarf_decode_macros): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4599b0df4ffb10c367f27e56f57bffcda38dfa06..8723ff9b9feaa8f48a3c6543048b9fe6a0b12e01 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-03-26  Tom Tromey  <tom@tromey.com>
+
+       * dwarf2/read.c (dwarf_decode_macros): Make "lh" const.
+       * dwarf2/macro.h (dwarf_decode_macros): Constify "lh" parameter.
+       * dwarf2/macro.c (macro_start_file): Constify "lh" parameter.
+       (dwarf_decode_macro_bytes, dwarf_decode_macros): Likewise.
+
 2020-03-26  Tom Tromey  <tom@tromey.com>
 
        * dwarf2/line-header.h (struct line_header) <is_valid_file_index,

diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c
index 1f1cca858c143d9d2495a897093bbbd5f517b522..01af58de29f5a05bc9530cdf265b3038dd6e2ba7 100644 (file)
--- a/gdb/dwarf2/macro.c
+++ b/gdb/dwarf2/macro.c
@@ -48,7 +48,7 @@ static struct macro_source_file *
 macro_start_file (buildsym_compunit *builder,
                  int file, int line,
                   struct macro_source_file *current_file,
-                  struct line_header *lh)
+                  const struct line_header *lh)
 {
   /* File name relative to the compilation directory of this source file.  */
   gdb::unique_xmalloc_ptr<char> file_name = lh->file_file_name (file);
@@ -423,7 +423,7 @@ dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile,
                          bfd *abfd,
                          const gdb_byte *mac_ptr, const gdb_byte *mac_end,
                          struct macro_source_file *current_file,
-                         struct line_header *lh,
+                         const struct line_header *lh,
                          struct dwarf2_section_info *section,
                          int section_is_gnu, int section_is_dwz,
                          unsigned int offset_size,
@@ -711,7 +711,7 @@ dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile,
 void
 dwarf_decode_macros (struct dwarf2_per_objfile *dwarf2_per_objfile,
                     buildsym_compunit *builder, dwarf2_section_info *section,
-                    struct line_header *lh, unsigned int offset_size,
+                    const struct line_header *lh, unsigned int offset_size,
                     unsigned int offset, int section_is_gnu)
 {
   bfd *abfd;

diff --git a/gdb/dwarf2/macro.h b/gdb/dwarf2/macro.h
index 3937c550088320927b9388ced4b33ba8bcbd0263..b92987cf0d150bba6b62f8ae28f4a72afdcbe244 100644 (file)
--- a/gdb/dwarf2/macro.h
+++ b/gdb/dwarf2/macro.h
@@ -25,7 +25,7 @@ struct buildsym_compunit;
 extern void dwarf_decode_macros (struct dwarf2_per_objfile *dwarf2_per_objfile,
                                 buildsym_compunit *builder,
                                 dwarf2_section_info *section,
-                                struct line_header *lh,
+                                const struct line_header *lh,
                                 unsigned int offset_size,
                                 unsigned int offset,
                                 int section_is_gnu);

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 29f3aeb7e70d276bddf59de2efd738bbea29b269..e00151e8b16d8945a360a1f23ad3cd292cdf52c0 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -23045,7 +23045,7 @@ dwarf_decode_macros (struct dwarf2_cu *cu, unsigned int offset,
   struct dwarf2_per_objfile *dwarf2_per_objfile
     = cu->per_cu->dwarf2_per_objfile;
   struct objfile *objfile = dwarf2_per_objfile->objfile;
-  struct line_header *lh = cu->line_header;
+  const struct line_header *lh = cu->line_header;
   unsigned int offset_size = cu->header.offset_size;
   struct dwarf2_section_info *section;
   const char *section_name;