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 0F83E3858C5E for ; Fri, 14 Apr 2023 19:45:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F83E3858C5E 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=1681501520; 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: content-transfer-encoding:content-transfer-encoding; bh=OlCg9o288HSqHIVTpBhXtw4BiJHOz0/MGedhfb79Z3o=; b=Pwv0f8QGp4sK1/vA5iIh+SyEyk+6oAQsYYkRCl3nMwcz44BbkfrPxtvXIFOiwj6YqkDF0j PVXkoSC53RxCZgEuu3/AY0mdrj1fibsv9xkBWBYv5EQSoXMUCuhfs07xms74Oss8YkvQR9 Dhm9VhIWWWrZc+TgrQ6rPZckswSgtAY= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-f-swrokcMS2UQg66KoXugA-1; Fri, 14 Apr 2023 15:45:19 -0400 X-MC-Unique: f-swrokcMS2UQg66KoXugA-1 Received: by mail-qv1-f72.google.com with SMTP id b5-20020a0cbf45000000b005e7e2c57182so10643503qvj.22 for ; Fri, 14 Apr 2023 12:45:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501518; x=1684093518; 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=OlCg9o288HSqHIVTpBhXtw4BiJHOz0/MGedhfb79Z3o=; b=Vn2QDelHjBjpqpoi7HiPpjh/gYEP9gx9LDL7S9gpVmq25C140atmib4kJLcsbJFqMt W1obvOE6qAxG45HnkanPw7LL2ymi179MvBmzzsl48Isx0KClcn+/cdeZYwI5OAt6XHD2 n7m73oRhlfPfWyUGXCDd4xCrePSSfvTxp29IalWmugFHbgLMJOCz6lN1Amcsu9+f1ReX xoW7Tgi8dOfvKoY/dei55qd3Ld5HD94Y7aHxWppB1wEShfgwMpxcDBzntkRBEH7Og7QI UuxSfq7epRjFwODdteDod0mi75HbSzY5tCId/HWSW+PvfooEB+i7u7KhQM3VigrdGhSr Ru9g== X-Gm-Message-State: AAQBX9c00AjZ7OhXOgEUTI/iDwVSvm5dt+i40RIiQmH/8zN5a7LW4uDV 3FGpXaxGvwBowsS2XgV+5REcaLERZAq77zwiAtnKwLQ17+ud9jknClmEcJHJOLEjw/FZySxhQT3 mp9EQVgfZ8hV8+Sjarb0gHKUXEiJEsOBw1ydRHgmuqDRsWE8zt+R0MgmzKFTnVQNwvxFlDxnYzV k= X-Received: by 2002:a05:6214:c8a:b0:5c0:abe:2651 with SMTP id r10-20020a0562140c8a00b005c00abe2651mr3750761qvr.23.1681501518248; Fri, 14 Apr 2023 12:45:18 -0700 (PDT) X-Google-Smtp-Source: AKy350b27aGSzU8qRsdxj6tdxaWtugXF9lAI6oC3h+1g6tRYydzyc9Fh1X/hwkEDqvOjTAYFZwl+ug== X-Received: by 2002:a05:6214:c8a:b0:5c0:abe:2651 with SMTP id r10-20020a0562140c8a00b005c00abe2651mr3750739qvr.23.1681501517797; Fri, 14 Apr 2023 12:45:17 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id pr27-20020a056214141b00b005dd8b9345f8sm1291814qvb.144.2023.04.14.12.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:45:17 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH 1/2] libstdc++: Convert _RangeAdaptorClosure into a CRTP class [PR108827] Date: Fri, 14 Apr 2023 15:45:11 -0400 Message-ID: <20230414194512.2569383-1-ppalka@redhat.com> X-Mailer: git-send-email 2.40.0.335.g9857273be0 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-default=true X-Spam-Status: No, score=-13.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_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Using the CRTP idiom for this base class avoids bloating the size of a pipeline when adding distinct empty range adaptor closure objects to it, as detailed in section 4.1 of P2387R3. But it means we can no longer define its operator| overloads as hidden friends, since each instantiation of _RangeAdaptorClosure would then introduce its own logically different hidden friends. So for example during overload resolution for the outer pipe operator in :x | (views::reverse | views::join) we'd have to consider 6 different hidden operator| friends: 2 from _RangeAdaptorClosure<_Reverse> 2 from _RangeAdaptorClosure<_Join> 2 from _RangeAdaptorClosure<_Pipe<_Reverse, _Join>> which is wasteful and can even cause hard errors in some cases. So we instead define the operator| overloads at namespace scope in an isolated namespace. PR libstdc++/108827 libstdc++-v3/ChangeLog: * include/std/ranges (__adaptor::_RangeAdaptorClosure): Move ... (__adaptor::__closure::_RangeAdaptorClosure): ... here and turn it into a CRTP class template. Move hidden operator| friends into namespace scope and adjust their constraints. Add a using-declaration for this at __adaptor::_RangeAdaptorClosure. (__closure::__is_range_adaptor_closure_fn): Define. (__closure::__is_range_adaptor_closure): Define. (__adaptor::_Partial): Adjust use of _RangeAdaptorClosure. (__adaptor::_Pipe): Likewise. (views::_All): Likewise. (views::_Join): Likewise. (views::_Common): Likewise. (views::_Reverse): Likewise. (views::_Elements): Likewise. (views::_Adjacent): Likewise. (views::_AsRvalue): Likewise. (views::_Enumerate): Likewise. (views::_AsConst): Likewise. * testsuite/std/ranges/adaptors/all.cc: Reintroduce static_assert expecting that adding empty range adaptor closure objects to a pipeline doesn't increase the size of a pipeline. --- libstdc++-v3/include/std/ranges | 69 +++++++++++-------- .../testsuite/std/ranges/adaptors/all.cc | 7 -- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 283d757faa4..531ec6f68b3 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -872,30 +872,45 @@ namespace views::__adaptor template struct _Pipe; - // The base class of every range adaptor closure. - // - // The derived class should define the optional static data member - // _S_has_simple_call_op to true if the behavior of this adaptor is - // independent of the constness/value category of the adaptor object. - struct _RangeAdaptorClosure + namespace __closure { + // The base class of every range adaptor closure. + // + // The derived class should define the optional static data member + // _S_has_simple_call_op to true if the behavior of this adaptor is + // independent of the constness/value category of the adaptor object. + template + struct _RangeAdaptorClosure + { }; + + template + requires (!same_as<_Tp, _RangeAdaptorClosure<_Up>>) + void __is_range_adaptor_closure_fn + (const _Tp&, const _RangeAdaptorClosure<_Up>&); // not defined + + template + concept __is_range_adaptor_closure + = requires (_Tp __t) { __closure::__is_range_adaptor_closure_fn(__t, __t); }; + // range | adaptor is equivalent to adaptor(range). template - requires derived_from, _RangeAdaptorClosure> + requires __is_range_adaptor_closure<_Self> && __adaptor_invocable<_Self, _Range> - friend constexpr auto + constexpr auto operator|(_Range&& __r, _Self&& __self) { return std::forward<_Self>(__self)(std::forward<_Range>(__r)); } // Compose the adaptors __lhs and __rhs into a pipeline, returning // another range adaptor closure object. template - requires derived_from<_Lhs, _RangeAdaptorClosure> - && derived_from<_Rhs, _RangeAdaptorClosure> - friend constexpr auto + requires __is_range_adaptor_closure<_Lhs> + && __is_range_adaptor_closure<_Rhs> + constexpr auto operator|(_Lhs __lhs, _Rhs __rhs) { return _Pipe<_Lhs, _Rhs>{std::move(__lhs), std::move(__rhs)}; } - }; + } // namespace __closure + + using __closure::_RangeAdaptorClosure; // The base class of every range adaptor non-closure. // @@ -937,7 +952,7 @@ namespace views::__adaptor // A range adaptor closure that represents partial application of // the range adaptor _Adaptor with arguments _Args. template - struct _Partial : _RangeAdaptorClosure + struct _Partial : _RangeAdaptorClosure<_Partial<_Adaptor, _Args...>> { tuple<_Args...> _M_args; @@ -978,7 +993,7 @@ namespace views::__adaptor // A lightweight specialization of the above primary template for // the common case where _Adaptor accepts a single extra argument. template - struct _Partial<_Adaptor, _Arg> : _RangeAdaptorClosure + struct _Partial<_Adaptor, _Arg> : _RangeAdaptorClosure<_Partial<_Adaptor, _Arg>> { _Arg _M_arg; @@ -1011,7 +1026,7 @@ namespace views::__adaptor template requires __adaptor_has_simple_extra_args<_Adaptor, _Args...> && (is_trivially_copyable_v<_Args> && ...) - struct _Partial<_Adaptor, _Args...> : _RangeAdaptorClosure + struct _Partial<_Adaptor, _Args...> : _RangeAdaptorClosure<_Partial<_Adaptor, _Args...>> { tuple<_Args...> _M_args; @@ -1041,7 +1056,7 @@ namespace views::__adaptor template requires __adaptor_has_simple_extra_args<_Adaptor, _Arg> && is_trivially_copyable_v<_Arg> - struct _Partial<_Adaptor, _Arg> : _RangeAdaptorClosure + struct _Partial<_Adaptor, _Arg> : _RangeAdaptorClosure<_Partial<_Adaptor, _Arg>> { _Arg _M_arg; @@ -1066,7 +1081,7 @@ namespace views::__adaptor // A range adaptor closure that represents composition of the range // adaptor closures _Lhs and _Rhs. template - struct _Pipe : _RangeAdaptorClosure + struct _Pipe : _RangeAdaptorClosure<_Pipe<_Lhs, _Rhs>> { [[no_unique_address]] _Lhs _M_lhs; [[no_unique_address]] _Rhs _M_rhs; @@ -1102,7 +1117,7 @@ namespace views::__adaptor template requires __closure_has_simple_call_op<_Lhs> && __closure_has_simple_call_op<_Rhs> - struct _Pipe<_Lhs, _Rhs> : _RangeAdaptorClosure + struct _Pipe<_Lhs, _Rhs> : _RangeAdaptorClosure<_Pipe<_Lhs, _Rhs>> { [[no_unique_address]] _Lhs _M_lhs; [[no_unique_address]] _Rhs _M_rhs; @@ -1264,7 +1279,7 @@ namespace views::__adaptor concept __can_owning_view = requires { owning_view{std::declval<_Range>()}; }; } // namespace __detail - struct _All : __adaptor::_RangeAdaptorClosure + struct _All : __adaptor::_RangeAdaptorClosure<_All> { template static constexpr bool @@ -3048,7 +3063,7 @@ namespace views::__adaptor = requires { join_view>{std::declval<_Range>()}; }; } // namespace __detail - struct _Join : __adaptor::_RangeAdaptorClosure + struct _Join : __adaptor::_RangeAdaptorClosure<_Join> { template requires __detail::__can_join_view<_Range> @@ -3842,7 +3857,7 @@ namespace views::__adaptor = requires { common_view{std::declval<_Range>()}; }; } // namespace __detail - struct _Common : __adaptor::_RangeAdaptorClosure + struct _Common : __adaptor::_RangeAdaptorClosure<_Common> { template requires __detail::__already_common<_Range> @@ -3963,7 +3978,7 @@ namespace views::__adaptor = requires { reverse_view{std::declval<_Range>()}; }; } // namespace __detail - struct _Reverse : __adaptor::_RangeAdaptorClosure + struct _Reverse : __adaptor::_RangeAdaptorClosure<_Reverse> { template requires __detail::__is_reverse_view> @@ -4363,7 +4378,7 @@ namespace views::__adaptor } // namespace __detail template - struct _Elements : __adaptor::_RangeAdaptorClosure + struct _Elements : __adaptor::_RangeAdaptorClosure<_Elements<_Nm>> { template requires __detail::__can_elements_view<_Nm, _Range> @@ -5484,7 +5499,7 @@ namespace views::__adaptor } template - struct _Adjacent : __adaptor::_RangeAdaptorClosure + struct _Adjacent : __adaptor::_RangeAdaptorClosure<_Adjacent<_Nm>> { template requires (_Nm == 0) || __detail::__can_adjacent_view<_Nm, _Range> @@ -8609,7 +8624,7 @@ namespace views::__adaptor concept __can_as_rvalue_view = requires { as_rvalue_view(std::declval<_Tp>()); }; } - struct _AsRvalue : __adaptor::_RangeAdaptorClosure + struct _AsRvalue : __adaptor::_RangeAdaptorClosure<_AsRvalue> { template requires __detail::__can_as_rvalue_view<_Range> @@ -8918,7 +8933,7 @@ namespace views::__adaptor = requires { enumerate_view>(std::declval<_Tp>()); }; } - struct _Enumerate : __adaptor::_RangeAdaptorClosure + struct _Enumerate : __adaptor::_RangeAdaptorClosure<_Enumerate> { template requires __detail::__can_enumerate_view<_Range> @@ -9004,7 +9019,7 @@ namespace views::__adaptor concept __can_as_const_view = requires { as_const_view(std::declval<_Range>()); }; } - struct _AsConst : __adaptor::_RangeAdaptorClosure + struct _AsConst : __adaptor::_RangeAdaptorClosure<_AsConst> { template constexpr auto diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc index 57cb542174b..6bbaf73a20a 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/all.cc @@ -105,12 +105,6 @@ static_assert(std::is_empty_v); -#if 0 -// Adding empty range adaptor closure objects to a pipeline used to not -// increase the size of the pipeline, but now that our range adaptor closure -// objects derive from a common empty base class, [[no_unique_address]] can no -// longer make two empty adjacent range adaptor closure objects occupy the same -// data member address. static_assert(sizeof(decltype(views::take(5) | views::drop(5))) == sizeof(decltype(views::take(5) | views::join @@ -119,7 +113,6 @@ static_assert(sizeof(decltype(views::take(5) | views::drop(5))) | views::keys | views::drop(5) | views::reverse))); -#endif template void -- 2.40.0.335.g9857273be0