FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bfd/Dwarf2: make find-nearest-line returned function name consistent

Browse source 
Prior to entering the enclosing "else if()" the earlier associated if()
checks function->is_linkage and, if set, uses function->name. The
comment in patch context precedes (and explains) the setting
function->is_linkage. Yet with the flag set, we should then also return
the function name, just like said earlier if() would do when we came
here a 2nd time for the same "addr". And indeed passing the same address
twice on addr2line's command line would resolve the function for the 2nd
instance, but not for the 1st (if this code path is taken). (This,
obviously, is particularly relevant when there's no ELF symbol table in
the first place, like would be the case - naturally - in PE/COFF
binaries, for example.)
This commit is contained in:
Jan Beulich 2022-03-29 08:18:49 +02:00
parent be13be5b68
commit f3bbd5c389
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/dwarf2.c
View file

@ -5295,8 +5295,9 @@ _bfd_dwarf2_find_nearest_line (bfd *abfd,
sec_vma = section->vma; sec_vma = section->vma;
if (section->output_section != NULL) if (section->output_section != NULL)
sec_vma = section->output_section->vma + section->output_offset; sec_vma = section->output_section->vma + section->output_offset;
if (fun != NULL if (fun == NULL)
&& fun->value + sec_vma == function->arange.low) *functionname_ptr = function->name;
else if (fun->value + sec_vma == function->arange.low)
function->name = *functionname_ptr; function->name = *functionname_ptr;
/* Even if we didn't find a linkage name, say that we have /* Even if we didn't find a linkage name, say that we have
to stop a repeated search of symbols. */ to stop a repeated search of symbols. */