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 061D4385803D for ; Thu, 4 Nov 2021 18:33:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 061D4385803D Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-agOxc1pmPZeNoVKCojEwLg-1; Thu, 04 Nov 2021 14:33:24 -0400 X-MC-Unique: agOxc1pmPZeNoVKCojEwLg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9AF4BD520; Thu, 4 Nov 2021 18:33:23 +0000 (UTC) Received: from localhost (unknown [10.33.36.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DDEC19723; Thu, 4 Nov 2021 18:33:22 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Optimize std::tuple_element and std::tuple_size_v Date: Thu, 4 Nov 2021 18:33:22 +0000 Message-Id: <20211104183322.2123606-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=-14.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_LOW, RCVD_IN_MSPIKE_H2, 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: Thu, 04 Nov 2021 18:33:48 -0000 Tested powerpc64le-linux, committed to trunk. This reduces the number of class template instantiations needed for code using tuples, by reusing _Nth_type in tuple_element and specializing tuple_size_v for tuple, pair and array (and const-qualified versions of them). Also define the _Nth_type primary template as a complete type (but with no nested 'type' member). This avoids "invalid use of incomplete type" errors for out-of-range specializations of tuple_element. Those errors would probably be confusing and unhelpful for users. We already have a user-friendly static assert in tuple_element itself. Also ensure that tuple_size_v is available whenever tuple_size is (as proposed by LWG 3387). We already do that for tuple_element_t. libstdc++-v3/ChangeLog: * include/bits/stl_pair.h (tuple_size_v): Define partial specializations for std::pair. * include/bits/utility.h (_Nth_type): Move definition here and define primary template. (tuple_size_v): Move definition here. * include/std/array (tuple_size_v): Define partial specializations for std::array. * include/std/tuple (tuple_size_v): Move primary template to . Define partial specializations for std::tuple. (tuple_element): Change definition to use _Nth_type. * include/std/variant (_Nth_type): Move to . (variant_alternative, variant): Adjust qualification of _Nth_type. * testsuite/20_util/tuple/element_access/get_neg.cc: Prune additional errors from _Nth_type. --- libstdc++-v3/include/bits/stl_pair.h | 8 +++ libstdc++-v3/include/bits/utility.h | 51 +++++++++++++++- libstdc++-v3/include/std/array | 8 +++ libstdc++-v3/include/std/tuple | 39 +++++-------- libstdc++-v3/include/std/variant | 58 ++----------------- .../20_util/tuple/element_access/get_neg.cc | 1 + 6 files changed, 84 insertions(+), 81 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index 5b400daf97f..6081e0c7fe9 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -771,6 +771,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct tuple_element<1, pair<_Tp1, _Tp2>> { typedef _Tp2 type; }; +#if __cplusplus >= 201703L + template + inline constexpr size_t tuple_size_v> = 2; + + template + inline constexpr size_t tuple_size_v> = 2; +#endif + /// @cond undocumented template struct __pair_get; diff --git a/libstdc++-v3/include/bits/utility.h b/libstdc++-v3/include/bits/utility.h index fce52a4530d..c9ffa008217 100644 --- a/libstdc++-v3/include/bits/utility.h +++ b/libstdc++-v3/include/bits/utility.h @@ -70,6 +70,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct tuple_size> : public tuple_size<_Tp> { }; +#if __cplusplus >= 201703L + template + inline constexpr size_t tuple_size_v = tuple_size<_Tp>::value; +#endif + /// Gives the type of the ith element of a given tuple type. template struct tuple_element; @@ -97,8 +102,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; #if __cplusplus >= 201402L -// The standard says this macro and alias template should be in -// but we define them here, to be available in and too. +// The standard says this macro and alias template should be in but we +// we define them here, to be available in , and too. +// _GLIBCXX_RESOLVE_LIB_DEFECTS +// 3378. tuple_size_v/tuple_element_t should be available when +// tuple_size/tuple_element are #define __cpp_lib_tuple_element_t 201402L template @@ -195,6 +203,45 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif // C++17 #endif // C++14 + template + struct _Nth_type + { }; + + template + struct _Nth_type<0, _Tp0, _Rest...> + { using type = _Tp0; }; + + template + struct _Nth_type<1, _Tp0, _Tp1, _Rest...> + { using type = _Tp1; }; + + template + struct _Nth_type<2, _Tp0, _Tp1, _Tp2, _Rest...> + { using type = _Tp2; }; + + template +#if __cpp_concepts + requires (_Np >= 3) +#endif + struct _Nth_type<_Np, _Tp0, _Tp1, _Tp2, _Rest...> + : _Nth_type<_Np - 3, _Rest...> + { }; + +#if ! __cpp_concepts // Need additional specializations to avoid ambiguities. + template + struct _Nth_type<0, _Tp0, _Tp1, _Rest...> + { using type = _Tp0; }; + + template + struct _Nth_type<0, _Tp0, _Tp1, _Tp2, _Rest...> + { using type = _Tp0; }; + + template + struct _Nth_type<1, _Tp0, _Tp1, _Tp2, _Rest...> + { using type = _Tp1; }; +#endif + _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index 3e12d35157c..413f8e2be01 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -481,6 +481,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using type = _Tp; }; +#if __cplusplus >= 201703L + template + inline constexpr size_t tuple_size_v> = _Nm; + + template + inline constexpr size_t tuple_size_v> = _Nm; +#endif + template struct __is_tuple_like_impl> : true_type { }; diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index aaee0b8826a..b82cdf12569 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -1344,36 +1344,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct tuple_size> : public integral_constant { }; -#if __cplusplus > 201402L - template - inline constexpr size_t tuple_size_v = tuple_size<_Tp>::value; +#if __cplusplus >= 201703L + template + inline constexpr size_t tuple_size_v> + = sizeof...(_Types); + + template + inline constexpr size_t tuple_size_v> + = sizeof...(_Types); #endif - /** - * Recursive case for tuple_element: strip off the first element in - * the tuple and retrieve the (i-1)th element of the remaining tuple. - */ - template - struct tuple_element<__i, tuple<_Head, _Tail...> > - : tuple_element<__i - 1, tuple<_Tail...> > { }; - - /** - * Basis case for tuple_element: The first element is the one we're seeking. - */ - template - struct tuple_element<0, tuple<_Head, _Tail...> > + /// Trait to get the Ith element type from a tuple. + template + struct tuple_element<__i, tuple<_Types...>> { - typedef _Head type; - }; + static_assert(__i < sizeof...(_Types), "tuple index must be in range"); - /** - * Error case for tuple_element: invalid index. - */ - template - struct tuple_element<__i, tuple<>> - { - static_assert(__i < tuple_size>::value, - "tuple index must be in range"); + using type = typename _Nth_type<__i, _Types...>::type; }; template diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index c4c307b7bb2..993ce3dba91 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -54,51 +54,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -namespace __detail -{ -namespace __variant -{ - template - struct _Nth_type; - - template - struct _Nth_type<0, _Tp0, _Rest...> - { using type = _Tp0; }; - - template - struct _Nth_type<1, _Tp0, _Tp1, _Rest...> - { using type = _Tp1; }; - - template - struct _Nth_type<2, _Tp0, _Tp1, _Tp2, _Rest...> - { using type = _Tp2; }; - - template -#if __cpp_concepts - requires (_Np >= 3) -#endif - struct _Nth_type<_Np, _Tp0, _Tp1, _Tp2, _Rest...> - : _Nth_type<_Np - 3, _Rest...> - { }; - -#if ! __cpp_concepts // Need additional specializations to avoid ambiguities. - template - struct _Nth_type<0, _Tp0, _Tp1, _Rest...> - { using type = _Tp0; }; - - template - struct _Nth_type<0, _Tp0, _Tp1, _Tp2, _Rest...> - { using type = _Tp0; }; - - template - struct _Nth_type<1, _Tp0, _Tp1, _Tp2, _Rest...> - { using type = _Tp1; }; -#endif - -} // namespace __variant -} // namespace __detail - #if __cplusplus >= 202002L && __cpp_concepts // P2231R1 constexpr needs constexpr unions and constrained destructors. # define __cpp_lib_variant 202106L @@ -145,8 +100,7 @@ namespace __variant { static_assert(_Np < sizeof...(_Types)); - using type - = typename __detail::__variant::_Nth_type<_Np, _Types...>::type; + using type = typename _Nth_type<_Np, _Types...>::type; }; template @@ -1442,8 +1396,7 @@ namespace __variant = __detail::__variant::__accepted_index<_Tp, variant>::value; template> - using __to_type - = typename __detail::__variant::_Nth_type<_Np, _Types...>::type; + using __to_type = typename _Nth_type<_Np, _Types...>::type; template>> using __accepted_type = __to_type<__accepted_index<_Tp>>; @@ -1580,7 +1533,7 @@ namespace __variant emplace(_Args&&... __args) { namespace __variant = std::__detail::__variant; - using type = typename __variant::_Nth_type<_Np, _Types...>::type; + using type = typename _Nth_type<_Np, _Types...>::type; // Provide the strong exception-safety guarantee when possible, // to avoid becoming valueless. if constexpr (is_nothrow_constructible_v) @@ -1620,7 +1573,7 @@ namespace __variant emplace(initializer_list<_Up> __il, _Args&&... __args) { namespace __variant = std::__detail::__variant; - using type = typename __variant::_Nth_type<_Np, _Types...>::type; + using type = typename _Nth_type<_Np, _Types...>::type; // Provide the strong exception-safety guarantee when possible, // to avoid becoming valueless. if constexpr (is_nothrow_constructible_v::type; + using _V0 = typename _Nth_type<0, _Variants...>::type; // The number of alternatives in that first variant. constexpr auto __n = variant_size_v>; diff --git a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc index 225bb6245a6..113a7fd62de 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc @@ -60,3 +60,4 @@ test03() } // { dg-error "tuple index must be in range" "" { target *-*-* } 0 } +// { dg-prune-output "no type named 'type' in .*_Nth_type" } -- 2.31.1