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.129.124]) by sourceware.org (Postfix) with ESMTPS id 798D43858D3C for ; Wed, 19 Oct 2022 16:51:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 798D43858D3C 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=1666198273; 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: in-reply-to:in-reply-to:references:references; bh=zZOexKxMUnt/MRBFJyvOpMnzwNmkZCBOab9KGyUcm+E=; b=YIcUcQLCcm1chWkI8lMI+B85AmJjXg/x+wbZPXMEly/EufRbAAe3nW10GyMzgBOUV8mlEP g7zjDjGbYnjL6rojIMxtRRXVtMexCjvgH2MYM+4+0TV3yqprPTJZ2mKEv57gy5179C7/2Z qK9Glojx1BP6D6B6YobXanr/CsV/sPc= 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_128_GCM_SHA256) id us-mta-361-QlGWORR6MVu00Xphuei8gw-1; Wed, 19 Oct 2022 12:51:11 -0400 X-MC-Unique: QlGWORR6MVu00Xphuei8gw-1 Received: by mail-qt1-f200.google.com with SMTP id e24-20020ac84918000000b0039878b3c676so13126586qtq.6 for ; Wed, 19 Oct 2022 09:51:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zZOexKxMUnt/MRBFJyvOpMnzwNmkZCBOab9KGyUcm+E=; b=Zolp5oHqlRX7P2rkrPNU7Kh0EXRfFKGSKP/z1MIbl4JUJLOz/h84mY8SP2FUzGf3CW 0+nykn+7gQjduSBMC3iHb9YgZZBSYVFZex8kT+vs3g99c7xn2cJgls+zDE12kURuxv/9 hDsB6U/xfudivTqN7dQmmkyZKsnj8McJ3U0knF9VGibQ3hVaNLoZtNfeeD4i3QygOYST 8YlMO49+iJWmA2gkuLwEmHPYXTS0i9o0K9NIR+z7zSbrmuTdbpdm0GmV8Hnbu8RpF+Ed AFqxEFwxbERQe9WhA/RJdtnF6ymNBp5oTra1+KZ13VNnFatxd8ndoOJKmKsY/fhviSQ+ Hpdw== X-Gm-Message-State: ACrzQf12W2iAfvkHuN94bjkYe5QDVyZVPdeqSYiU2YZwC3S12Q2wQyWB XyVpzXOwQrSC/8GthzYGiUwz9qCJRsuLDVHJxasr0xv+hvzxRneFUp0/HYKVSphkKDkzZ+lWl4E ZPp+G9tpqQv7+LO5yLlNhrFxKEZwUPcU= X-Received: by 2002:a05:620a:13f2:b0:6ec:597f:eda6 with SMTP id h18-20020a05620a13f200b006ec597feda6mr6265293qkl.287.1666198271201; Wed, 19 Oct 2022 09:51:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7mvqFf5ZmavhVKba/blHyqH/QLiqtKTb0IvTcfv4uHqVp3p+fR0/6dwwYrlE+re6kZ6eEevw7t19t7Yuk1Pws= X-Received: by 2002:a05:620a:13f2:b0:6ec:597f:eda6 with SMTP id h18-20020a05620a13f200b006ec597feda6mr6265279qkl.287.1666198270981; Wed, 19 Oct 2022 09:51:10 -0700 (PDT) MIME-Version: 1.0 References: <20221019143141.248710-1-ppalka@redhat.com> In-Reply-To: <20221019143141.248710-1-ppalka@redhat.com> From: Jonathan Wakely Date: Wed, 19 Oct 2022 17:51:00 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: Fix typo in stride_view's operator- [PR107313] To: Patrick Palka Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-12.3 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: On Wed, 19 Oct 2022 at 15:33, Patrick Palka via Libstdc++ wrote: > > PR libstdc++/107313 OK > > libstdc++-v3/ChangeLog: > > * include/std/ranges (stride_view::_Iterator::operator-): Fix typo. > * testsuite/std/ranges/adaptors/stride/1.cc (test03): New test. > --- > libstdc++-v3/include/std/ranges | 2 +- > .../testsuite/std/ranges/adaptors/stride/1.cc | 20 +++++++++++++++++++ > 2 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges > index d113cf19dc7..b29264931cc 100644 > --- a/libstdc++-v3/include/std/ranges > +++ b/libstdc++-v3/include/std/ranges > @@ -7874,7 +7874,7 @@ namespace views::__adaptor > friend constexpr difference_type > operator-(default_sentinel_t __y, const _Iterator& __x) > requires sized_sentinel_for, iterator_t<_Base>> > - { return __detail::__div_ceil(__x._M_end, __x._M_current, __x._M_stride); } > + { return __detail::__div_ceil(__x._M_end - __x._M_current, __x._M_stride); } > > friend constexpr difference_type > operator-(const _Iterator& __x, default_sentinel_t __y) > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc > index 745d1a61c1b..37ae896014a 100644 > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc > @@ -64,10 +64,30 @@ test02() > VERIFY( ranges::equal(v, (int[]){1, 4, 7}) ); > } > > +void > +test03() > +{ > + // PR libstdc++/107313 > + int x[] = {1, 2, 3, 4, 5}; > + __gnu_test::test_input_range rx(x); > + auto r = views::counted(rx.begin(), 4) | views::stride(2); > + auto i = r.begin(); > + std::default_sentinel_t s = r.end(); > + VERIFY( s != i ); > + VERIFY( s - i == 2 && i - s == -2 ); > + ++i; > + VERIFY( s != i ); > + VERIFY( s - i == 1 && i - s == -1 ); > + ++i; > + VERIFY( s == i ); > + VERIFY( s - i == 0 && i - s == 0 ); > +} > + > int > main() > { > static_assert(test01()); > test02<__gnu_test::test_input_range>(); > test02<__gnu_test::test_forward_range>(); > + test03(); > } > -- > 2.38.1.119.g9c32cfb49c >