@@ -1323,6 +1323,10 @@ private:
13231323 friend struct __variant_detail ::__visitation::__variant;
13241324};
13251325
1326+ template <class ... _Types>
1327+ variant<_Types...> __upcast_to_variant (const volatile variant<_Types...>*);
1328+ void __upcast_to_variant (...);
1329+
13261330template <size_t _Ip, class ... _Types>
13271331_LIBCPP_HIDE_FROM_ABI constexpr bool __holds_alternative (const variant<_Types...>& __v) noexcept {
13281332 return __v.index () == _Ip;
@@ -1576,22 +1580,83 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __throw_if_valueless(_Vs&&... __vs) {
15761580 }
15771581}
15781582
1583+ # define _LIBCPP_VARIANT_DISPATCH_COUNT 11 // Speed up compilation for the common cases
1584+ # define _LIBCPP_VARIANT_DISPATCH_INDEX (_I ) \
1585+ case _I: \
1586+ if constexpr (_I < __variant_size) { \
1587+ return std::__invoke (std::forward<_Visitor>(__visitor), __variant::__get_alt<_I>(std::forward<_Vs>(__vs)...).__value ); \
1588+ } \
1589+ [[__fallthrough__]]
1590+
15791591template < class _Visitor , class ... _Vs, typename >
15801592_LIBCPP_HIDE_FROM_ABI constexpr decltype (auto ) visit(_Visitor&& __visitor, _Vs&&... __vs) {
1581- using __variant_detail::__visitation::__variant;
1582- std::__throw_if_valueless (std::forward<_Vs>(__vs)...);
1583- return __variant::__visit_value (std::forward<_Visitor>(__visitor), std::forward<_Vs>(__vs)...);
1593+ using __variant_type = decltype (std::__upcast_to_variant (std::declval<remove_reference_t <_Vs>*>()...));
1594+ constexpr size_t __variant_size = conditional_t <is_void_v<__variant_type>,
1595+ std::integral_constant<size_t , variant_npos>,
1596+ variant_size<__variant_type>>::value;
1597+ if constexpr (__variant_size < _LIBCPP_VARIANT_DISPATCH_COUNT) {
1598+ using __variant_detail::__access::__variant;
1599+ switch ((..., __vs.__variant_type ::index ())) {
1600+ enum : size_t { _I0 = __LINE__ + 1 }; // New line required
1601+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1602+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1603+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1604+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1605+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1606+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1607+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1608+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1609+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1610+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1611+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1612+ static_assert (__LINE__ - _I0 == _LIBCPP_VARIANT_DISPATCH_COUNT, " index count mismatch" );
1613+ default :
1614+ std::__throw_bad_variant_access ();
1615+ }
1616+ } else {
1617+ using __variant_detail::__visitation::__variant;
1618+ std::__throw_if_valueless (std::forward<_Vs>(__vs)...);
1619+ return __variant::__visit_value (std::forward<_Visitor>(__visitor), std::forward<_Vs>(__vs)...);
1620+ }
15841621}
15851622
15861623# if _LIBCPP_STD_VER >= 20
15871624template < class _Rp , class _Visitor , class ... _Vs, typename >
15881625_LIBCPP_HIDE_FROM_ABI constexpr _Rp visit (_Visitor&& __visitor, _Vs&&... __vs) {
1589- using __variant_detail::__visitation::__variant;
1590- std::__throw_if_valueless (std::forward<_Vs>(__vs)...);
1591- return __variant::__visit_value<_Rp>(std::forward<_Visitor>(__visitor), std::forward<_Vs>(__vs)...);
1626+ using __variant_type = decltype (std::__upcast_to_variant (std::declval<remove_reference_t <_Vs>*>()...));
1627+ constexpr size_t __variant_size = conditional_t <is_void_v<__variant_type>,
1628+ std::integral_constant<size_t , variant_npos>,
1629+ variant_size<__variant_type>>::value;
1630+ if constexpr (__variant_size < _LIBCPP_VARIANT_DISPATCH_COUNT) {
1631+ using __variant_detail::__access::__variant;
1632+ switch ((..., __vs.__variant_type ::index ())) {
1633+ enum : size_t { _I0 = __LINE__ + 1 }; // New line required
1634+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1635+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1636+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1637+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1638+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1639+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1640+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1641+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1642+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1643+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1644+ _LIBCPP_VARIANT_DISPATCH_INDEX (__LINE__ - _I0); // New line required
1645+ static_assert (__LINE__ - _I0 == _LIBCPP_VARIANT_DISPATCH_COUNT, " index count mismatch" );
1646+ default :
1647+ std::__throw_bad_variant_access ();
1648+ }
1649+ } else {
1650+ using __variant_detail::__visitation::__variant;
1651+ std::__throw_if_valueless (std::forward<_Vs>(__vs)...);
1652+ return __variant::__visit_value<_Rp>(std::forward<_Visitor>(__visitor), std::forward<_Vs>(__vs)...);
1653+ }
15921654}
15931655# endif
15941656
1657+ # undef _LIBCPP_VARIANT_DISPATCH_INDEX
1658+ # undef _LIBCPP_VARIANT_DISPATCH_COUNT
1659+
15951660template <class ... _Types>
15961661_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 auto
15971662swap (variant<_Types...>& __lhs, variant<_Types...>& __rhs) noexcept (noexcept (__lhs.swap(__rhs)))
0 commit comments