]> git.ipfire.org Git - thirdparty/gcc.git/commit
libstdc++: Fix ranges::search_n for random access iterators [PR97828]
authorPatrick Palka <ppalka@redhat.com>
Tue, 17 Nov 2020 15:28:20 +0000 (10:28 -0500)
committerPatrick Palka <ppalka@redhat.com>
Tue, 17 Nov 2020 15:32:08 +0000 (10:32 -0500)
commit04cb64dadb5c115b4ad093ff92c3f5a0a87ef15f
treeaaba0127d6f6f7d197488975c2e2031fa48a4b12
parent98ba03ffe0b9f37b4916ce6238fad754e00d720b
libstdc++: Fix ranges::search_n for random access iterators [PR97828]

My ranges transcription of the std::search_n implementation for random
access iterators missed a crucial part of the algorithm which the
existing tests didn't exercise.  When __remainder is less than __count
at the start of an iteration of the outer while loop, it means we're
continuing a partial match of __count - __remainder elements from the
previous iteration.  If at the end of the iteration we don't complete
this partial match, we need to reset __remainder so that it's only
offset by the size of the most recent partial match before starting the
next iteration.

This patch fixes this appropriately, mirroring how it's done in the
corresponding std::search_n implementation.

libstdc++-v3/ChangeLog:

PR libstdc++/97828
* include/bits/ranges_algo.h (__search_n_fn::operator()): Check
random_access_iterator before using the backtracking
implementation.  When the backwards scan fails prematurely,
reset __remainder appropriately.
* testsuite/25_algorithms/search_n/97828.cc: New test.

(cherry picked from commit 8661f4faa875f361cd22a197774c1fa04cd0580b)
libstdc++-v3/include/bits/ranges_algo.h
libstdc++-v3/testsuite/25_algorithms/search_n/97828.cc [new file with mode: 0644]