From fc898b42e355fef58e6a029799fdd71b9dda5dc6 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 30 Dec 2017 00:10:05 -0500 Subject: [PATCH] Make mapped_debug_names and mapped_index final When compiling with Clang 6, I see these warnings: /home/emaisin/src/binutils-gdb/gdb/dwarf2read.c:25421:5: error: destructor called on non-final 'mapped_index' that has virtual functions but non-virtual destructor [-Werror,-Wdelete-non-virtual-dtor] data->index_table->~mapped_index (); ^ In file included from /home/emaisin/src/binutils-gdb/gdb/dwarf2read.c:31: In file included from /home/emaisin/src/binutils-gdb/gdb/defs.h:28: In file included from /home/emaisin/src/binutils-gdb/gdb/common/common-defs.h:92: In file included from /home/emaisin/src/binutils-gdb/gdb/common/gdb_unique_ptr.h:23: In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/memory:81: /usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h:76:2: error: delete called on non-final 'mapped_debug_names' that has virtual functions but non-virtual destructor [-Werror,-Wdelete-non-virtual-dtor] delete __ptr; ^ /usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h:236:4: note: in instantiation of member function 'std::default_delete::operator()' requested here get_deleter()(__ptr); ^ /home/emaisin/src/binutils-gdb/gdb/dwarf2read.c:2374:21: note: in instantiation of member function 'std::unique_ptr >::~unique_ptr' requested here dwarf2_per_objfile::dwarf2_per_objfile (struct objfile *objfile_, ^ This patch silences these warnings by making the classes final. gdb/ChangeLog: * dwarf2read.c (struct mapped_debug_names): Make final. (struct mapped_index): Make final. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9cc060e6d96..b94384b2829 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-12-30 Simon Marchi + + * dwarf2read.c (struct mapped_debug_names): Make final. + (struct mapped_index): Make final. + 2017-12-29 Simon Marchi * common/diagnostics.h diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 484cbcee186..85e33f0f9dd 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -277,7 +277,7 @@ protected: /* A description of the mapped index. The file format is described in a comment by the code that writes the index. */ -struct mapped_index : public mapped_index_base +struct mapped_index final : public mapped_index_base { /* A slot/bucket in the symbol table hash. */ struct symbol_table_slot @@ -318,7 +318,7 @@ struct mapped_index : public mapped_index_base /* A description of the mapped .debug_names. Uninitialized map has CU_COUNT 0. */ -struct mapped_debug_names : public mapped_index_base +struct mapped_debug_names final : public mapped_index_base { bfd_endian dwarf5_byte_order; bool dwarf5_is_dwarf64; -- 2.30.2