* dwarf2read.c (read_str_index): Delete arg cu. All callers updated.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 67bb4bedeae9858011f29365178f5a800e9d4478..ade657e0960955f7b6180828dee21446cfe7a135 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-27  Doug Evans  <dje@google.com>
+
+       * dwarf2read.c (read_str_index): Delete arg cu.  All callers updated.
+
 2014-03-27  Doug Evans  <dje@google.com>
 
        * dwarf2read.c (init_cutu_and_read_dies_no_follow): Fix comments.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 5238f4b43421d89468863120d847baaa72fa763e..64f7383fa4576e63cc78288ab73681bb67e6f24b 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1492,7 +1492,7 @@ static CORE_ADDR read_addr_index_from_leb128 (struct dwarf2_cu *,
                                              unsigned int *);
 
 static const char *read_str_index (const struct die_reader_specs *reader,
-                                  struct dwarf2_cu *cu, ULONGEST str_index);
+                                  ULONGEST str_index);
 
 static void set_cu_language (unsigned int, struct dwarf2_cu *);
 
@@ -15907,7 +15907,7 @@ read_attribute_value (const struct die_reader_specs *reader,
        ULONGEST str_index =
          read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
 
-       DW_STRING (attr) = read_str_index (reader, cu, str_index);
+       DW_STRING (attr) = read_str_index (reader, str_index);
        DW_STRING_IS_CANONICAL (attr) = 0;
        info_ptr += bytes_read;
       }
@@ -16443,12 +16443,12 @@ dwarf2_read_addr_index (struct dwarf2_per_cu_data *per_cu,
    This is only used by the Fission support.  */
 
 static const char *
-read_str_index (const struct die_reader_specs *reader,
-               struct dwarf2_cu *cu, ULONGEST str_index)
+read_str_index (const struct die_reader_specs *reader, ULONGEST str_index)
 {
   struct objfile *objfile = dwarf2_per_objfile->objfile;
   const char *objf_name = objfile_name (objfile);
   bfd *abfd = objfile->obfd;
+  struct dwarf2_cu *cu = reader->cu;
   struct dwarf2_section_info *str_section = &reader->dwo_file->sections.str;
   struct dwarf2_section_info *str_offsets_section =
     &reader->dwo_file->sections.str_offsets;