forked from Imagelibrary/binutils-gdb
c05c9914b1
I found a small bug coming from a couple of recent patches of mine for cooked_index_entry::full_name. First, commitaab26529b3(Add "Ada linkage" mode to cooked_index_entry::full_name) added a small hack to optionally compute the Ada linkage name. Then, commitaab2ac34d7(Avoid excessive CU expansion on failed matches) changed the relevant expand_symtabs_matching implementation to use this feature. However, the feature was used unconditionally, causing a bad side effect: the non-canonical name is now used for all languages, not just Ada. But, for C++ this is wrong. Furthermore, consider the declaration of full_name: const char *full_name (struct obstack *storage, bool for_main = false, bool for_ada_linkage = false, const char *default_sep = nullptr) const; ... and then consider this call in cooked_index::dump: gdb_printf (" qualified: %s\n", entry->full_name (&temp_storage, false, "::")); Oops! The "::" is silently converted to 'true' here. To fix both of these problems, this patch changes full_name to accept a flags enum rather than booleans. This avoids the type-safety problem. Then, full_name is changed to remove the "Ada" flag when the entry is not in fact an Ada symbol. Regression tested on x86-64 Fedora 40. Approved-By: Simon Marchi <simon.marchi@efficios.com>
89 lines
2.3 KiB
C
89 lines
2.3 KiB
C
/* DIE parent maps
|
|
|
|
Copyright (C) 2025 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "dwarf2/cooked-index.h"
|
|
#include "dwarf2/read.h"
|
|
#include "dwarf2/parent-map.h"
|
|
|
|
/* Dump MAP as parent_map. */
|
|
|
|
static void
|
|
dump_parent_map (dwarf2_per_bfd *per_bfd, const struct addrmap *map)
|
|
{
|
|
auto_obstack temp_storage;
|
|
|
|
auto annotate_cooked_index_entry
|
|
= [&] (struct ui_file *outfile, CORE_ADDR start_addr, const void *value)
|
|
{
|
|
const cooked_index_entry *parent_entry
|
|
= (const cooked_index_entry *)value;
|
|
|
|
gdb_printf (outfile, "\n\t");
|
|
|
|
bool found = false;
|
|
for (auto sections : {per_bfd->infos, per_bfd->types})
|
|
for (auto section : sections)
|
|
if ((CORE_ADDR)section.buffer <= start_addr
|
|
&& start_addr < (CORE_ADDR) (section.buffer + section.size))
|
|
{
|
|
gdb_printf (outfile, "(section: %s, offset: 0x%" PRIx64 ")",
|
|
section.get_name (),
|
|
start_addr - (CORE_ADDR)section.buffer);
|
|
found = true;
|
|
break;
|
|
}
|
|
|
|
if (!found)
|
|
gdb_printf (outfile, "()");
|
|
|
|
if (parent_entry == nullptr)
|
|
{
|
|
gdb_printf (outfile, " -> ()");
|
|
return;
|
|
}
|
|
|
|
gdb_printf (outfile, " -> (0x%" PRIx64 ": %s)",
|
|
to_underlying (parent_entry->die_offset),
|
|
parent_entry->full_name (&temp_storage));
|
|
};
|
|
|
|
addrmap_dump (const_cast<addrmap *> (map), gdb_stdlog, nullptr,
|
|
annotate_cooked_index_entry);
|
|
}
|
|
|
|
/* See parent-map.h. */
|
|
|
|
void
|
|
parent_map::dump (dwarf2_per_bfd *per_bfd) const
|
|
{
|
|
dump_parent_map (per_bfd, &m_map);
|
|
}
|
|
|
|
/* See parent-map.h. */
|
|
|
|
void
|
|
parent_map_map::dump (dwarf2_per_bfd *per_bfd) const
|
|
{
|
|
for (const auto &iter : m_maps)
|
|
{
|
|
gdb_printf (gdb_stdlog, "map start:\n");
|
|
dump_parent_map (per_bfd, iter);
|
|
}
|
|
}
|