From: Simon Marchi Date: Mon, 25 Mar 2024 18:27:59 +0000 (-0400) Subject: gdb: mark addrmap classes `final` X-Git-Tag: gdb-15-branchpoint~613 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1859fcf17799209720ef3431464139e5098ee91b;p=thirdparty%2Fbinutils-gdb.git gdb: mark addrmap classes `final` When building GDB with clang, I see: /usr/lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/unique_ptr.h:95:2: error: delete called on non-final 'addrmap_mutable' that has virtual functions but non-virtual destructor [-Werror,-Wdelete-non -abstract-non-virtual-dtor] 95 | delete __ptr; | ^ /usr/lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/unique_ptr.h:396:4: note: in instantiation of member function 'std::default_delete::operator()' requested here 396 | get_deleter()(std::move(__ptr)); | ^ /home/smarchi/src/binutils-gdb/gdb/addrmap.c:422:14: note: in instantiation of member function 'std::unique_ptr::~unique_ptr' requested here 422 | auto map = std::make_unique (); | ^ Fix that by making `addrmap_mutable` final, and `addrmap_fixed` too while at it. Change-Id: I03aa0b0907c8d0e3390ddbedeb77d73b19b2b526 Approved-By: Tom Tromey --- diff --git a/gdb/addrmap.h b/gdb/addrmap.h index 55dea36b877..ed52e3cd990 100644 --- a/gdb/addrmap.h +++ b/gdb/addrmap.h @@ -80,8 +80,8 @@ private: struct addrmap_mutable; /* Fixed address maps. */ -struct addrmap_fixed : public addrmap, - public allocate_on_obstack +struct addrmap_fixed final : public addrmap, + public allocate_on_obstack { public: @@ -116,7 +116,7 @@ private: /* Mutable address maps. */ -struct addrmap_mutable : public addrmap +struct addrmap_mutable final : public addrmap { public: