[libcxx-commits] [libcxx] [libc++][NFC] Remove special handling for __hash_value_type in <__node_handle> (PR #147271)
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Jul 7 03:21:54 PDT 2025
https://github.com/philnik777 created https://github.com/llvm/llvm-project/pull/147271
We're not instantiating `__hash_value_type` anymore, so we don't need any special handling of it here.
>From a4f58345f786e9b5b044c4ae49f5d514511aebd6 Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Mon, 7 Jul 2025 12:21:14 +0200
Subject: [PATCH] [libc++][NFC] Remove special handling for __hash_value_type
in <__node_handle>
---
libcxx/include/__node_handle | 31 ++++---------------------------
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/libcxx/include/__node_handle b/libcxx/include/__node_handle
index 5c559c657ef50..b20b0c73a0518 100644
--- a/libcxx/include/__node_handle
+++ b/libcxx/include/__node_handle
@@ -174,40 +174,17 @@ struct __set_node_handle_specifics {
_LIBCPP_HIDE_FROM_ABI value_type& value() const { return static_cast<_Derived const*>(this)->__ptr_->__get_value(); }
};
-template <class, class>
-struct __hash_value_type;
-
template <class _NodeType, class _Derived>
struct __map_node_handle_specifics {
- template <class _Tp>
- struct __get_type {
- using key_type = __remove_const_t<typename _Tp::first_type>;
- using mapped_type = typename _Tp::second_type;
- };
-
- template <class _Key, class _Mapped>
- struct __get_type<__hash_value_type<_Key, _Mapped> > {
- using key_type = _Key;
- using mapped_type = _Mapped;
- };
-
- using key_type = typename __get_type<typename _NodeType::__node_value_type>::key_type;
- using mapped_type = typename __get_type<typename _NodeType::__node_value_type>::mapped_type;
+ using key_type = __remove_const_t<typename _NodeType::__node_value_type::first_type>;
+ using mapped_type = typename _NodeType::__node_value_type::second_type;
_LIBCPP_HIDE_FROM_ABI key_type& key() const {
- if constexpr (__is_specialization_v<typename _NodeType::__node_value_type, __hash_value_type>) {
- return static_cast<_Derived const*>(this)->__ptr_->__get_value().__ref().first;
- } else {
- return const_cast<key_type&>(static_cast<_Derived const*>(this)->__ptr_->__get_value().first);
- }
+ return const_cast<key_type&>(static_cast<_Derived const*>(this)->__ptr_->__get_value().first);
}
_LIBCPP_HIDE_FROM_ABI mapped_type& mapped() const {
- if constexpr (__is_specialization_v<typename _NodeType::__node_value_type, __hash_value_type>) {
- return static_cast<_Derived const*>(this)->__ptr_->__get_value().__ref().second;
- } else {
- return static_cast<_Derived const*>(this)->__ptr_->__get_value().second;
- }
+ return static_cast<_Derived const*>(this)->__ptr_->__get_value().second;
}
};
More information about the libcxx-commits
mailing list