Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-11-16 12:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdb/objfiles: use filtered_iterator as objfile::section_iterator

Browse Source 
objfile::section_iterator looks like a good candidate to be implemented
with filtered_iterator.  Following the enhancements to filtered_iterator
in the previous patch, it's pretty straighforward.

I removed the non-const version of objfile::sections, because it didn't
seem useful to have the two methods returning the exact same type and
value.  Having just the const version achieves the same thing.

Change-Id: I2f29c2fb3f95605cb816cc1ff8935c10e0496052
Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Simon Marchi
2025-08-28 11:10:51 -04:00
committed by Simon Marchi
parent 1e10e9ea96
commit 02ecff0c71
1 changed files with 8 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
gdb/objfiles.h
View File

@@ -657,61 +657,18 @@ public:
this->section_offsets[idx] = offset;
}
class section_iterator
/* Filter function for section_iterator. */
struct filter_out_null_bfd_section
{
public:
section_iterator (const section_iterator &) = default;
section_iterator (section_iterator &&) = default;
section_iterator &operator= (const section_iterator &) = default;
section_iterator &operator= (section_iterator &&) = default;
using self_type = section_iterator;
using reference = obj_section &;
reference operator* ()
{ return *m_iter; }
section_iterator &operator++ ()
{
++m_iter;
skip_null ();
return *this;
}
bool operator== (const section_iterator &other) const
{ return m_iter == other.m_iter && m_end == other.m_end; }
bool operator!= (const section_iterator &other) const
{ return !(*this == other); }
private:
friend class objfile;
section_iterator (obj_section *iter, obj_section *end)
: m_iter (iter),
m_end (end)
{
skip_null ();
}
void skip_null ()
{
while (m_iter < m_end && m_iter->the_bfd_section == nullptr)
++m_iter;
}
obj_section *m_iter;
obj_section *m_end;
bool operator() (const obj_section &sec) const noexcept
{ return sec.the_bfd_section != nullptr; }
};
iterator_range<section_iterator> sections ()
{
return (iterator_range<section_iterator>
(section_iterator (sections_start, sections_end),
section_iterator (sections_end, sections_end)));
}
using section_iterator = filtered_iterator<obj_section *, filter_out_null_bfd_section>;
/* Return an iterable that yields the "non-null" sections of this objfile.
That is, the sections for which obj_section::the_bfd_section is
non-nullptr. */
iterator_range<section_iterator> sections () const
{
return (iterator_range<section_iterator>