From patchwork Wed Mar 8 15:11:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 66287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp391430wrd; Wed, 8 Mar 2023 07:12:59 -0800 (PST) X-Google-Smtp-Source: AK7set+H9sWpDzRopWYFZ31SLGLTaxnqNHe/dOc0hBeTbwdIGRn6lmeDMExe3CVe+Qx0uAX6TZ3S X-Received: by 2002:a17:906:48c9:b0:88e:2ff5:85d2 with SMTP id d9-20020a17090648c900b0088e2ff585d2mr18239441ejt.25.1678288378920; Wed, 08 Mar 2023 07:12:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678288378; cv=none; d=google.com; s=arc-20160816; b=KqamiGoIj/5WwokTQuIQNHRDE8RHC6VrX1ZgcDlbowK63yxWUm2fN0iouMxY7nepES C0nd9exJ+3H8Oa2/SUYp4VCBBLzG2yUSSxtp+RxQ2vmUIb6TyWLNUXS2n/pNjNTrkZZg RF6v8jAcHRpLg/EItSm3IirvzqyyQA9G3iPtds/FoQgNtYMqXdnkbijaH/V5J2VqYtyc Qmrzpxt5XZ/oacAHBkTUq8sbTSA168hHvq8jchZSlaxtaxpGqj3PUZQb/W7wkR/8wAzW IZoZC9iZEQnxS1UyaFxBbiUY1MMkZu2RKbmxzKySsvl9/raQedQiDYvdg++DF6SBFfAw CPvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=t0hZ5puViUYy2EMhnH18c1trgs342P9cpZOUWQDRq4A=; b=rsIPzMm1DjeI2ZWiifn6TnEHSuZwUl+9LcrzbVNltOOJdV+Di/CS4XKLGFR89rtsTw lg07Mla9YARstz6wtEwxwR0oGZbGScihgawspJ+4fX25e41IAcdJWAd2d4w23NuGlCuN axxvUvepJ2nV9H8HH9/17vepXzJc+myWLQHpHL5a9rj2usIR5tgLAJnw/1j/zOCGHdIH aRtd5KAIpUP5v9kroQKFl/yQZr7sS7JxxTGWkafAG7LpjPvZre7goFFZWoOTm1igS6Yi sXJSK0ntxxHhInEQrrEukZ0ppU8dxICOBhzK6UjmitZfY8YMWoVYEJp/lIOK0/x/y+OM t5lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=dBGk7kEL; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gt34-20020a1709072da200b008ddbfb652bcsi21783779ejc.48.2023.03.08.07.12.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 07:12:58 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=dBGk7kEL; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D385A385021E for ; Wed, 8 Mar 2023 15:12:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D385A385021E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678288349; bh=t0hZ5puViUYy2EMhnH18c1trgs342P9cpZOUWQDRq4A=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=dBGk7kELVZtFXhWEYkj3djLHgoMtuWdrwuqL4PF6Q2eViuaNzbWAAQuwQZ3M7v5cL XoVagNhtgsPEfCskkFou5PAxf+T5h5EdSpl5icXNdW/GAzeAUWz5VFq8LCC2gOSONV fti2Oyg5axZEOfc0PUMa+2ECF4X4hhHiay0HiKxQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 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-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) 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 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759812915373445374?= X-GMAIL-MSGID: =?utf-8?q?1759812915373445374?= 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(); }