Skip to content

Commit a5d919b

Browse files
authored
[libc++] Disallow std::prev(non_cpp17_bidi_iterator) (#112102)
The std::prev function appeared to work on non Cpp17BidirectionalIterators, however it behaved strangely by being the identity function. That was extremely misleading and potentially dangerous, since several recent iterators that are C++20 bidirectional_iterators don't satisfy the Cpp17BidirectionalIterator named requirement. For example: auto zv = std::views::zip(vec1, vec2); auto it = zv.begin() + 5; auto it2 = std::prev(it); // "it2" will be the same as "it", instead of the previous one Here, zip_view::iterator is a c++20 random_access_iterator, but it only satisfies the Cpp17InputIterator named requirement because its reference type is a proxy type. Hence `std::prev` would silently accept that iterator but it would do a no-op instead of going to the previous position. This patch changes `std::prev(it)` to produce an error at compile-time when instantiated with a type that is not a Cpp17BidirectionalIterator. Fixes #109456
1 parent c2293b3 commit a5d919b

File tree

2 files changed

+36
-1
lines changed
  • libcxx

2 files changed

+36
-1
lines changed

libcxx/include/__iterator/prev.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@
1717
#include <__iterator/incrementable_traits.h>
1818
#include <__iterator/iterator_traits.h>
1919
#include <__type_traits/enable_if.h>
20+
#include <__utility/move.h>
2021

2122
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2223
# pragma GCC system_header
2324
#endif
2425

26+
_LIBCPP_PUSH_MACROS
27+
#include <__undef_macros>
28+
2529
_LIBCPP_BEGIN_NAMESPACE_STD
2630

2731
template <class _InputIter, __enable_if_t<__has_input_iterator_category<_InputIter>::value, int> = 0>
2832
[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 _InputIter
29-
prev(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n = 1) {
33+
prev(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n) {
3034
// Calling `advance` with a negative value on a non-bidirectional iterator is a no-op in the current implementation.
3135
// Note that this check duplicates the similar check in `std::advance`.
3236
_LIBCPP_ASSERT_PEDANTIC(__n <= 0 || __has_bidirectional_iterator_category<_InputIter>::value,
@@ -35,6 +39,16 @@ prev(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n =
3539
return __x;
3640
}
3741

42+
// LWG 3197
43+
// It is unclear what the implications of "BidirectionalIterator" in the standard are.
44+
// However, calling std::prev(non-bidi-iterator) is obviously an error and we should catch it at compile time.
45+
template <class _InputIter, __enable_if_t<__has_input_iterator_category<_InputIter>::value, int> = 0>
46+
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 _InputIter prev(_InputIter __it) {
47+
static_assert(__has_bidirectional_iterator_category<_InputIter>::value,
48+
"Attempt to prev(it) with a non-bidirectional iterator");
49+
return std::prev(std::move(__it), 1);
50+
}
51+
3852
#if _LIBCPP_STD_VER >= 20
3953

4054
// [range.iter.op.prev]
@@ -70,4 +84,6 @@ inline constexpr auto prev = __prev{};
7084

7185
_LIBCPP_END_NAMESPACE_STD
7286

87+
_LIBCPP_POP_MACROS
88+
7389
#endif // _LIBCPP___ITERATOR_PREV_H
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
// std::prev
10+
11+
#include <iterator>
12+
#include "test_iterators.h"
13+
14+
void test() {
15+
int arr[] = {1, 2};
16+
cpp17_input_iterator<int*> it(&arr[0]);
17+
it = std::prev(it);
18+
// expected-error-re@*:* {{static assertion failed due to requirement {{.*}}: Attempt to prev(it) with a non-bidirectional iterator}}
19+
}

0 commit comments

Comments
 (0)