This simplifies the minimal symbol iterator, by using
minimal_symbol_count and just doing a somewhat ordinary array-like
iteration. array_view is nearly usable, except that it is more
convenient for this iterator to return pointers rather than
references.
gdb/ChangeLog
2019-01-16 Tom Tromey <tom@tromey.com>
* objfiles.h (class objfile_msymbols) <iterator>: Change argument
type. Remove no-argument constructor.
<iterator::operator++>: Simplify.
<begin>: Update.
<end>: Use minimal_symbol_count.
2019-01-16 Tom Tromey <tom@tromey.com>
2019-01-16 Tom Tromey <tom@tromey.com>
+ * objfiles.h (class objfile_msymbols) <iterator>: Change argument
+ type. Remove no-argument constructor.
+ <iterator::operator++>: Simplify.
+ <begin>: Update.
+ <end>: Use minimal_symbol_count.
+
+2019-01-16 Tom Tromey <tom@tromey.com>
+
* objfiles.h (struct objfile) <psymtabs>: New method.
(class objfile_psymtabs): Remove.
* psymtab.h (class psymtab_storage) <partial_symtab_range>: New
* objfiles.h (struct objfile) <psymtabs>: New method.
(class objfile_psymtabs): Remove.
* psymtab.h (class psymtab_storage) <partial_symtab_range>: New
typedef std::forward_iterator_tag iterator_category;
typedef int difference_type;
typedef std::forward_iterator_tag iterator_category;
typedef int difference_type;
- explicit iterator (struct objfile *objfile)
- : m_msym (objfile->per_bfd->msymbols)
+ explicit iterator (struct minimal_symbol *msym)
+ : m_msym (msym)
- /* Make sure to properly handle the case where there are no
- minsyms. */
- if (MSYMBOL_LINKAGE_NAME (m_msym) == nullptr)
- m_msym = nullptr;
- iterator ()
- : m_msym (nullptr)
- {
- }
-
value_type operator* () const
{
return m_msym;
value_type operator* () const
{
return m_msym;
self_type &operator++ ()
{
self_type &operator++ ()
{
- if (m_msym != nullptr)
- {
- ++m_msym;
- if (MSYMBOL_LINKAGE_NAME (m_msym) == nullptr)
- m_msym = nullptr;
- }
iterator begin () const
{
iterator begin () const
{
- return iterator (m_objfile);
+ return iterator (m_objfile->per_bfd->msymbols);
}
iterator end () const
{
}
iterator end () const
{
+ return iterator (m_objfile->per_bfd->msymbols
+ + m_objfile->per_bfd->minimal_symbol_count);