From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 683453857C49; Tue, 12 Apr 2022 20:17:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 683453857C49 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-9831] libstdc++: Allow visiting inherited variants [PR 90943] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 7aa5f05583066f5b3146c999319288631c75597f X-Git-Newrev: 90b94ca5a2ddd7834afff9ad5e1afff5554e0752 Message-Id: <20220412201758.683453857C49@sourceware.org> Date: Tue, 12 Apr 2022 20:17:58 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2022 20:17:58 -0000 https://gcc.gnu.org/g:90b94ca5a2ddd7834afff9ad5e1afff5554e0752 commit r11-9831-g90b94ca5a2ddd7834afff9ad5e1afff5554e0752 Author: Jonathan Wakely Date: Mon Apr 19 14:49:12 2021 +0100 libstdc++: Allow visiting inherited variants [PR 90943] Implement the changes from P2162R2 (as a DR for C++17). Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/90943 * include/std/variant (__cpp_lib_variant): Update value. (__detail::__variant::__as): New helpers implementing the as-variant exposition-only function templates. (visit, visit): Use __as to upcast the variant parameters. * include/std/version (__cpp_lib_variant): Update value. * testsuite/20_util/variant/visit_inherited.cc: New test. (cherry picked from commit c46ecb0112e91c80ee111439e79a58a953e4479d) Diff: --- libstdc++-v3/include/std/variant | 53 +++++++++++++++++----- libstdc++-v3/include/std/version | 2 +- .../testsuite/20_util/variant/visit_inherited.cc | 36 +++++++++++++++ 3 files changed, 79 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index a4e038e0ec8..769b4682bb7 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -71,7 +71,7 @@ namespace __variant } // namespace __variant } // namespace __detail -#define __cpp_lib_variant 201606L +#define __cpp_lib_variant 202102L template class tuple; template class variant; @@ -202,6 +202,28 @@ namespace __variant std::forward<_Variants>(__variants)...); } + // The __as function templates implement the exposition-only "as-variant" + + template + constexpr std::variant<_Types...>& + __as(std::variant<_Types...>& __v) + { return __v; } + + template + constexpr const std::variant<_Types...>& + __as(const std::variant<_Types...>& __v) noexcept + { return __v; } + + template + constexpr std::variant<_Types...>&& + __as(std::variant<_Types...>&& __v) noexcept + { return std::move(__v); } + + template + constexpr const std::variant<_Types...>&& + __as(const std::variant<_Types...>&& __v) noexcept + { return std::move(__v); } + // _Uninitialized is guaranteed to be a trivially destructible type, // even if T is not. template> @@ -1063,8 +1085,12 @@ namespace __variant std::index_sequence<__indices...>> : _Base_dedup<__indices, __poison_hash>>... { }; - template - using __get_t = decltype(std::get<_Np>(std::declval<_Variant>())); + // Equivalent to decltype(get<_Np>(as-variant(declval<_Variant>()))) + template())), + typename _Tp = variant_alternative_t<_Np, remove_reference_t<_AsV>>> + using __get_t + = conditional_t, _Tp&, _Tp&&>; // Return type of std::visit. template @@ -1741,7 +1767,9 @@ namespace __variant constexpr __detail::__variant::__visit_result_t<_Visitor, _Variants...> visit(_Visitor&& __visitor, _Variants&&... __variants) { - if ((__variants.valueless_by_exception() || ...)) + namespace __variant = std::__detail::__variant; + + if ((__variant::__as(__variants).valueless_by_exception() || ...)) __throw_bad_variant_access("std::visit: variant is valueless"); using _Result_type @@ -1751,10 +1779,11 @@ namespace __variant if constexpr (sizeof...(_Variants) == 1) { + using _Vp = decltype(__variant::__as(std::declval<_Variants>()...)); + constexpr bool __visit_rettypes_match = __detail::__variant:: - __check_visitor_results<_Visitor, _Variants...>( - std::make_index_sequence< - std::variant_size...>::value>()); + __check_visitor_results<_Visitor, _Vp>( + make_index_sequence>>()); if constexpr (!__visit_rettypes_match) { static_assert(__visit_rettypes_match, @@ -1765,12 +1794,12 @@ namespace __variant else return std::__do_visit<_Tag>( std::forward<_Visitor>(__visitor), - std::forward<_Variants>(__variants)...); + static_cast<_Vp>(__variants)...); } else return std::__do_visit<_Tag>( std::forward<_Visitor>(__visitor), - std::forward<_Variants>(__variants)...); + __variant::__as(std::forward<_Variants>(__variants))...); } #if __cplusplus > 201703L @@ -1778,11 +1807,13 @@ namespace __variant constexpr _Res visit(_Visitor&& __visitor, _Variants&&... __variants) { - if ((__variants.valueless_by_exception() || ...)) + namespace __variant = std::__detail::__variant; + + if ((__variant::__as(__variants).valueless_by_exception() || ...)) __throw_bad_variant_access("std::visit: variant is valueless"); return std::__do_visit<_Res>(std::forward<_Visitor>(__visitor), - std::forward<_Variants>(__variants)...); + __variant::__as(std::forward<_Variants>(__variants))...); } #endif diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index b565e8d976a..f35b9da2307 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -168,7 +168,7 @@ # define __cpp_lib_to_chars 201611L #endif #define __cpp_lib_unordered_map_try_emplace 201411 -#define __cpp_lib_variant 201606L +#define __cpp_lib_variant 202102L #endif #if __cplusplus >= 202002L diff --git a/libstdc++-v3/testsuite/20_util/variant/visit_inherited.cc b/libstdc++-v3/testsuite/20_util/variant/visit_inherited.cc new file mode 100644 index 00000000000..ade83096475 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/variant/visit_inherited.cc @@ -0,0 +1,36 @@ +// { dg-do compile { target c++17 } } + +#include + +// P2062R2 Inheriting from std::variant (resolving LWG 3052) + +#if __cpp_lib_variant < 202102L +#error __cpp_lib_variant has the wrong value in +#endif + +struct V : std::variant { + using std::variant::variant; +}; + +constexpr int +test01() +{ + V v = 42; + return std::visit([](int&){ return 17; }, v); +} +static_assert( test01() == 17 ); + +constexpr int +test02() +{ + const V c = 77; + std::variant x = 88L; + return std::visit([](auto&& a, auto&& b) { + if constexpr (std::is_same_v) + if constexpr (std::is_same_v) + return 99; + return 0; + }, + std::move(c), std::move(x)); +} +static_assert( test02() == 99 );