[binutils-gdb] Don't use virtual destructor in addrmap

[binutils-gdb] Don't use virtual destructor in addrmap

[Tom Tromey]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9069d69398649cd9a54e4dcac8548b10ece8a304

commit 9069d69398649cd9a54e4dcac8548b10ece8a304
Author: Tom Tromey <tromey@adacore.com>
Date:   Mon Feb 26 11:39:49 2024 -0700

    Don't use virtual destructor in addrmap
    
    The addrmap polymorphism is sort of "phony" in that there isn't really
    code in the tree that can be presented with either type.  I haven't
    tried to fix this (though perhaps I may); but meanwhile it's handy for
    the next patch if addrmap_fixed has a trivial destructor.  This patch
    achieves this by making the addrmap destructor non-virtual, and also
    making it protected so that objects of any of these types cannot be
    destroyed when only the base class is known.

Diff:
---
 gdb/addrmap.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdb/addrmap.h b/gdb/addrmap.h
index ba83607ad8c..0d61046cebd 100644
--- a/gdb/addrmap.h
+++ b/gdb/addrmap.h
@@ -44,8 +44,6 @@ using addrmap_foreach_const_fn
 /* The base class for addrmaps.  */
 struct addrmap
 {
-  virtual ~addrmap () = default;
-
   /* Return the object associated with ADDR in MAP.  */
   const void *find (CORE_ADDR addr) const
   { return this->do_find (addr); }
@@ -68,6 +66,9 @@ struct addrmap
   { return this->do_foreach (fn); }
 
 
+protected:
+  ~addrmap () = default;
+
 private:
   /* Worker for find, implemented by sub-classes.  */
   virtual void *do_find (CORE_ADDR addr) const = 0;