From: Patrick Palka <ppalka@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org, Patrick Palka <ppalka@redhat.com>
Subject: [PATCH] libstdc++: Implement LWG 3820/3849 changes to cartesian_product_view
Date: Wed, 8 Mar 2023 10:11:33 -0500 [thread overview]
Message-ID: <20230308151133.152110-1-ppalka@redhat.com> (raw)
The LWG 3820 testcase revealed a bug in _M_advance, which this patch
also fixes.
Tested on x86_64-pc-linux-gnu, does this look OK for trunk?
libstdc++-v3/ChangeLog:
* include/std/ranges
(cartesian_product_view::_Iterator::_Iterator): Remove
constraint on default constructor as per LWG 3849.
(cartesian_product_view::_Iterator::_M_prev): Adjust position
of _Nm > 0 test as per LWG 3820.
(cartesian_product_view::_Iterator::_M_advance): Perform bound
checking only on sized cartesian products.
* testsuite/std/ranges/cartesian_product/1.cc (test08): New test.
---
libstdc++-v3/include/std/ranges | 23 +++++++++++--------
.../std/ranges/cartesian_product/1.cc | 9 ++++++++
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 67566c6ebcf..14f38727198 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -8225,7 +8225,7 @@ namespace views::__adaptor
range_reference_t<__maybe_const_t<_Const, _Vs>>...>;
using difference_type = decltype(cartesian_product_view::_S_difference_type());
- _Iterator() requires forward_range<__maybe_const_t<_Const, _First>> = default;
+ _Iterator() = default;
constexpr
_Iterator(_Iterator<!_Const> __i)
@@ -8390,12 +8390,12 @@ namespace views::__adaptor
_M_prev()
{
auto& __it = std::get<_Nm>(_M_current);
- if (__it == ranges::begin(std::get<_Nm>(_M_parent->_M_bases)))
- {
- __it = __detail::__cartesian_common_arg_end(std::get<_Nm>(_M_parent->_M_bases));
- if constexpr (_Nm > 0)
+ if constexpr (_Nm > 0)
+ if (__it == ranges::begin(std::get<_Nm>(_M_parent->_M_bases)))
+ {
+ __it = __detail::__cartesian_common_arg_end(std::get<_Nm>(_M_parent->_M_bases));
_M_prev<_Nm - 1>();
- }
+ }
--__it;
}
@@ -8416,10 +8416,13 @@ namespace views::__adaptor
if constexpr (_Nm == 0)
{
#ifdef _GLIBCXX_ASSERTIONS
- auto __size = ranges::ssize(__r);
- auto __begin = ranges::begin(__r);
- auto __offset = __it - __begin;
- __glibcxx_assert(__offset + __x >= 0 && __offset + __x <= __size);
+ if constexpr (sized_range<__maybe_const_t<_Const, _First>>)
+ {
+ auto __size = ranges::ssize(__r);
+ auto __begin = ranges::begin(__r);
+ auto __offset = __it - __begin;
+ __glibcxx_assert(__offset + __x >= 0 && __offset + __x <= __size);
+ }
#endif
__it += __x;
}
diff --git a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc
index f52c2b96d58..56ff3d152c6 100644
--- a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc
@@ -201,6 +201,14 @@ test07()
VERIFY( i == 5 );
}
+void
+test08()
+{
+ // LWG 3820
+ auto r = std::views::cartesian_product(std::views::iota(0));
+ r.begin() += 3; // hard error
+}
+
int
main()
{
@@ -211,4 +219,5 @@ main()
test05();
static_assert(test06());
test07();
+ test08();
}
--
2.40.0.rc0.57.g454dfcbddf
next reply other threads:[~2023-03-08 15:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 15:11 Patrick Palka [this message]
2023-03-09 18:00 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230308151133.152110-1-ppalka@redhat.com \
--to=ppalka@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).