mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-05 23:23:09 +00:00
774d21c10b
Using the following patch, I would get this build failure:
CXX breakpoint.o
In file included from /usr/include/c++/13.1.1/bits/stl_algobase.h:66,
from /usr/include/c++/13.1.1/bits/hashtable_policy.h:36,
from /usr/include/c++/13.1.1/bits/hashtable.h:35,
from /usr/include/c++/13.1.1/bits/unordered_map.h:33,
from /usr/include/c++/13.1.1/unordered_map:41,
from /usr/include/c++/13.1.1/functional:63,
from /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/ptid.h:35,
from /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/common-defs.h:206,
from /home/smarchi/src/binutils-gdb/gdb/defs.h:26,
from /home/smarchi/src/binutils-gdb/gdb/breakpoint.c:20:
/usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h: In instantiation of ‘constexpr void std::__advance(_BidirectionalIterator&, _Distance, bidirectional_iterator_tag) [with _BidirectionalIterator = reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >; _Distance = long int]’:
/usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:224:21: required from ‘constexpr void std::advance(_InputIterator&, _Distance) [with _InputIterator = reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >; _Distance = long int]’
/usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:237:19: required from ‘constexpr _InputIterator std::next(_InputIterator, typename iterator_traits<_Iter>::difference_type) [with _InputIterator = reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >; typename iterator_traits<_Iter>::difference_type = long int]’
/home/smarchi/src/binutils-gdb/gdb/breakpoint.c:1073:19: required from here
/usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:179:11: error: no match for ‘operator--’ (operand type is ‘reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >’)
179 | --__i;
| ^~~~~
This points out that while intrusive_list_iterator has an operator--,
the reference_to_pointer_iterator wrapper does not. I'm not to sure why
the compiler chooses the overload of __advance that accepts a
_BidirectionalIterator, given that reference_to_pointer_iterator can't
be decremented, but adding those operators seems like the right thing to
do in any case, for completeness.
Change-Id: I8e2044b6734fadf0f21093047cf35bb7080dbdc3
Reviewed-By: Andrew Burgess <aburgess@redhat.com>
101 lines
3.1 KiB
C++
101 lines
3.1 KiB
C++
/* An iterator wrapper that yields pointers instead of references.
|
|
Copyright (C) 2021-2023 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef GDBSUPPORT_REFERENCE_TO_POINTER_ITERATOR_H
|
|
#define GDBSUPPORT_REFERENCE_TO_POINTER_ITERATOR_H
|
|
|
|
/* Wrap an iterator that yields references to objects so that it yields
|
|
pointers to objects instead.
|
|
|
|
This is useful for example to bridge the gap between iterators on intrusive
|
|
lists, which yield references, and the rest of GDB, which for legacy reasons
|
|
expects to iterate on pointers. */
|
|
|
|
template <typename IteratorType>
|
|
struct reference_to_pointer_iterator
|
|
{
|
|
using self_type = reference_to_pointer_iterator;
|
|
using value_type = typename IteratorType::value_type *;
|
|
using reference = typename IteratorType::value_type *&;
|
|
using pointer = typename IteratorType::value_type **;
|
|
using iterator_category = typename IteratorType::iterator_category;
|
|
using difference_type = typename IteratorType::difference_type;
|
|
|
|
/* Construct a reference_to_pointer_iterator, passing args to the underyling
|
|
iterator. */
|
|
template <typename... Args>
|
|
reference_to_pointer_iterator (Args &&...args)
|
|
: m_it (std::forward<Args> (args)...)
|
|
{}
|
|
|
|
/* Create a past-the-end iterator.
|
|
|
|
Assumes that default-constructing an underlying iterator creates a
|
|
past-the-end iterator. */
|
|
reference_to_pointer_iterator ()
|
|
{}
|
|
|
|
/* Need these as the variadic constructor would be a better match
|
|
otherwise. */
|
|
reference_to_pointer_iterator (reference_to_pointer_iterator &) = default;
|
|
reference_to_pointer_iterator (const reference_to_pointer_iterator &) = default;
|
|
reference_to_pointer_iterator (reference_to_pointer_iterator &&) = default;
|
|
|
|
reference_to_pointer_iterator &operator= (const reference_to_pointer_iterator &) = default;
|
|
reference_to_pointer_iterator &operator= (reference_to_pointer_iterator &&) = default;
|
|
|
|
value_type operator* () const
|
|
{ return &*m_it; }
|
|
|
|
self_type &operator++ ()
|
|
{
|
|
++m_it;
|
|
return *this;
|
|
}
|
|
|
|
self_type &operator++ (int)
|
|
{
|
|
m_it++;
|
|
return *this;
|
|
}
|
|
|
|
self_type &operator-- ()
|
|
{
|
|
--m_it;
|
|
return *this;
|
|
}
|
|
|
|
self_type &operator-- (int)
|
|
{
|
|
m_it--;
|
|
return *this;
|
|
}
|
|
|
|
bool operator== (const self_type &other) const
|
|
{ return m_it == other.m_it; }
|
|
|
|
bool operator!= (const self_type &other) const
|
|
{ return m_it != other.m_it; }
|
|
|
|
private:
|
|
/* The underlying iterator. */
|
|
IteratorType m_it;
|
|
};
|
|
|
|
#endif /* GDBSUPPORT_REFERENCE_TO_POINTER_ITERATOR_H */
|