Skip to content

[libc++] Fix insert() calling incorrect constructors #146231

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

Merged
merged 1 commit into from
Jul 10, 2025
Merged

[libc++] Fix insert() calling incorrect constructors #146231

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
27 changes: 2 additions & 25 deletions libcxx/include/__hash_table
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,15 +852,6 @@ public:
template <class... _Args>
_LIBCPP_HIDE_FROM_ABI iterator __emplace_hint_multi(const_iterator __p, _Args&&... __args);

_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __insert_unique(__container_value_type&& __x) {
return __emplace_unique_key_args(_NodeTypes::__get_key(__x), std::move(__x));
}

template <class _Pp, __enable_if_t<!is_same<__remove_cvref_t<_Pp>, __container_value_type>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __insert_unique(_Pp&& __x) {
return __emplace_unique(std::forward<_Pp>(__x));
}

template <class _ValueT = _Tp, __enable_if_t<__is_hash_value_type<_ValueT>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI void __insert_unique_from_orphaned_node(value_type&& __value) {
using __key_type = typename _NodeTypes::key_type;
Expand All @@ -877,16 +868,6 @@ public:
__h.release();
}

template <class _Pp>
_LIBCPP_HIDE_FROM_ABI iterator __insert_multi(_Pp&& __x) {
return __emplace_multi(std::forward<_Pp>(__x));
}

template <class _Pp>
_LIBCPP_HIDE_FROM_ABI iterator __insert_multi(const_iterator __p, _Pp&& __x) {
return __emplace_hint_multi(__p, std::forward<_Pp>(__x));
}

template <class _ValueT = _Tp, __enable_if_t<__is_hash_value_type<_ValueT>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI void __insert_multi_from_orphaned_node(value_type&& __value) {
using __key_type = typename _NodeTypes::key_type;
Expand All @@ -903,10 +884,6 @@ public:
__h.release();
}

_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __insert_unique(const __container_value_type& __x) {
return __emplace_unique_key_args(_NodeTypes::__get_key(__x), __x);
}

#if _LIBCPP_STD_VER >= 17
template <class _NodeHandle, class _InsertReturnType>
_LIBCPP_HIDE_FROM_ABI _InsertReturnType __node_handle_insert_unique(_NodeHandle&& __nh);
Expand Down Expand Up @@ -1336,7 +1313,7 @@ void __hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_unique(_InputIterator __
__deallocate_node(__cache);
}
for (; __first != __last; ++__first)
__insert_unique(*__first);
__emplace_unique(*__first);
}

template <class _Tp, class _Hash, class _Equal, class _Alloc>
Expand Down Expand Up @@ -1368,7 +1345,7 @@ void __hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_multi(_InputIterator __f
__deallocate_node(__cache);
}
for (; __first != __last; ++__first)
__insert_multi(_NodeTypes::__get_value(*__first));
__emplace_multi(_NodeTypes::__get_value(*__first));
}

template <class _Tp, class _Hash, class _Equal, class _Alloc>
Expand Down
46 changes: 2 additions & 44 deletions libcxx/include/__tree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,32 +1015,6 @@ public:
return __emplace_hint_unique_key_args(__p, __x.first, std::forward<_Pp>(__x)).first;
}

_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __insert_unique(const value_type& __v) {
return __emplace_unique_key_args(__v, __v);
}

_LIBCPP_HIDE_FROM_ABI iterator __insert_unique(const_iterator __p, const value_type& __v) {
return __emplace_hint_unique_key_args(__p, __v, __v).first;
}

_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __insert_unique(value_type&& __v) {
return __emplace_unique_key_args(__v, std::move(__v));
}

_LIBCPP_HIDE_FROM_ABI iterator __insert_unique(const_iterator __p, value_type&& __v) {
return __emplace_hint_unique_key_args(__p, __v, std::move(__v)).first;
}

template <class _Vp, __enable_if_t<!is_same<__remove_const_ref_t<_Vp>, value_type>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __insert_unique(_Vp&& __v) {
return __emplace_unique(std::forward<_Vp>(__v));
}

template <class _Vp, __enable_if_t<!is_same<__remove_const_ref_t<_Vp>, value_type>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI iterator __insert_unique(const_iterator __p, _Vp&& __v) {
return __emplace_hint_unique(__p, std::forward<_Vp>(__v));
}

template <class _ValueT = _Tp, __enable_if_t<__is_tree_value_type<_ValueT>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI void
__insert_unique_from_orphaned_node(const_iterator __p, __get_node_value_type_t<_Tp>&& __value) {
Expand All @@ -1052,22 +1026,6 @@ public:
__emplace_hint_unique(__p, std::move(__value));
}

_LIBCPP_HIDE_FROM_ABI iterator __insert_multi(value_type&& __v) { return __emplace_multi(std::move(__v)); }

_LIBCPP_HIDE_FROM_ABI iterator __insert_multi(const_iterator __p, value_type&& __v) {
return __emplace_hint_multi(__p, std::move(__v));
}

template <class _Vp>
_LIBCPP_HIDE_FROM_ABI iterator __insert_multi(_Vp&& __v) {
return __emplace_multi(std::forward<_Vp>(__v));
}

template <class _Vp>
_LIBCPP_HIDE_FROM_ABI iterator __insert_multi(const_iterator __p, _Vp&& __v) {
return __emplace_hint_multi(__p, std::forward<_Vp>(__v));
}

template <class _ValueT = _Tp, __enable_if_t<__is_tree_value_type<_ValueT>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI void __insert_multi_from_orphaned_node(const_iterator __p, value_type&& __value) {
__emplace_hint_multi(__p, const_cast<key_type&&>(__value.first), std::move(__value.second));
Expand Down Expand Up @@ -1360,7 +1318,7 @@ void __tree<_Tp, _Compare, _Allocator>::__assign_unique(_ForwardIterator __first
}
}
for (; __first != __last; ++__first)
__insert_unique(*__first);
__emplace_unique(*__first);
}

template <class _Tp, class _Compare, class _Allocator>
Expand All @@ -1380,7 +1338,7 @@ void __tree<_Tp, _Compare, _Allocator>::__assign_multi(_InputIterator __first, _
}
const_iterator __e = end();
for (; __first != __last; ++__first)
__insert_multi(__e, *__first);
__emplace_hint_multi(__e, *__first);
}

template <class _Tp, class _Compare, class _Allocator>
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/ext/hash_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ public:
_LIBCPP_HIDE_FROM_ABI const_iterator end() const { return __table_.end(); }

_LIBCPP_HIDE_FROM_ABI std::pair<iterator, bool> insert(const value_type& __x) {
return __table_.__insert_unique(__x);
return __table_.__emplace_unique(__x);
}
_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator, const value_type& __x) { return insert(__x).first; }
template <class _InputIterator>
Expand Down Expand Up @@ -625,7 +625,7 @@ template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
template <class _InputIterator>
inline void hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, _InputIterator __last) {
for (; __first != __last; ++__first)
__table_.__insert_unique(*__first);
__table_.__emplace_unique(*__first);
}

template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
Expand Down Expand Up @@ -744,7 +744,7 @@ public:
_LIBCPP_HIDE_FROM_ABI const_iterator begin() const { return __table_.begin(); }
_LIBCPP_HIDE_FROM_ABI const_iterator end() const { return __table_.end(); }

_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __x) { return __table_.__insert_multi(__x); }
_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __x) { return __table_.__emplace_unique(__x); }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be emplace_multi not emplace_unique?

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator, const value_type& __x) { return insert(__x); }
template <class _InputIterator>
_LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __first, _InputIterator __last);
Expand Down Expand Up @@ -831,7 +831,7 @@ template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
template <class _InputIterator>
inline void hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, _InputIterator __last) {
for (; __first != __last; ++__first)
__table_.__insert_multi(*__first);
__table_.__emplace_unique(*__first);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise.

}

template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/ext/hash_set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public:
_LIBCPP_HIDE_FROM_ABI const_iterator end() const { return __table_.end(); }

_LIBCPP_HIDE_FROM_ABI std::pair<iterator, bool> insert(const value_type& __x) {
return __table_.__insert_unique(__x);
return __table_.__emplace_unique(__x);
}
_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator, const value_type& __x) { return insert(__x).first; }
template <class _InputIterator>
Expand Down Expand Up @@ -365,7 +365,7 @@ template <class _Value, class _Hash, class _Pred, class _Alloc>
template <class _InputIterator>
inline void hash_set<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, _InputIterator __last) {
for (; __first != __last; ++__first)
__table_.__insert_unique(*__first);
__table_.__emplace_unique(*__first);
}

template <class _Value, class _Hash, class _Pred, class _Alloc>
Expand Down Expand Up @@ -458,7 +458,7 @@ public:
_LIBCPP_HIDE_FROM_ABI const_iterator begin() const { return __table_.begin(); }
_LIBCPP_HIDE_FROM_ABI const_iterator end() const { return __table_.end(); }

_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __x) { return __table_.__insert_multi(__x); }
_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __x) { return __table_.__emplace_unique(__x); }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise.

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator, const value_type& __x) { return insert(__x); }
template <class _InputIterator>
_LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __first, _InputIterator __last);
Expand Down Expand Up @@ -543,7 +543,7 @@ template <class _Value, class _Hash, class _Pred, class _Alloc>
template <class _InputIterator>
inline void hash_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, _InputIterator __last) {
for (; __first != __last; ++__first)
__table_.__insert_multi(*__first);
__table_.__emplace_unique(*__first);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise.

}

template <class _Value, class _Hash, class _Pred, class _Alloc>
Expand Down
28 changes: 14 additions & 14 deletions libcxx/include/map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,29 +1073,29 @@ public:

template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(_Pp&& __p) {
return __tree_.__insert_unique(std::forward<_Pp>(__p));
return __tree_.__emplace_unique(std::forward<_Pp>(__p));
}

template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __pos, _Pp&& __p) {
return __tree_.__insert_unique(__pos.__i_, std::forward<_Pp>(__p));
return __tree_.__emplace_hint_unique(__pos.__i_, std::forward<_Pp>(__p));
}

# endif // _LIBCPP_CXX03_LANG

_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(const value_type& __v) { return __tree_.__insert_unique(__v); }
_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(const value_type& __v) { return __tree_.__emplace_unique(__v); }

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {
return __tree_.__insert_unique(__p.__i_, __v);
return __tree_.__emplace_hint_unique(__p.__i_, __v);
}

# ifndef _LIBCPP_CXX03_LANG
_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(value_type&& __v) {
return __tree_.__insert_unique(std::move(__v));
return __tree_.__emplace_unique(std::move(__v));
}

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {
return __tree_.__insert_unique(__p.__i_, std::move(__v));
return __tree_.__emplace_hint_unique(__p.__i_, std::move(__v));
}

_LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }
Expand Down Expand Up @@ -1756,42 +1756,42 @@ public:

template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI iterator insert(_Pp&& __p) {
return __tree_.__insert_multi(std::forward<_Pp>(__p));
return __tree_.__emplace_multi(std::forward<_Pp>(__p));
}

template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __pos, _Pp&& __p) {
return __tree_.__insert_multi(__pos.__i_, std::forward<_Pp>(__p));
return __tree_.__emplace_hint_multi(__pos.__i_, std::forward<_Pp>(__p));
}

_LIBCPP_HIDE_FROM_ABI iterator insert(value_type&& __v) { return __tree_.__insert_multi(std::move(__v)); }
_LIBCPP_HIDE_FROM_ABI iterator insert(value_type&& __v) { return __tree_.__emplace_multi(std::move(__v)); }

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {
return __tree_.__insert_multi(__p.__i_, std::move(__v));
return __tree_.__emplace_hint_multi(__p.__i_, std::move(__v));
}

_LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }

# endif // _LIBCPP_CXX03_LANG

_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __v) { return __tree_.__insert_multi(__v); }
_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __v) { return __tree_.__emplace_multi(__v); }

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {
return __tree_.__insert_multi(__p.__i_, __v);
return __tree_.__emplace_hint_multi(__p.__i_, __v);
}

template <class _InputIterator>
_LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __f, _InputIterator __l) {
for (const_iterator __e = cend(); __f != __l; ++__f)
__tree_.__insert_multi(__e.__i_, *__f);
__tree_.__emplace_hint_multi(__e.__i_, *__f);
}

# if _LIBCPP_STD_VER >= 23
template <_ContainerCompatibleRange<value_type> _Range>
_LIBCPP_HIDE_FROM_ABI void insert_range(_Range&& __range) {
const_iterator __end = cend();
for (auto&& __element : __range) {
__tree_.__insert_multi(__end.__i_, std::forward<decltype(__element)>(__element));
__tree_.__emplace_hint_multi(__end.__i_, std::forward<decltype(__element)>(__element));
}
}
# endif
Expand Down
24 changes: 12 additions & 12 deletions libcxx/include/set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,34 +740,34 @@ public:
}
# endif // _LIBCPP_CXX03_LANG

_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(const value_type& __v) { return __tree_.__insert_unique(__v); }
_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(const value_type& __v) { return __tree_.__emplace_unique(__v); }
_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {
return __tree_.__insert_unique(__p, __v);
return __tree_.__emplace_hint_unique(__p, __v);
}

template <class _InputIterator>
_LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __f, _InputIterator __l) {
for (const_iterator __e = cend(); __f != __l; ++__f)
__tree_.__insert_unique(__e, *__f);
__tree_.__emplace_hint_unique(__e, *__f);
}

# if _LIBCPP_STD_VER >= 23
template <_ContainerCompatibleRange<value_type> _Range>
_LIBCPP_HIDE_FROM_ABI void insert_range(_Range&& __range) {
const_iterator __end = cend();
for (auto&& __element : __range) {
__tree_.__insert_unique(__end, std::forward<decltype(__element)>(__element));
__tree_.__emplace_hint_unique(__end, std::forward<decltype(__element)>(__element));
}
}
# endif

# ifndef _LIBCPP_CXX03_LANG
_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(value_type&& __v) {
return __tree_.__insert_unique(std::move(__v));
return __tree_.__emplace_unique(std::move(__v));
}

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {
return __tree_.__insert_unique(__p, std::move(__v));
return __tree_.__emplace_hint_unique(__p, std::move(__v));
}

_LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }
Expand Down Expand Up @@ -1209,32 +1209,32 @@ public:
}
# endif // _LIBCPP_CXX03_LANG

_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __v) { return __tree_.__insert_multi(__v); }
_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __v) { return __tree_.__emplace_multi(__v); }
_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {
return __tree_.__insert_multi(__p, __v);
return __tree_.__emplace_hint_multi(__p, __v);
}

template <class _InputIterator>
_LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __f, _InputIterator __l) {
for (const_iterator __e = cend(); __f != __l; ++__f)
__tree_.__insert_multi(__e, *__f);
__tree_.__emplace_hint_multi(__e, *__f);
}

# if _LIBCPP_STD_VER >= 23
template <_ContainerCompatibleRange<value_type> _Range>
_LIBCPP_HIDE_FROM_ABI void insert_range(_Range&& __range) {
const_iterator __end = cend();
for (auto&& __element : __range) {
__tree_.__insert_multi(__end, std::forward<decltype(__element)>(__element));
__tree_.__emplace_hint_multi(__end, std::forward<decltype(__element)>(__element));
}
}
# endif

# ifndef _LIBCPP_CXX03_LANG
_LIBCPP_HIDE_FROM_ABI iterator insert(value_type&& __v) { return __tree_.__insert_multi(std::move(__v)); }
_LIBCPP_HIDE_FROM_ABI iterator insert(value_type&& __v) { return __tree_.__emplace_multi(std::move(__v)); }

_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {
return __tree_.__insert_multi(__p, std::move(__v));
return __tree_.__emplace_hint_multi(__p, std::move(__v));
}

_LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }
Expand Down
Loading
Loading