diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2024-03-25 14:27:59 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2024-03-25 21:48:24 -0400 |
| commit | 1859fcf17799209720ef3431464139e5098ee91b (patch) | |
| tree | 735596be1e9ede71661b0c74feb2d15cab58d309 | |
| parent | 00bd12130c79752479dc327e81a00c53da60ef2c (diff) | |
| download | gdb-1859fcf17799209720ef3431464139e5098ee91b.zip gdb-1859fcf17799209720ef3431464139e5098ee91b.tar.gz gdb-1859fcf17799209720ef3431464139e5098ee91b.tar.bz2 | |
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<addrmap_mutable>::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<addrmap_mutable>::~unique_ptr' requested here
422 | auto map = std::make_unique<struct addrmap_mutable> ();
| ^
Fix that by making `addrmap_mutable` final, and `addrmap_fixed` too
while at it.
Change-Id: I03aa0b0907c8d0e3390ddbedeb77d73b19b2b526
Approved-By: Tom Tromey <tom@tromey.com>
| -rw-r--r-- | gdb/addrmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/addrmap.h b/gdb/addrmap.h index 55dea36..ed52e3c 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<addrmap_fixed> +struct addrmap_fixed final : public addrmap, + public allocate_on_obstack<addrmap_fixed> { public: @@ -116,7 +116,7 @@ private: /* Mutable address maps. */ -struct addrmap_mutable : public addrmap +struct addrmap_mutable final : public addrmap { public: |