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 75B693857343 for ; Tue, 18 Apr 2023 08:57:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 75B693857343 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=1681808253; 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=yNj+JumXGIMdcg9JNFdC3hT7tJRoh3UUuIJJhVQn9kM=; b=NO1MONdSS2DWdRcNcVx3lfNny7vHoZaC5Hid8TH+oKhHaGwjktU5SF4i+HVcdB15M00MOE 0QsO5dmgNJwXJSL8Ru+FlhiKG2NVGgUg+Tu0d8YYEAL88XDY4RqUSIJa4nOWSKsDdaIIeF PymI0rIbHkJTNE03kfL4u6atCgBxrIQ= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-130-HV8ZzfnhM0GXRb26xsUFOg-1; Tue, 18 Apr 2023 04:57:31 -0400 X-MC-Unique: HV8ZzfnhM0GXRb26xsUFOg-1 Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-4edc3437a30so2807741e87.0 for ; Tue, 18 Apr 2023 01:57:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681808250; x=1684400250; 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=yNj+JumXGIMdcg9JNFdC3hT7tJRoh3UUuIJJhVQn9kM=; b=AG2ng+X/4IiBrxebKy4fYUbZQB0J0KKC7+UoIwtpAdpqmOKCFQpYmc0AZgAjey90Hr xdNw+CpoeEfAEt358oMlVC0LKZG/fI3Rkfb9GvFe93q21mMSE41Axa0wNw1QoHekL268 qlaZd94sJ2UaGAisCE70FFYoRU3E2cRYnuMVvSydKgjBPBRJWJIdvndDyhT3NR8Wr14d C4GVcVlTz/RX7pTKlrGoRcXMmnferI6Cav59KTwKFAAx/qEnUDgfs6Z5g9ujSTCvAGka fxbnfFRC7KKWAv5ogIYUhyctR8sRA7aCj7Tu2pCUXZPqs/UEZpRNEcg6AM44ItO3Ycmv /Grg== X-Gm-Message-State: AAQBX9f9YRmeKTNdB5PXMeTQqDNmJZweiiQs6ZMz69NnfHifjweP4YQm /8V5RWtf9wVaGbvLbFVKOjcBylmrLHcKHeoI56bOZIGT7TYqCjwFNMrAHbhZZSBWt+tJGkrnxTa SPHs6wjRi3m8e7bwUK2VPAAW6l3Wwy4c= X-Received: by 2002:a05:6512:402a:b0:4ec:7e11:7760 with SMTP id br42-20020a056512402a00b004ec7e117760mr4513649lfb.6.1681808250491; Tue, 18 Apr 2023 01:57:30 -0700 (PDT) X-Google-Smtp-Source: AKy350bCRRG7bY+/nZLJZxJr2uSg/eqSvV6lXRPSBrVEu1PZw7liDplRACCkEtQUflPXSOWUrebDk1h+FLwHmFBmSBE= X-Received: by 2002:a05:6512:402a:b0:4ec:7e11:7760 with SMTP id br42-20020a056512402a00b004ec7e117760mr4513631lfb.6.1681808250173; Tue, 18 Apr 2023 01:57:30 -0700 (PDT) MIME-Version: 1.0 References: <20230414194512.2569383-1-ppalka@redhat.com> <20230414194512.2569383-2-ppalka@redhat.com> In-Reply-To: From: Jonathan Wakely Date: Tue, 18 Apr 2023 09:57:19 +0100 Message-ID: Subject: Re: [PATCH 2/2] libstdc++: Implement range_adaptor_closure from P2387R3 [PR108827] To: Jonathan Wakely Cc: Patrick Palka , gcc-patches , "libstdc++" , Jakub Jelinek X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-12.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,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 Mon, 17 Apr 2023 at 08:26, Jonathan Wakely via Libstdc++ wrote: > > On Mon, 17 Apr 2023, 05:28 Patrick Palka via Libstdc++, < > libstdc++@gcc.gnu.org> wrote: > > > 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: > > > > OK, thanks for separating this from the other change. I'd like RM approval to push this C++23-only change to gcc-13 as well as trunk. > > > > > -- >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 > > > > >