]> git.ipfire.org Git - thirdparty/gcc.git/commit
libstdc++: Destroy allocators in re-inserted container nodes [PR114401]
authorJonathan Wakely <jwakely@redhat.com>
Thu, 21 Mar 2024 13:25:15 +0000 (13:25 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Fri, 22 Mar 2024 22:39:06 +0000 (22:39 +0000)
commitc2e28df90a1640cebadef6c6c8ab5ea964071bb1
tree01fca70b6431f250571c6530d9d90bad74a8a94b
parent142cc4c223d695e515ed2504501b91d8a7ac6eb8
libstdc++: Destroy allocators in re-inserted container nodes [PR114401]

The allocator objects in container node handles were not being destroyed
after the node was re-inserted into a container. They are stored in a
union and so need to be explicitly destroyed when the node becomes
empty. The containers were zeroing the node handle's pointer, which
makes it empty, causing the handle's destructor to think there's nothign
to clean up.

Add a new member function to the node handle which destroys the
allocator and zeros the pointer. Change the containers to call that
instead of just changing the pointer manually.

We can also remove the _M_empty member of the union which is not
necessary.

libstdc++-v3/ChangeLog:

PR libstdc++/114401
* include/bits/hashtable.h (_Hashtable::_M_reinsert_node): Call
release() on node handle instead of just zeroing its pointer.
(_Hashtable::_M_reinsert_node_multi): Likewise.
(_Hashtable::_M_merge_unique): Likewise.
(_Hashtable::_M_merge_multi): Likewise.
* include/bits/node_handle.h (_Node_handle_common::release()):
New member function.
(_Node_handle_common::_Optional_alloc::_M_empty): Remove
unnecessary union member.
(_Node_handle_common): Declare _Hashtable as a friend.
* include/bits/stl_tree.h (_Rb_tree::_M_reinsert_node_unique):
Call release() on node handle instead of just zeroing its
pointer.
(_Rb_tree::_M_reinsert_node_equal): Likewise.
(_Rb_tree::_M_reinsert_node_hint_unique): Likewise.
(_Rb_tree::_M_reinsert_node_hint_equal): Likewise.
* testsuite/23_containers/multiset/modifiers/114401.cc: New test.
* testsuite/23_containers/set/modifiers/114401.cc: New test.
* testsuite/23_containers/unordered_multiset/modifiers/114401.cc: New test.
* testsuite/23_containers/unordered_set/modifiers/114401.cc: New test.
libstdc++-v3/include/bits/hashtable.h
libstdc++-v3/include/bits/node_handle.h
libstdc++-v3/include/bits/stl_tree.h
libstdc++-v3/testsuite/23_containers/multiset/modifiers/114401.cc [new file with mode: 0644]
libstdc++-v3/testsuite/23_containers/set/modifiers/114401.cc [new file with mode: 0644]
libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/114401.cc [new file with mode: 0644]
libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/114401.cc [new file with mode: 0644]