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 89B22385802E for ; Wed, 20 Oct 2021 16:59:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 89B22385802E Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-hxOlSYb3Px6OzJUrOBfl-A-1; Wed, 20 Oct 2021 12:59:35 -0400 X-MC-Unique: hxOlSYb3Px6OzJUrOBfl-A-1 Received: by mail-qk1-f198.google.com with SMTP id g25-20020a05620a219900b0045f31ac2119so2585532qka.20 for ; Wed, 20 Oct 2021 09:59:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=l9oUybr9yM+PdKNyOSJZgJdOfQ3Mh6VrRXpL/gOvV/0=; b=i1YyeP8FzwJGxu5z9MOLsV6eeeQ89ijLc5QNR6P7N9Qf+JEIYSdnfuVBNiC3ZEEAk9 K4xo9BBmSiZJ8aX7ASqh9HieEob+wPOJLPwj4ql9o4FKePlte/hGsE9pEgNbfoLiKeGE xQGxHB7HBb+Lz0gVHfviQi1JqoG328Vsvd2EgUkTbNgKhPiv7bD1Qy1WXY6MKGdUUQaR aQRgqtGVOZhjD/+qbaOQUkddWKYo4XScyzLIe1oj/JlIl+//KuFhcphmvU2nSRxwc+pV WOucetX3+mcSjFlboRiWEc/YP69go8M8kEfyft63+uvtW5NZCJwXoNbdp9gr5G0ImJik 9wXw== X-Gm-Message-State: AOAM531rrnJRv83F6q61Ip9L288r/+Vd2waiU7RWkKm35OowrsdbbYQd sJvE1aFW+2FrPQX7DQ5O6PWHimPNyfPcHcTtheT2vD2OQvABe7292dU1lDxn5a2TRu2qoeQmWgF 0tOpXh0laUVq7wOI= X-Received: by 2002:ac8:610f:: with SMTP id a15mr254988qtm.387.1634749175408; Wed, 20 Oct 2021 09:59:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJympUWogMHKz6u9rCa4JBBpuTVJsOzf2QP0/I2KA1WragzeIRYm5YG1u1hFHApFaQU8vQO7xw== X-Received: by 2002:ac8:610f:: with SMTP id a15mr254975qtm.387.1634749175199; Wed, 20 Oct 2021 09:59:35 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id bj26sm1327398qkb.127.2021.10.20.09.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 09:59:34 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Implement LWG 3481 change to ranges::viewable_range Date: Wed, 20 Oct 2021 12:59:27 -0400 Message-Id: <20211020165927.1827031-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.1.711.g9d530dc002 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-Spam-Status: No, score=-15.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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2021 16:59:38 -0000 Tested on x86_64-pc-linux-gnu, does this look OK for trunk, and branches after a while? libstdc++-v3/ChangeLog: * include/bits/ranges_base.h (viewable_range): Adjust as per LWG 3481. * testsuite/std/ranges/adaptors/all.cc (test07): New test. --- libstdc++-v3/include/bits/ranges_base.h | 3 ++- libstdc++-v3/testsuite/std/ranges/adaptors/all.cc | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/ranges_base.h b/libstdc++-v3/include/bits/ranges_base.h index 7801b2fd023..43b0b9f7bf3 100644 --- a/libstdc++-v3/include/bits/ranges_base.h +++ b/libstdc++-v3/include/bits/ranges_base.h @@ -688,7 +688,8 @@ namespace ranges /// A range which can be safely converted to a view. template concept viewable_range = range<_Tp> - && (borrowed_range<_Tp> || view>); + && ((view> && constructible_from, _Tp>) + || (!view> && borrowed_range<_Tp>)); // [range.iter.ops] range iterator operations diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc index 9a6a31e6cb4..ce1384c2890 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc @@ -159,6 +159,20 @@ test06() static_assert(!noexcept(views::all(BorrowedRange(x)))); } +void +test07() +{ + // LWG 3481 + struct view_t : ranges::empty_view { // move-only view + view_t(const view_t&) = delete; + view_t(view_t&&) = default; + view_t& operator=(const view_t&) = delete; + view_t& operator=(view_t&&) = default; + }; + static_assert(std::movable && !std::copyable); + static_assert(!ranges::viewable_range); +} + int main() { @@ -168,4 +182,5 @@ main() static_assert(test04()); test05(); test06(); + test07(); } -- 2.33.1.711.g9d530dc002