espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-22 19:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

gas/Dwarf5: drop dead code

Browse Source 
Commit 3417bfca676f ("GAS: DWARF-5: Ensure that the 0'th entry in the
directory table contains the current... ") added a "dwarf_level < 5"
check to out_dir_and_file_list(). This rendered dead that branch of the
construct, due to the enclosing if()'s "DWARF2_LINE_VERSION >= 5".
Delete that code as well as the corresponding part of the comment.

While there also drop a redundant "dirs != NULL": "dirs" will always be
non-NULL when dirs_in_use is not zero.
This commit is contained in:
Jan Beulich
2022-03-23 08:47:41 +01:00
parent 7992631e8c
commit 47513fab28
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gas/dwarf2dbg.c
View File

@ -2170,18 +2170,10 @@ out_dir_and_file_list (segT line_seg, int sizeof_offset)
line_str_seg->entsize = 1; line_str_seg->entsize = 1;
/* DWARF5 uses slot zero, but that is only set explicitly /* DWARF5 uses slot zero, but that is only set explicitly
using a .file 0 directive. If that isn't used, but dir using a .file 0 directive. Otherwise use pwd as main file
one is used, then use that as main file directory. directory. */
Otherwise use pwd as main file directory. */ if (dirs_in_use > 0 && dirs[0] != NULL)
if (dirs_in_use > 0 && dirs != NULL && dirs[0] != NULL)
dir = remap_debug_filename (dirs[0]); dir = remap_debug_filename (dirs[0]);
else if (dirs_in_use > 1
&& dirs != NULL
&& dirs[1] != NULL
/* DWARF-5 directory tables expect dir[0] to be the same as
DW_AT_comp_dir, which is the same as pwd. */
&& dwarf_level < 5)
dir = remap_debug_filename (dirs[1]);
else else
dir = remap_debug_filename (getpwd ()); dir = remap_debug_filename (getpwd ());