From patchwork Wed Oct 19 14:31:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 5594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp360537wrs; Wed, 19 Oct 2022 07:32:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UbbmquFXFmG+E3AucSNkLLYgi7Ys7T3b4cBDYEvnphX8TjyleiL/KS+6JrP3Cg2fYuLmk X-Received: by 2002:a17:907:6e09:b0:78d:a326:49c6 with SMTP id sd9-20020a1709076e0900b0078da32649c6mr6981336ejc.507.1666189965385; Wed, 19 Oct 2022 07:32:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666189965; cv=none; d=google.com; s=arc-20160816; b=P+Qi2laZAoUhodCwxCiToBPg8HtE7cVvIzqoe0MctnB7GKUpKLTqPD4kI6JS5Ukexx oq7CBG0EdSqLQaiW5SKReE0/epcn+bWHAeu5Iq5WK5dNOVCi3HhDXUYE9NvXQ6y9qHqA XTXOTwvLYDM855Ffg+ncJ4tJV1qnGssJ3Xhw2eDLhLHqFoJOp6a9wgAizHXvM+WPa9hy SkD7cABeqHUErfrbkyTk9Q4FPjMBbOE63Nvb+kiUhhxVo7444DhHHokPj2JCgslsPROk r53rzfB9Sp+frwblWdIoNV/GlBZBKZDkigCXO+7Y5bUf61ELDWjuZsS1ae3iwo4zNwXq Ebtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=1LWfuejGjGPz3cbFF9WiVV2+mKU99yE42V+GKoxD/Qw=; b=XssHlNGcOICBcRjBoZxgJB/qdu3XjJo2dvqPEabzxH6rpddx/Gd7tTQMsy81b3qU7p 6ucCmDnvIMDiybkdqZX+op7Xvh1dUHB9ZfTNckiczYoAVg30jkQ/m5dWMaB/DxLikTRO SiiCY3BJBG01kusCRAATXTH8nWhKO/zNGdV+vlMw0AOjpkoEl1BplSA7CeYXw7rBZc+W KK6DWOy5ahseWTAnQmZKi3UsENX6fnbmnExtd5uX+jpQPoRjKZfl22wlAKe/OqyNe8gP 3fdS7E0HuOSc0bKAbNZvlvFSC9wx/B8OHiINkUGXnGxTfU2YFhlQmeKPf8pEi2ucuQNT Tc4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=m8MQZkkr; 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 p11-20020a056402500b00b00458b8d143b3si15286398eda.172.2022.10.19.07.32.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 07:32:45 -0700 (PDT) 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=m8MQZkkr; 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 3133B385843A for ; Wed, 19 Oct 2022 14:32:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3133B385843A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666189964; bh=1LWfuejGjGPz3cbFF9WiVV2+mKU99yE42V+GKoxD/Qw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=m8MQZkkrDdLJ+BEszeiakkh23WpzBuKPTDhW8TvAuB+cc0SqezQM6Jdmtap2AQh49 Knoe24WA91zN1++/FiMuUvlOs7grPvWow249coUSbg6/c5KYFKx8wIuR0wSajjlxU9 /mMwgh6Rb9zNcDUUC0GzFRee05MVAu/5O6Wyc1TA= 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 30F893858D3C for ; Wed, 19 Oct 2022 14:31:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 30F893858D3C Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-154-8ePXIBAOOpSz8xdmM54YUw-1; Wed, 19 Oct 2022 10:31:56 -0400 X-MC-Unique: 8ePXIBAOOpSz8xdmM54YUw-1 Received: by mail-qk1-f200.google.com with SMTP id h8-20020a05620a284800b006b5c98f09fbso15151701qkp.21 for ; Wed, 19 Oct 2022 07:31:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=1LWfuejGjGPz3cbFF9WiVV2+mKU99yE42V+GKoxD/Qw=; b=pn747wGKLgQX6l25s8LARLACx8I7rXTszQAgswc9ldcgnWxO0PbnaA9JgYtWQyYYsG mQ4R4ZLEL1/iaWyM5t4YoEUxADigzFvEKgkKJlFs3YcevQPtOr9k2mXFDrDrxCPgrVO1 yH25vGSbGk/R/1m4qFnCsTMpgi7YvqqbHpxm/Zt/lbPgbURMV/2vXiZuAIJRy1Ui5XeN QrrUVKFu0UOlV35Ld7ffxehdzWC8kNpQLfQkRFaIH5DV4gPmQFSt7iFvfHidzeKq3gCJ 0ArJWp6c03vWDIk7YFjeHAPNUwIt3sZ319rkUD6jyTVnF7KwdQiGsiL569SRL+P150KT aBuA== X-Gm-Message-State: ACrzQf3ZY8VCawFklinloXFkZWs48QJ0xex9uRH8G3QOkaIRx4xghVPn 6pK4ALSuoITkOPURjVuSl5KmUAqjfOKOCBrbrkpLozc0G8PR1bIz8Nt26YOLCFsLcVN+Jgm6ZLh 8E7QP0EbJ3NtpPsPvbG3nk87kediC+KNqzC4Wwncks6m1ohLwfuzSq+Po3l/2a0ILbFU= X-Received: by 2002:a05:620a:4005:b0:6ee:d836:9ed4 with SMTP id h5-20020a05620a400500b006eed8369ed4mr5784605qko.352.1666189915117; Wed, 19 Oct 2022 07:31:55 -0700 (PDT) X-Received: by 2002:a05:620a:4005:b0:6ee:d836:9ed4 with SMTP id h5-20020a05620a400500b006eed8369ed4mr5784574qko.352.1666189914788; Wed, 19 Oct 2022 07:31:54 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id j4-20020a05620a410400b006eef13ef4c8sm3817788qko.94.2022.10.19.07.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 07:31:54 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Fix typo in stride_view's operator- [PR107313] Date: Wed, 19 Oct 2022 10:31:41 -0400 Message-Id: <20221019143141.248710-1-ppalka@redhat.com> X-Mailer: git-send-email 2.38.1.119.g9c32cfb49c MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.1 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 Cc: libstdc++@gcc.gnu.org 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?1747126809515394988?= X-GMAIL-MSGID: =?utf-8?q?1747126809515394988?= PR libstdc++/107313 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(); }