From 79ddf4a51a789c823d024409aec8712595701a23 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 14 Jan 2024 11:51:38 -0700 Subject: Add move operators for addrmap 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.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gdb/addrmap.h') diff --git a/gdb/addrmap.h b/gdb/addrmap.h index ed52e3c..5378b75 100644 --- a/gdb/addrmap.h +++ b/gdb/addrmap.h @@ -85,9 +85,14 @@ struct addrmap_fixed final : 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: @@ -124,6 +129,18 @@ public: ~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 -- cgit v1.1