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 2DFDE3858CDB for ; Mon, 17 Apr 2023 03:27:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DFDE3858CDB 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=1681702050; 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=J/VBUcqTeu6lJVMqHxGcBLnZAXgoAFp39TePi1be75I=; b=XOE1ex20QiNZQU8JFgnDi3+mGCXfcSB7uEAE7BlHHG5XBdDBuo/iIWDM+bEYLnCMDKnDTx 2EFFk7BbgXfCBVzUz3dl3wiK+rItzK5IvpWQBfHLOsvj040zTegU7EgI1vdRQpfjg93t4w eaCk8qufxM9AjCptrZlOYqzNex7BYrY= 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-564-tbSjWnwNNCiYA5y3tQtEfA-1; Sun, 16 Apr 2023 23:27:29 -0400 X-MC-Unique: tbSjWnwNNCiYA5y3tQtEfA-1 Received: by mail-qt1-f200.google.com with SMTP id x9-20020ac85f09000000b003e4ecb5f613so11258381qta.21 for ; Sun, 16 Apr 2023 20:27:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681702049; x=1684294049; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J/VBUcqTeu6lJVMqHxGcBLnZAXgoAFp39TePi1be75I=; b=gjES4dXY0fpJrafS/iGlSUvW1K6KfKXyS1eZADZcPCxSdV5oHW/mbzDtmst0xYGZ99 hnt7cCsRHE+i4dFzVch1A5892w37AKpydAMqSCULypEKH81ZelsNEyKwOXsGfDDREnkC y5tSdQIyG5Vw2cW4UyhZU6RX6axqG5ir3razZn4QS+CCndkr0jpPP2YXZ9MmEPN+FI3K dImVmI/+xE5iL8tmmlvVbuttv02eRovbIY8WyjcqinHLHNQ8C8DaJxxpHbtR28ADEcrp IWItK9HcyLHQ8exPT9eUlRB+sxNtwIH++crg0LmE2OL/m2oxkNnTYTMqD75Frd+/ytXE IkrQ== X-Gm-Message-State: AAQBX9cgl0yx3KDsokQG3kY3EQJ8b2GM0byTAuSsQL6WVL2ZVCdls/5x XnB2cIpFAqeS7uqsDq/yT8QL2dRMP5LBMkLTQy0PV3MmHpYOJGLnScqLq3AdW6m4E7KvsqVcQI4 kTbJfeFuBhrWBD8I= X-Received: by 2002:a05:6214:5284:b0:5dd:aee7:e016 with SMTP id kj4-20020a056214528400b005ddaee7e016mr12997827qvb.8.1681702049097; Sun, 16 Apr 2023 20:27:29 -0700 (PDT) X-Google-Smtp-Source: AKy350bAalAqS6az+zxS8Opy5AXN6zp0oVIR0IrOnFVjtFY1cPMUmWG5MLxiLUcrwb/GvdhbK3OBeA== X-Received: by 2002:a05:6214:5284:b0:5dd:aee7:e016 with SMTP id kj4-20020a056214528400b005ddaee7e016mr12997817qvb.8.1681702048824; Sun, 16 Apr 2023 20:27:28 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id jy22-20020a0562142b5600b005ef565c9aaesm2169032qvb.40.2023.04.16.20.27.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 20:27:28 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Sun, 16 Apr 2023 23:27:27 -0400 (EDT) To: Patrick Palka cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [PATCH 2/2] libstdc++: Implement range_adaptor_closure from P2387R3 [PR108827] In-Reply-To: <20230414194512.2569383-2-ppalka@redhat.com> Message-ID: References: <20230414194512.2569383-1-ppalka@redhat.com> <20230414194512.2569383-2-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.8 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,T_SCC_BODY_TEXT_LINE 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 Fri, 14 Apr 2023, Patrick Palka wrote: > Tested on x86_64-pc-linux-gnu, does this look OK for trunk? > > PR libstdc++/108827 > > libstdc++-v3/ChangeLog: > > * include/bits/ranges_cmp.h (__cpp_lib_ranges): Bump value > for C++23. > * include/std/ranges (range_adaptor_closure): Define for C++23. > * include/std/version (__cpp_lib_ranges): Bump value for > C++23. > * testsuite/std/ranges/version_c++23.cc: Bump expected value > of __cpp_lib_ranges. > * testsuite/std/ranges/range_adaptor_closure.cc: New test. Here's a standalone version of this patch (not dependent on the first patch in the series) it terms of the current non-CRTP representation of _RangeAdaptorClosure: -- >8 -- Subject: [PATCH] libstdc++: Implement range_adaptor_closure from P2387R3 [PR108827] Tested on x86_64-pc-linux-gnu, does this look OK for trunk? PR libstdc++/108827 libstdc++-v3/ChangeLog: * include/bits/ranges_cmp.h (__cpp_lib_ranges): Bump value for C++23. * include/std/ranges (range_adaptor_closure): Define for C++23. * include/std/version (__cpp_lib_ranges): Bump value for C++23. * testsuite/std/ranges/version_c++23.cc: Bump expected value of __cpp_lib_ranges. * testsuite/std/ranges/range_adaptor_closure.cc: New test. --- libstdc++-v3/include/bits/ranges_cmp.h | 4 ++ libstdc++-v3/include/std/ranges | 8 ++++ libstdc++-v3/include/std/version | 3 ++ .../std/ranges/range_adaptor_closure.cc | 46 +++++++++++++++++++ .../testsuite/std/ranges/version_c++23.cc | 2 +- 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc diff --git a/libstdc++-v3/include/bits/ranges_cmp.h b/libstdc++-v3/include/bits/ranges_cmp.h index 85c1a77ccf7..6710d829a37 100644 --- a/libstdc++-v3/include/bits/ranges_cmp.h +++ b/libstdc++-v3/include/bits/ranges_cmp.h @@ -57,7 +57,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef __cpp_lib_concepts // Define this here, included by all the headers that need to define it. +#if __cplusplus > 202002L +#define __cpp_lib_ranges 202202L +#else #define __cpp_lib_ranges 202110L +#endif namespace ranges { diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 1714f3fb16c..c4d4d85bf90 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1122,6 +1122,14 @@ namespace views::__adaptor }; } // namespace views::__adaptor +#if __cplusplus > 202002L + template + requires is_class_v<_Derived> && same_as<_Derived, remove_cv_t<_Derived>> + class range_adaptor_closure + : public views::__adaptor::_RangeAdaptorClosure + { }; +#endif + template requires is_object_v<_Range> class ref_view : public view_interface> { diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 027e5711ec5..02ead8f1443 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -265,8 +265,10 @@ #define __cpp_lib_interpolate 201902L #if __cpp_lib_concepts # define __cpp_lib_move_iterator_concept 202207L +#if __cplusplus <= 202002L // N.B. updated value in C++23 # define __cpp_lib_ranges 202110L #endif +#endif #define __cpp_lib_shift 201806L #if _GLIBCXX_HOSTED @@ -330,6 +332,7 @@ #define __cpp_lib_reference_from_temporary 202202L #define __cpp_lib_to_underlying 202102L #define __cpp_lib_unreachable 202202L +#define __cpp_lib_ranges 202202L #define __cpp_lib_ranges_zip 202110L #define __cpp_lib_ranges_chunk 202202L #define __cpp_lib_ranges_slide 202202L diff --git a/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc b/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc new file mode 100644 index 00000000000..6221f071331 --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc @@ -0,0 +1,46 @@ +// { dg-options "-std=gnu++23" } +// { dg-do run { target c++23 } } + +#include +#include +#include + +namespace ranges = std::ranges; +namespace views = std::views; + +struct _Negate : ranges::range_adaptor_closure<_Negate> +{ + template + constexpr auto + operator()(_Range&& __r) const + requires requires { views::transform(std::declval<_Range>(), std::negate{}); } + { return views::transform(std::forward<_Range>(__r), std::negate{}); } +}; + +constexpr _Negate negate; + +constexpr bool +test01() +{ + int x[] = {1, 2, 3}; + VERIFY( ranges::equal(x | negate, (int[]){-1, -2, -3}) ); + VERIFY( ranges::equal(x | negate | negate, x) ); + VERIFY( ranges::equal(x | (negate | negate), x) ); + VERIFY( ranges::equal(x | views::reverse | negate, x | negate | views::reverse) ); + VERIFY( ranges::equal(x | (views::reverse | negate), x | (negate | views::reverse)) ); +#if 0 + // These asserts currently fail for the same reason as the disabled asserts + // in std/ranges/adaptors/all.cc. + static_assert( sizeof(negate | views::reverse | views::join) == 1 ); + static_assert( sizeof(views::reverse | negate | views::join) == 1 ); + static_assert( sizeof(views::reverse | views::join | negate) == 1 ); +#endif + + return true; +} + +int +main() +{ + static_assert(test01()); +} diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc index 04609bb602c..e8342fa986a 100644 --- a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc +++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc @@ -4,7 +4,7 @@ #include #if __STDC_HOSTED__ -# if __cpp_lib_ranges != 202110L +# if __cpp_lib_ranges != 202202L # error "Feature-test macro __cpp_lib_ranges has wrong value in " # endif #endif -- 2.40.0.335.g9857273be0