[PATCH 11/22] Use a const dwarf2_section_info in macro reader

Tom Tromey
2020-03-22T18:45:28Z

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

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

* dwarf2/macro.h (dwarf_decode_macros): Make section parameter
const.
* dwarf2/macro.c (skip_form_bytes, skip_unknown_opcode)
(dwarf_decode_macro_bytes, dwarf_decode_macros): Make section
parameter const.
---
gdb/ChangeLog | 8 ++++++++
gdb/dwarf2/macro.c | 11 ++++++-----
gdb/dwarf2/macro.h | 2 +-
3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c
index 01af58de29f..49586399673 100644
--- a/gdb/dwarf2/macro.c
+++ b/gdb/dwarf2/macro.c
@@ -231,7 +231,7 @@ static const gdb_byte *
skip_form_bytes (bfd *abfd, const gdb_byte *bytes, const gdb_byte *buffer_end,
enum dwarf_form form,
unsigned int offset_size,
- struct dwarf2_section_info *section)
+ const struct dwarf2_section_info *section)
{
unsigned int bytes_read;

@@ -322,7 +322,7 @@ skip_unknown_opcode (unsigned int opcode,
const gdb_byte *mac_ptr, const gdb_byte *mac_end,
bfd *abfd,
unsigned int offset_size,
- struct dwarf2_section_info *section)
+ const struct dwarf2_section_info *section)
{
unsigned int bytes_read, i;
unsigned long arg;
@@ -424,7 +424,7 @@ dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile,
const gdb_byte *mac_ptr, const gdb_byte *mac_end,
struct macro_source_file *current_file,
const struct line_header *lh,
- struct dwarf2_section_info *section,
+ const struct dwarf2_section_info *section,
int section_is_gnu, int section_is_dwz,
unsigned int offset_size,
htab_t include_hash)
@@ -634,7 +634,7 @@ dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile,
LONGEST offset;
void **slot;
bfd *include_bfd = abfd;
- struct dwarf2_section_info *include_section = section;
+ const struct dwarf2_section_info *include_section = section;
const gdb_byte *include_mac_end = mac_end;
int is_dwz = section_is_dwz;
const gdb_byte *new_mac_ptr;
@@ -710,7 +710,8 @@ 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,
+ buildsym_compunit *builder,
+ const dwarf2_section_info *section,
const struct line_header *lh, unsigned int offset_size,
unsigned int offset, int section_is_gnu)
{
diff --git a/gdb/dwarf2/macro.h b/gdb/dwarf2/macro.h
index b92987cf0d1..cb66a6f50cd 100644
--- a/gdb/dwarf2/macro.h
+++ b/gdb/dwarf2/macro.h
@@ -24,7 +24,7 @@ struct buildsym_compunit;

extern void dwarf_decode_macros (struct dwarf2_per_objfile *dwarf2_per_objfile,
buildsym_compunit *builder,
- dwarf2_section_info *section,
+ const dwarf2_section_info *section,
const struct line_header *lh,
unsigned int offset_size,
unsigned int offset,
--
2.17.2