diff options
author | Tom Tromey <tromey@adacore.com> | 2023-01-27 09:20:43 -0700 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2023-01-27 14:12:01 -0700 |
commit | 35e1763185224b2bf634e19cdfd06dab0ba914e3 (patch) | |
tree | f7dd44aeffd0ede58573d7d80dc3304f8b4b6dab | |
parent | d9195131530370f56e78a2b084928c11da536d9e (diff) | |
download | binutils-gdb-35e1763185224b2bf634e19cdfd06dab0ba914e3.tar.gz |
More const-correctness in cooked indexer
I noticed that iterating over the index yields non-const
cooked_index_entry objects. However, after finalization, they should
not be modified. This patch enforces this by adding const where
needed.
v2 makes the find, all_entries, and wait methods const as well.
-rw-r--r-- | gdb/dwarf2/cooked-index.c | 8 | ||||
-rw-r--r-- | gdb/dwarf2/cooked-index.h | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index 09b3fd70b26..1a568e6aae7 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -355,11 +355,11 @@ cooked_index::do_finalize () /* See cooked-index.h. */ cooked_index::range -cooked_index::find (const std::string &name, bool completing) +cooked_index::find (const std::string &name, bool completing) const { wait (); - auto lower = std::lower_bound (m_entries.begin (), m_entries.end (), name, + auto lower = std::lower_bound (m_entries.cbegin (), m_entries.cend (), name, [=] (const cooked_index_entry *entry, const std::string &n) { @@ -367,7 +367,7 @@ cooked_index::find (const std::string &name, bool completing) completing); }); - auto upper = std::upper_bound (m_entries.begin (), m_entries.end (), name, + auto upper = std::upper_bound (m_entries.cbegin (), m_entries.cend (), name, [=] (const std::string &n, const cooked_index_entry *entry) { @@ -413,7 +413,7 @@ cooked_index_vector::get_addrmaps () /* See cooked-index.h. */ cooked_index_vector::range -cooked_index_vector::find (const std::string &name, bool completing) +cooked_index_vector::find (const std::string &name, bool completing) const { std::vector<cooked_index::range> result_range; result_range.reserve (m_vector.size ()); diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index 55eaf9955ab..e12376cdf98 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -217,7 +217,7 @@ public: void finalize (); /* Wait for this index's finalization to be complete. */ - void wait () + void wait () const { m_future.wait (); } @@ -225,19 +225,20 @@ public: friend class cooked_index_vector; /* A simple range over part of m_entries. */ - typedef iterator_range<std::vector<cooked_index_entry *>::iterator> range; + typedef iterator_range<std::vector<cooked_index_entry *>::const_iterator> + range; /* Return a range of all the entries. */ - range all_entries () + range all_entries () const { wait (); - return { m_entries.begin (), m_entries.end () }; + return { m_entries.cbegin (), m_entries.cend () }; } /* Look up an entry by name. Returns a range of all matching results. If COMPLETING is true, then a larger range, suitable for completion, will be returned. */ - range find (const std::string &name, bool completing); + range find (const std::string &name, bool completing) const; private: @@ -317,7 +318,7 @@ public: /* Wait until the finalization of the entire cooked_index_vector is done. */ - void wait () + void wait () const { for (auto &item : m_vector) item->wait (); @@ -340,10 +341,10 @@ public: /* Look up an entry by name. Returns a range of all matching results. If COMPLETING is true, then a larger range, suitable for completion, will be returned. */ - range find (const std::string &name, bool completing); + range find (const std::string &name, bool completing) const; /* Return a range of all the entries. */ - range all_entries () + range all_entries () const { std::vector<cooked_index::range> result_range; result_range.reserve (m_vector.size ()); |