From fba9460f7cc1d6de1b7b647dd1e149f40733a87c Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 25 Sep 2021 10:52:05 +0930 Subject: [PATCH] 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. --- binutils/dwarf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 213b5d17877..6e10281a6ed 100644 --- 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 "), 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) { -- 2.30.2