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 315003858D33 for ; Fri, 6 Jan 2023 15:22:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 315003858D33 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=1673018543; 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=cqJ725PUAt6NzwMXN5GPagGRUTv+4LUK3arWtCBfTQE=; b=hS7F88QADy2TDgDmgbUMdjfkdujqOODhZ+xBl+HljuaIOb1o2dR6qtMAoZH8cSR9AYB2Es uT79RMlmol7aJndq1iUJb522n6BiWlVp4KjLVcUIMw8gBTAJ9TCiAiOq+hceObOp4sFqpS R2oU1uDSLusg01e3GQHeV2hUi9fhFKk= 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_128_GCM_SHA256) id us-mta-307-yJSI1Nc0OraZNtUKso_z6g-1; Fri, 06 Jan 2023 10:22:22 -0500 X-MC-Unique: yJSI1Nc0OraZNtUKso_z6g-1 Received: by mail-lf1-f69.google.com with SMTP id d14-20020a196b0e000000b004b562e4bfedso632692lfa.19 for ; Fri, 06 Jan 2023 07:22:22 -0800 (PST) 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=cqJ725PUAt6NzwMXN5GPagGRUTv+4LUK3arWtCBfTQE=; b=a1h0cxXZBKiB2HyqEn6/gPHoegmrIMISDFVoTmXF86p7g/6AHHuPLcsXjoAW3Q+lJj HvjLu1/W4GqIdNOO5kdreL1Vag0TlpIEWA4yz4oNbWG7ATJp9hzlF2nxdEDNuPLlADHf o6jVv1OnTFnTv4ttNMqKcKiFl3wxVfE1VE+VwezyNnAy/XO7EtqD0EEbKNXbWNaAjtUT 431YTcgD7+TwnTmig85+yMQwoYX/GPDwiViz+lYN4V3OQw1EiRT44MCKhDLwSkJ6aVq1 5RL+O/OtNBqEpJtVF99Q+igBhMi+UbTWOCtb+Wz9rkT+H33QIezcTDcQtQzdZgFT82D/ SZsA== X-Gm-Message-State: AFqh2kpTtO/PJQ56kdeaWfYL/VEehBbY16wl/ib/6+jBZmgI+rZ1m3gH lL+48g87yoiTBj+P2+EbMO7cxTDFqlKKuZfpsaDWVBgLTZEoiOP+X4hv4GqCLbbk8h/kcc8Dp8c a7ZqLB58ba/9Pu1MBbYzPZ72Jjtonhdc= X-Received: by 2002:a2e:9151:0:b0:281:91e5:7091 with SMTP id q17-20020a2e9151000000b0028191e57091mr108557ljg.469.1673018541299; Fri, 06 Jan 2023 07:22:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXubM8BWMf8BgFF0Ersg+rtxEy0Sqk6PuY2bGRulUBKYGtfSM3qpbzCrsBMCjBZpvdBd810gACz/D8IuvRrpV10= X-Received: by 2002:a2e:9151:0:b0:281:91e5:7091 with SMTP id q17-20020a2e9151000000b0028191e57091mr108554ljg.469.1673018540784; Fri, 06 Jan 2023 07:22:20 -0800 (PST) MIME-Version: 1.0 References: <20230106145950.3685552-1-ppalka@redhat.com> <0c1119f8-c541-41f8-fd8c-d5bedea71181@idea> In-Reply-To: <0c1119f8-c541-41f8-fd8c-d5bedea71181@idea> From: Jonathan Wakely Date: Fri, 6 Jan 2023 15:22:09 +0000 Message-ID: Subject: Re: [PATCH] libstdc++: Add feature-test macros for implemented C++23 views [PR108260] 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.2 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 Fri, 6 Jan 2023 at 15:07, Patrick Palka via Libstdc++ wrote: > > On Fri, 6 Jan 2023, Patrick Palka wrote: > > > Tested on x86_64-pc-linux-gnu, does this look OK for trunk? > > > > PR libstdc++/108620 > > > > libstdc++-v3/ChangeLog: > > > > * include/bits/utility.h (__cpp_lib_ranges_zip): Define. > > * include/std/ranges (__cpp_lib_ranges_zip): Define. > > (__cpp_lib_ranges_chunk): Define. > > (__cpp_lib_ranges_slide): Define. > > (__cpp_lib_ranges_chunk_by): Define. > > (__cpp_lib_ranges_join_with): Define. > > (__cpp_lib_ranges_repeat): Define. > > (__cpp_lib_ranges_stride): Define. > > (__cpp_lib_ranges_cartesian_product): Define. > > (__cpp_lib_ranges_as_rvalue): Define. > > * include/std/version: Likewise. > > * testsuite/20_util/tuple/p2321r2.cc: Test feature-test macro. > > * testsuite/std/ranges/adaptors/as_rvalue/1.cc: Likewise. > > * testsuite/std/ranges/adaptors/chunk/1.cc: Likewise. > > * testsuite/std/ranges/adaptors/chunk_by/1.cc: Likewise. > > * testsuite/std/ranges/adaptors/join_with/1.cc: Likewise. > > * testsuite/std/ranges/adaptors/slide/1.cc: Likewise. > > * testsuite/std/ranges/adaptors/stride/1.cc: Likewise. > > * testsuite/std/ranges/cartesian_product/1.cc: Likewise. > > * testsuite/std/ranges/repeat/1.cc: Likewise. > > * testsuite/std/ranges/zip/1.cc: Likewise. > > * testsuite/std/ranges/version_c++23.cc: New test. > > --- > > libstdc++-v3/include/bits/utility.h | 4 ++ > > libstdc++-v3/include/std/ranges | 19 ++++++++ > > libstdc++-v3/include/std/version | 9 ++++ > > .../testsuite/20_util/tuple/p2321r2.cc | 4 ++ > > .../std/ranges/adaptors/as_rvalue/1.cc | 4 ++ > > .../testsuite/std/ranges/adaptors/chunk/1.cc | 4 ++ > > .../std/ranges/adaptors/chunk_by/1.cc | 4 ++ > > .../std/ranges/adaptors/join_with/1.cc | 4 ++ > > .../testsuite/std/ranges/adaptors/slide/1.cc | 4 ++ > > .../testsuite/std/ranges/adaptors/stride/1.cc | 4 ++ > > .../std/ranges/cartesian_product/1.cc | 4 ++ > > libstdc++-v3/testsuite/std/ranges/repeat/1.cc | 4 ++ > > .../testsuite/std/ranges/version_c++23.cc | 44 +++++++++++++++++++ > > libstdc++-v3/testsuite/std/ranges/zip/1.cc | 4 ++ > > 14 files changed, 116 insertions(+) > > create mode 100644 libstdc++-v3/testsuite/std/ranges/version_c++23.cc > > > > diff --git a/libstdc++-v3/include/bits/utility.h b/libstdc++-v3/include/bits/utility.h > > index 6a192e27836..fac6c7dc3bd 100644 > > --- a/libstdc++-v3/include/bits/utility.h > > +++ b/libstdc++-v3/include/bits/utility.h > > @@ -263,6 +263,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > { using type = _Tp1; }; > > #endif > > > > +#if __cplusplus > 202002L > > +#define __cpp_lib_ranges_zip 202110L // for and > > +#endif > > + > > _GLIBCXX_END_NAMESPACE_VERSION > > } // namespace > > > > diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges > > index ba544e116e1..dce7867e977 100644 > > --- a/libstdc++-v3/include/std/ranges > > +++ b/libstdc++-v3/include/std/ranges > > @@ -4364,6 +4364,9 @@ namespace views::__adaptor > > } // namespace views > > > > #if __cplusplus > 202002L > > + > > +#define __cpp_lib_ranges_zip 202110L > > + > > namespace __detail > > { > > template > > @@ -5802,6 +5805,8 @@ namespace views::__adaptor > > inline constexpr auto pairwise_transform = adjacent_transform<2>; > > } > > > > +#define __cpp_lib_ranges_chunk 202202L > > + > > namespace __detail > > { > > template > > @@ -6339,6 +6344,8 @@ namespace views::__adaptor > > inline constexpr _Chunk chunk; > > } > > > > +#define __cpp_lib_ranges_slide 202202L > > + > > namespace __detail > > { > > template > > @@ -6702,6 +6709,8 @@ namespace views::__adaptor > > inline constexpr _Slide slide; > > } > > > > +#define __cpp_lib_ranges_chunk_by 202202L > > + > > template > indirect_binary_predicate, iterator_t<_Vp>> _Pred> > > requires view<_Vp> && is_object_v<_Pred> > > @@ -6895,6 +6904,8 @@ namespace views::__adaptor > > inline constexpr _ChunkBy chunk_by; > > } > > > > +#define __cpp_lib_ranges_join_with 202202L > > + > > namespace __detail > > { > > template > > @@ -7375,6 +7386,8 @@ namespace views::__adaptor > > inline constexpr _JoinWith join_with; > > } // namespace views > > > > +#define __cpp_lib_ranges_repeat 202207L > > + > > template > > requires (is_object_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>> > > && (__detail::__is_integer_like<_Bound> || same_as<_Bound, unreachable_sentinel_t>)) > > @@ -7626,6 +7639,8 @@ namespace views::__adaptor > > } > > } > > > > +#define __cpp_lib_ranges_stride 202207L > > + > > template > > requires view<_Vp> > > class stride_view : public view_interface> > > @@ -7977,6 +7992,8 @@ namespace views::__adaptor > > inline constexpr _Stride stride; > > } > > > > +#define __cpp_lib_ranges_cartesian_product 202207L > > + > > namespace __detail > > { > > template > > @@ -8487,6 +8504,8 @@ namespace views::__adaptor > > inline constexpr _CartesianProduct cartesian_product; > > } > > > > +#define __cpp_lib_ranges_as_rvalue 202207L > > + > > template > > requires view<_Vp> > > class as_rvalue_view : public view_interface> > > diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version > > index c1a9896b0c2..5730357793d 100644 > > --- a/libstdc++-v3/include/std/version > > +++ b/libstdc++-v3/include/std/version > > @@ -319,6 +319,15 @@ > > #define __cpp_lib_reference_from_temporary 202202L > > #define __cpp_lib_to_underlying 202102L > > #define __cpp_lib_unreachable 202202L > > +#define __cpp_lib_ranges_zip 202110L > > +#define __cpp_lib_ranges_chunk 202202L > > +#define __cpp_lib_ranges_slide 202202L > > +#define __cpp_lib_ranges_chunk_by 202202L > > +#define __cpp_lib_ranges_join_with 202202L > > +#define __cpp_lib_ranges_repeat 202207L > > +#define __cpp_lib_ranges_stride 202207L > > +#define __cpp_lib_ranges_cartesian_product 202207L > > +#define __cpp_lib_ranges_as_rvalue 202207L > > I should mention that these definitions in aren't guarded by > __cpp_concepts, unlike e.g. __cpp_lib_expected and __cpp_lib_optional. > It is reasonable to assume __cpp_concepts is always defined for C++23 > here? Yes, I think I've already assumed that elsewhere (std::expected maybe?) OK for trunk, thanks. > > > > > #if _GLIBCXX_HOSTED > > #define __cpp_lib_adaptor_iterator_pair_constructor 202106L > > diff --git a/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc b/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc > > index 04ac27358eb..ceed38b16ec 100644 > > --- a/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc > > +++ b/libstdc++-v3/testsuite/20_util/tuple/p2321r2.cc > > @@ -8,6 +8,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_zip != 202110L > > +# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in " > > +#endif > > + > > using std::tuple; > > using std::pair; > > using std::allocator; > > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc > > index 8ca4f50e9d2..fbf0d651366 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc > > @@ -7,6 +7,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_as_rvalue != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_as_rvalue has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc > > index 125c88ef853..18b934f99ee 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk/1.cc > > @@ -7,6 +7,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_chunk != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_chunk has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc > > index d57b127fbc8..cba6fad6f9a 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc > > @@ -7,6 +7,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_chunk_by != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_chunk_by has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc > > index 8b9c6c4fc9f..15127c0715f 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc > > @@ -7,6 +7,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_join_with != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_join_with has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > using namespace std::literals; > > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc > > index 98560420810..8c015c1162b 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/slide/1.cc > > @@ -7,6 +7,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_slide != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_slide has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc > > index 37ae896014a..92aca35e83f 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/stride/1.cc > > @@ -6,6 +6,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_stride != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_stride has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > diff --git a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc > > index d6e4b538b20..1ec4422e6f3 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/cartesian_product/1.cc > > @@ -6,6 +6,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_cartesian_product != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_cartesian_product has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > diff --git a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc > > index f9817c99600..2f3ad4522a4 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc > > @@ -5,6 +5,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_repeat != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_repeat has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc > > new file mode 100644 > > index 00000000000..d9ea9eca6c7 > > --- /dev/null > > +++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc > > @@ -0,0 +1,44 @@ > > +// { dg-options "-std=gnu++23" } > > +// { dg-do preprocess { target c++23 } } > > + > > +#include > > + > > +#if __cpp_lib_ranges != 202110L > > +# error "Feature-test macro __cpp_lib_ranges has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_zip != 202110L > > +# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_chunk != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_chunk has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_slide != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_slide has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_chunk_by != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_chunk_by has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_join_with != 202202L > > +# error "Feature-test macro __cpp_lib_ranges_join_with has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_repeat != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_repeat has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_stride != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_stride has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_cartesian_product != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_cartesian_product has wrong value in " > > +#endif > > + > > +#if __cpp_lib_ranges_as_rvalue != 202207L > > +# error "Feature-test macro __cpp_lib_ranges_as_rvalue has wrong value in " > > +#endif > > diff --git a/libstdc++-v3/testsuite/std/ranges/zip/1.cc b/libstdc++-v3/testsuite/std/ranges/zip/1.cc > > index e9e40fb15eb..8ca386d6563 100644 > > --- a/libstdc++-v3/testsuite/std/ranges/zip/1.cc > > +++ b/libstdc++-v3/testsuite/std/ranges/zip/1.cc > > @@ -8,6 +8,10 @@ > > #include > > #include > > > > +#if __cpp_lib_ranges_zip != 202110L > > +# error "Feature-test macro __cpp_lib_ranges_zip has wrong value in " > > +#endif > > + > > namespace ranges = std::ranges; > > namespace views = std::views; > > > > -- > > 2.39.0.189.g4dbebc36b0 > > > > >