[3/7] Add move operators for addrmap
Checks
Commit Message
A subsequent patch needs to move an addrmap. This patch adds the
necessary support. It also changes addrmap_fixed to take a 'const'
addrmap_mutable. This is fine according to the contract of
addrmap_mutable; but it did require a compensating const_cast in the
implementation.
---
gdb/addrmap.c | 12 +++++++-----
gdb/addrmap.h | 19 ++++++++++++++++++-
2 files changed, 25 insertions(+), 6 deletions(-)
@@ -251,12 +251,13 @@ addrmap_mutable::do_find (CORE_ADDR addr) const
}
-addrmap_fixed::addrmap_fixed (struct obstack *obstack, addrmap_mutable *mut)
+addrmap_fixed::addrmap_fixed (struct obstack *obstack,
+ const addrmap_mutable *mut)
{
size_t transition_count = 0;
/* Count the number of transitions in the tree. */
- mut->foreach ([&] (CORE_ADDR start, void *obj)
+ mut->foreach ([&] (CORE_ADDR start, const void *obj)
{
++transition_count;
return 0;
@@ -274,10 +275,10 @@ addrmap_fixed::addrmap_fixed (struct obstack *obstack, addrmap_mutable *mut)
/* Copy all entries from the splay tree to the array, in order
of increasing address. */
- mut->foreach ([&] (CORE_ADDR start, void *obj)
+ mut->foreach ([&] (CORE_ADDR start, const void *obj)
{
transitions[num_transitions].addr = start;
- transitions[num_transitions].value = obj;
+ transitions[num_transitions].value = const_cast<void *> (obj);
++num_transitions;
return 0;
});
@@ -345,7 +346,8 @@ addrmap_mutable::addrmap_mutable ()
addrmap_mutable::~addrmap_mutable ()
{
- splay_tree_delete (tree);
+ if (tree != nullptr)
+ splay_tree_delete (tree);
}
@@ -84,9 +84,14 @@ struct addrmap_fixed : public addrmap,
{
public:
- addrmap_fixed (struct obstack *obstack, addrmap_mutable *mut);
+ addrmap_fixed (struct obstack *obstack, const addrmap_mutable *mut);
DISABLE_COPY_AND_ASSIGN (addrmap_fixed);
+ /* It's fine to use the default move operators, because this addrmap
+ does not own the storage for the elements. */
+ addrmap_fixed (addrmap_fixed &&other) = default;
+ addrmap_fixed &operator= (addrmap_fixed &&) = default;
+
void relocate (CORE_ADDR offset) override;
private:
@@ -123,6 +128,18 @@ struct addrmap_mutable : public addrmap
~addrmap_mutable ();
DISABLE_COPY_AND_ASSIGN (addrmap_mutable);
+ addrmap_mutable (addrmap_mutable &&other)
+ : tree (other.tree)
+ {
+ other.tree = nullptr;
+ }
+
+ addrmap_mutable &operator= (addrmap_mutable &&other)
+ {
+ std::swap (tree, other.tree);
+ return *this;
+ }
+
/* In the mutable address map MAP, associate the addresses from START
to END_INCLUSIVE that are currently associated with NULL with OBJ
instead. Addresses mapped to an object other than NULL are left