PR27202, readelf -wL doesn't work on ".loc 0"

For DWARF revision 4 and earlier, display_debug_lines_decoded
populates the file_table array with entries read from .debug_line
after the directory table.  file_table[0] contains the first entry.
DWARF rev 4 line number programs index this entry as file number one.
DWARF revision 5 changes .debug_line format quite extensively, and in
particular gives file number zero a meaning.

	PR 27202
	* dwarf.c (display_debug_lines_decoded): Correct indexing used
	for DWARF5 files.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 213b5d178774a92f58dcc5ee21afe897faa24d46..6e10281a6edc189a34b506d57b335984234a6784 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -5297,15 +5297,17 @@ display_debug_lines_decoded (struct dwarf_section *  section,
                state_machine_regs.file = uladv;
 
                {
-                 unsigned file = state_machine_regs.file - 1;
+                 unsigned file = state_machine_regs.file;
                  unsigned dir;
 
+                 if (linfo.li_version < 5)
+                   --file;
                  if (file_table == NULL || n_files == 0)
                    printf (_("\n [Use file table entry %d]\n"), file);
                  /* PR 20439 */
                  else if (file >= n_files)
                    {
-                     warn (_("file index %u > number of files %u\n"), file + 1, n_files);
+                     warn (_("file index %u > number of files %u\n"), file, n_files);
                      printf (_("\n <over large file table index %u>"), file);
                    }
                  else if ((dir = file_table[file].directory_index) == 0)
@@ -5414,7 +5416,10 @@ display_debug_lines_decoded (struct dwarf_section *  section,
 
              if (file_table)
                {
-                 unsigned indx = state_machine_regs.file - 1;
+                 unsigned indx = state_machine_regs.file;
+
+                 if (linfo.li_version < 5)
+                   --indx;
                  /* PR 20439  */
                  if (indx >= n_files)
                    {