Skip to content

[libc++] Set the child pointer outside __insert_node_at in __tree #152685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[libc++] Set the child pointer outside __insert_node_at in __tree #152685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 37 additions & 20 deletions libcxx/include/__tree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,8 +1030,7 @@ public:
template <class _Key>
_LIBCPP_HIDE_FROM_ABI size_type __erase_multi(const _Key& __k);

_LIBCPP_HIDE_FROM_ABI void
__insert_node_at(__end_node_pointer __parent, __node_base_pointer& __child, __node_base_pointer __new_node) _NOEXCEPT;
_LIBCPP_HIDE_FROM_ABI void __insert_node_at(__end_node_pointer __parent, __node_base_pointer __new_node) _NOEXCEPT;

template <class _Key>
_LIBCPP_HIDE_FROM_ABI iterator find(const _Key& __v);
Expand Down Expand Up @@ -1737,15 +1736,18 @@ typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer& __tree<_Tp, _Co

template <class _Tp, class _Compare, class _Allocator>
void __tree<_Tp, _Compare, _Allocator>::__insert_node_at(
__end_node_pointer __parent, __node_base_pointer& __child, __node_base_pointer __new_node) _NOEXCEPT {
__end_node_pointer __parent, __node_base_pointer __new_node) _NOEXCEPT {
_LIBCPP_ASSERT_INTERNAL(
__parent->__left_ == __new_node ||
(__parent != __end_node() && static_cast<__node_base_pointer>(__parent)->__right_ == __new_node),
"__parent isn't the parent of __new_node!");
__new_node->__left_ = nullptr;
__new_node->__right_ = nullptr;
__new_node->__parent_ = __parent;
// __new_node->__is_black_ is initialized in __tree_balance_after_insert
__child = __new_node;
if (__begin_node_->__left_ != nullptr)
__begin_node_ = static_cast<__end_node_pointer>(__begin_node_->__left_);
std::__tree_balance_after_insert(__end_node()->__left_, __child);
std::__tree_balance_after_insert(__end_node()->__left_, __new_node);
++__size_;
}

Expand All @@ -1759,7 +1761,8 @@ __tree<_Tp, _Compare, _Allocator>::__emplace_unique_key_args(_Key const& __k, _A
bool __inserted = false;
if (__child == nullptr) {
__node_holder __h = __construct_node(std::forward<_Args>(__args)...);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
__child = static_cast<__node_base_pointer>(__h.get());
__insert_node_at(__parent, __child);
__r = __h.release();
__inserted = true;
}
Expand All @@ -1778,7 +1781,8 @@ __tree<_Tp, _Compare, _Allocator>::__emplace_hint_unique_key_args(
bool __inserted = false;
if (__child == nullptr) {
__node_holder __h = __construct_node(std::forward<_Args>(__args)...);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
__child = static_cast<__node_base_pointer>(__h.get());
__insert_node_at(__parent, __child);
__r = __h.release();
__inserted = true;
}
Expand Down Expand Up @@ -1806,7 +1810,8 @@ __tree<_Tp, _Compare, _Allocator>::__emplace_unique_impl(_Args&&... __args) {
__node_pointer __r = static_cast<__node_pointer>(__child);
bool __inserted = false;
if (__child == nullptr) {
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
__child = static_cast<__node_base_pointer>(__h.get());
__insert_node_at(__parent, __child);
__r = __h.release();
__inserted = true;
}
Expand All @@ -1823,7 +1828,8 @@ __tree<_Tp, _Compare, _Allocator>::__emplace_hint_unique_impl(const_iterator __p
__node_base_pointer& __child = __find_equal(__p, __parent, __dummy, __h->__value_);
__node_pointer __r = static_cast<__node_pointer>(__child);
if (__child == nullptr) {
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
__child = static_cast<__node_base_pointer>(__h.get());
__insert_node_at(__parent, __child);
__r = __h.release();
}
return iterator(__r);
Expand All @@ -1836,7 +1842,8 @@ __tree<_Tp, _Compare, _Allocator>::__emplace_multi(_Args&&... __args) {
__node_holder __h = __construct_node(std::forward<_Args>(__args)...);
__end_node_pointer __parent;
__node_base_pointer& __child = __find_leaf_high(__parent, __h->__value_);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
__child = static_cast<__node_base_pointer>(__h.get());
__insert_node_at(__parent, __child);
return iterator(static_cast<__node_pointer>(__h.release()));
}

Expand All @@ -1847,7 +1854,8 @@ __tree<_Tp, _Compare, _Allocator>::__emplace_hint_multi(const_iterator __p, _Arg
__node_holder __h = __construct_node(std::forward<_Args>(__args)...);
__end_node_pointer __parent;
__node_base_pointer& __child = __find_leaf(__p, __parent, __h->__value_);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
__child = static_cast<__node_base_pointer>(__h.get());
__insert_node_at(__parent, __child);
return iterator(static_cast<__node_pointer>(__h.release()));
}

Expand All @@ -1860,7 +1868,8 @@ __tree<_Tp, _Compare, _Allocator>::__node_assign_unique(const value_type& __v, _
bool __inserted = false;
if (__child == nullptr) {
__assign_value(__nd->__value_, __v);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
__child = static_cast<__node_base_pointer>(__nd);
__insert_node_at(__parent, __child);
__r = __nd;
__inserted = true;
}
Expand All @@ -1872,7 +1881,8 @@ typename __tree<_Tp, _Compare, _Allocator>::iterator
__tree<_Tp, _Compare, _Allocator>::__node_insert_multi(__node_pointer __nd) {
__end_node_pointer __parent;
__node_base_pointer& __child = __find_leaf_high(__parent, __nd->__value_);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
__child = static_cast<__node_base_pointer>(__nd);
__insert_node_at(__parent, __child);
return iterator(__nd);
}

Expand All @@ -1881,7 +1891,8 @@ typename __tree<_Tp, _Compare, _Allocator>::iterator
__tree<_Tp, _Compare, _Allocator>::__node_insert_multi(const_iterator __p, __node_pointer __nd) {
__end_node_pointer __parent;
__node_base_pointer& __child = __find_leaf(__p, __parent, __nd->__value_);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
__child = static_cast<__node_base_pointer>(__nd);
__insert_node_at(__parent, __child);
return iterator(__nd);
}

Expand Down Expand Up @@ -1911,7 +1922,8 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(_NodeHandle&& __n
if (__child != nullptr)
return _InsertReturnType{iterator(static_cast<__node_pointer>(__child)), false, std::move(__nh)};

__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
__child = static_cast<__node_base_pointer>(__ptr);
__insert_node_at(__parent, __child);
__nh.__release_ptr();
return _InsertReturnType{iterator(__ptr), true, _NodeHandle()};
}
Expand All @@ -1929,7 +1941,8 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(const_iterator __
__node_base_pointer& __child = __find_equal(__hint, __parent, __dummy, __ptr->__value_);
__node_pointer __r = static_cast<__node_pointer>(__child);
if (__child == nullptr) {
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
__child = static_cast<__node_base_pointer>(__ptr);
__insert_node_at(__parent, __child);
__r = __ptr;
__nh.__release_ptr();
}
Expand Down Expand Up @@ -1966,7 +1979,8 @@ _LIBCPP_HIDE_FROM_ABI void __tree<_Tp, _Compare, _Allocator>::__node_handle_merg
if (__child != nullptr)
continue;
__source.__remove_node_pointer(__src_ptr);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__src_ptr));
__child = static_cast<__node_base_pointer>(__src_ptr);
__insert_node_at(__parent, __child);
}
}

Expand All @@ -1979,7 +1993,8 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(_NodeHandle&& __nh
__node_pointer __ptr = __nh.__ptr_;
__end_node_pointer __parent;
__node_base_pointer& __child = __find_leaf_high(__parent, __ptr->__value_);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
__child = static_cast<__node_base_pointer>(__ptr);
__insert_node_at(__parent, __child);
__nh.__release_ptr();
return iterator(__ptr);
}
Expand All @@ -1994,7 +2009,8 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(const_iterator __h
__node_pointer __ptr = __nh.__ptr_;
__end_node_pointer __parent;
__node_base_pointer& __child = __find_leaf(__hint, __parent, __ptr->__value_);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
__child = static_cast<__node_base_pointer>(__ptr);
__insert_node_at(__parent, __child);
__nh.__release_ptr();
return iterator(__ptr);
}
Expand All @@ -2010,7 +2026,8 @@ _LIBCPP_HIDE_FROM_ABI void __tree<_Tp, _Compare, _Allocator>::__node_handle_merg
__node_base_pointer& __child = __find_leaf_high(__parent, __src_ptr->__value_);
++__i;
__source.__remove_node_pointer(__src_ptr);
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__src_ptr));
__child = static_cast<__node_base_pointer>(__src_ptr);
__insert_node_at(__parent, __child);
}
}

Expand Down
3 changes: 2 additions & 1 deletion libcxx/include/map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,8 @@ _Tp& map<_Key, _Tp, _Compare, _Allocator>::operator[](const key_type& __k) {
__node_pointer __r = static_cast<__node_pointer>(__child);
if (__child == nullptr) {
__node_holder __h = __construct_node_with_key(__k);
__tree_.__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
__child = static_cast<__node_base_pointer>(__h.get());
__tree_.__insert_node_at(__parent, __child);
__r = __h.release();
}
return __r->__value_.second;
Expand Down
Loading