{ctf,dwarf}-reader.cc: Fix a virtual method name conflict in elf_base_reader

GCC 15 (rightfully) complains about a new
{ctf,dwarf}::reader::initialize method that shadows existing
elf_base_reader::initialize methods with a different parameters set.

This patch fixes that issue by renaming that dwarf::reader::initialize
method into dwarf::reader::reset.

	* src/abg-ctf-reader.cc (ctf::reader::initialize): Adjust.
	(ctf::reader::reset): Rename ctf::reader::initialize into this.
	* src/abg-dwarf-reader.cc (reader::initialize): Adjust.
	(dwarf::reader::reset): Rename dwarf::reader::initialize into
	this.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2025-02-12 16:40:38 +01:00
parent 90dcc75cdc
commit 09cdee8c06
2 changed files with 6 additions and 6 deletions

View File

@ -266,7 +266,7 @@ public:
: elf_based_reader(elf_path, debug_info_root_paths, env),
ctfa(), ctf_sect(), symtab_sect(), strtab_sect()
{
initialize();
reset();
}
/// Initializer of the reader.
@ -282,7 +282,7 @@ public:
/// the context uses resources that are allocated in the
/// environment.
void
initialize()
reset()
{
types_to_canonicalize.clear();
cur_tu_.reset();
@ -315,7 +315,7 @@ public:
bool load_all_types = false,
bool linux_kernel_mode = false)
{
initialize();
reset();
load_all_types = load_all_types;
linux_kernel_mode = linux_kernel_mode;
elf_based_reader::initialize(elf_path, debug_info_root_paths);

View File

@ -2119,7 +2119,7 @@ protected:
debug_info_root_paths,
environment)
{
initialize(load_all_types, linux_kernel_mode);
reset(load_all_types, linux_kernel_mode);
}
/// Clear the statistics for reading the current corpus.
@ -2144,7 +2144,7 @@ public:
/// special linux kernel symbol tables when determining if a symbol
/// is exported or not.
void
initialize(bool load_all_types, bool linux_kernel_mode)
reset(bool load_all_types, bool linux_kernel_mode)
{
dwarf_version_ = 0;
cur_tu_die_ = 0;
@ -2217,7 +2217,7 @@ public:
bool linux_kernel_mode)
{
elf_based_reader::initialize(elf_path, debug_info_root_paths);
initialize(load_all_types, linux_kernel_mode);
reset(load_all_types, linux_kernel_mode);
}
/// Create an instance of DWARF Reader.