From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id E50703858289 for ; Wed, 8 Mar 2023 15:11:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E50703858289 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678288305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0hZ5puViUYy2EMhnH18c1trgs342P9cpZOUWQDRq4A=; b=aeHAMUPvksFE4r0QNalJgD3wnP785MlkM1FlART/zlKhqyNC06UJnEDtcHV8gODhaUBF2Z fVbtDTvnxX9inDQVhRlJxYMk5uxFuJwPwPWQ8kSH6M1rB3H/daSmWCMbNEPoKk9bVnTX2y LXhCwIIs6PMWDqSUESvkT6cx/lhSCMQ= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-344-vQyb8f8qPOubrBked1K2rg-1; Wed, 08 Mar 2023 10:11:44 -0500 X-MC-Unique: vQyb8f8qPOubrBked1K2rg-1 Received: by mail-qt1-f200.google.com with SMTP id p7-20020ac84607000000b003b9b6101f65so9248204qtn.11 for ; Wed, 08 Mar 2023 07:11:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678288303; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=t0hZ5puViUYy2EMhnH18c1trgs342P9cpZOUWQDRq4A=; b=gNs+9mpT8lwv5NR2p4PpS1z9fzR+DOgh+vdaHgghU3uEXjk0d1BiTsrlRNv0SPz3nz LVjzIxcF2K1GpFLBuJT17Cg7PCzlYs70OMM1o9+yC109y2KKDu1BgHO/JoLG0bajP6YB +IzjcEKrIHrDu9LnkJI0wGZ7a++NTajrXAA2H+ZaozdqzGI2tIJDOq24vd35hanopM3z zLd1tZMjudRCNApdlRIqbvFI5lmXNgVL12ksykXWF+Q+pMA1QP3uEp91RzZTXeOfGW13 r8M6Rm3xrJsRlBtazG2KQ8wCHOolZ5GbaqAlQ2Nai5uB9xcF1b81bVjXxKZMPpdea6qp g5Xg== X-Gm-Message-State: AO0yUKVrgKD9FOb3cBtltIqJgONByYtIOXJ0y7oabre/iG5n9/1BBzQv /r1d1uZ2p6GtNgw87wNwe3dBLY2Vszfh/vua10jgCFHeEIhbe+BBrNJfncr0A0SKdjib4h3uFLN VPVgWRqbETEnKhhMgpPh4GyOUvuoMLCeFRWNp3N27T0mWkZegSPp+gXu8g5fhfdoVogZQrJVCgD 0= X-Received: by 2002:a05:622a:103:b0:3b6:2e9b:cf2b with SMTP id u3-20020a05622a010300b003b62e9bcf2bmr30269574qtw.14.1678288303105; Wed, 08 Mar 2023 07:11:43 -0800 (PST) X-Google-Smtp-Source: AK7set/y7O0CiR2/wJHIfJKmMmgHgmyFF4RGOcuh+X8scrYLgGiKh5fZdQ65aHR4ta33/ckRLM6cOg== X-Received: by 2002:a05:622a:103:b0:3b6:2e9b:cf2b with SMTP id u3-20020a05622a010300b003b62e9bcf2bmr30269512qtw.14.1678288302631; Wed, 08 Mar 2023 07:11:42 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id b3-20020ac85bc3000000b003bfb820f17csm12006168qtb.63.2023.03.08.07.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 07:11:42 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Implement LWG 3820/3849 changes to cartesian_product_view Date: Wed, 8 Mar 2023 10:11:33 -0500 Message-Id: <20230308151133.152110-1-ppalka@redhat.com> X-Mailer: git-send-email 2.40.0.rc0.57.g454dfcbddf MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 __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