[libcxx-commits] [libcxx] Speed up compilation of common uses of std::visit() by ~8x (PR #164196)
via libcxx-commits
libcxx-commits at lists.llvm.org
Fri Nov 28 07:50:24 PST 2025
https://github.com/higher-performance updated https://github.com/llvm/llvm-project/pull/164196
>From ed6da80dc0c4605d86907bbccd1099d7bdea128e Mon Sep 17 00:00:00 2001
From: higher-performance <higher.performance.github at gmail.com>
Date: Fri, 28 Nov 2025 10:48:16 -0500
Subject: [PATCH] Speed up compilation of std::visit() by ~8x by hard-coding
the most common cases
---
libcxx/include/variant | 43 +++++++++++++++++++++++++++++++++++++++---
1 file changed, 40 insertions(+), 3 deletions(-)
diff --git a/libcxx/include/variant b/libcxx/include/variant
index df587ccf23843..0731e7c4578ed 100644
--- a/libcxx/include/variant
+++ b/libcxx/include/variant
@@ -1323,6 +1323,10 @@ private:
friend struct __variant_detail::__visitation::__variant;
};
+template <class... _Types>
+variant<_Types...> __upcast_to_variant(const volatile variant<_Types...>*);
+void __upcast_to_variant(...);
+
template <size_t _Ip, class... _Types>
_LIBCPP_HIDE_FROM_ABI constexpr bool __holds_alternative(const variant<_Types...>& __v) noexcept {
return __v.index() == _Ip;
@@ -1578,9 +1582,42 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __throw_if_valueless(_Vs&&... __vs) {
template < class _Visitor, class... _Vs, typename>
_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) visit(_Visitor&& __visitor, _Vs&&... __vs) {
- using __variant_detail::__visitation::__variant;
- std::__throw_if_valueless(std::forward<_Vs>(__vs)...);
- return __variant::__visit_value(std::forward<_Visitor>(__visitor), std::forward<_Vs>(__vs)...);
+# define _LIBCPP_VARIANT_DISPATCH_INDEX(_I) \
+ case _I: \
+ if constexpr (__variant_size::value > _I) { \
+ return std::forward<_Visitor>(__visitor)(__variant::__get_alt<_I>(std::forward<_Vs>(__vs)...).__value); \
+ } \
+ [[__fallthrough__]]
+# define _LIBCPP_VARIANT_DISPATCH_COUNT 8 // Speed up compilation for the common cases
+ using __variant_size = variant_size<decltype(std::__upcast_to_variant(std::declval<remove_reference_t<_Vs>*>()...))>;
+ if constexpr (sizeof...(_Vs) == 1 &&
+ conditional_t<is_same_v<variant_size<void>, __variant_size>,
+ std::integral_constant<size_t, variant_npos>,
+ __variant_size>::value < _LIBCPP_VARIANT_DISPATCH_COUNT) {
+ using __variant_detail::__access::__variant;
+ const size_t __indices[] = {
+ __vs.decltype(std::__upcast_to_variant(std::declval<remove_reference_t<_Vs>*>()))::index()...};
+ switch (__indices[0]) {
+ enum : size_t { _I0 = __LINE__ + 1 }; // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ _LIBCPP_VARIANT_DISPATCH_INDEX(__LINE__ - _I0); // New line required
+ static_assert(__LINE__ - _I0 == _LIBCPP_VARIANT_DISPATCH_COUNT, "index count mismatch");
+ default:
+ std::__throw_bad_variant_access();
+ }
+ } else {
+ using __variant_detail::__visitation::__variant;
+ std::__throw_if_valueless(std::forward<_Vs>(__vs)...);
+ return __variant::__visit_value(std::forward<_Visitor>(__visitor), std::forward<_Vs>(__vs)...);
+ }
+# undef _LIBCPP_VARIANT_DISPATCH_COUNT
+# undef _LIBCPP_VARIANT_DISPATCH_INDEX
}
# if _LIBCPP_STD_VER >= 20
More information about the libcxx-commits
mailing list