From 23d5fd6cd6b48b64826f001c55c5591eedab152c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Sun, 23 Dec 2018 18:05:23 +0000 Subject: [PATCH] Respect pointer_traits on node deallocation in _ReuseOrAllocNode parenthesis operator. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2018-12-23 François Dumont Respect pointer_traits on node deallocation in _ReuseOrAllocNode parenthesis operator. * include/bits/hashtable_policy.h (_Hashtable_alloc<>::_M_deallocate_node_ptr(__node_type*)): New. (_Hashtable_alloc<>::_M_deallocate_node(__node_type*)): Use latter. (_ReuseOrAllocNode<>::operator<_Arg>()(_Arg&&)): Likewise. From-SVN: r267380 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/bits/hashtable_policy.h | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a0ec66b22a7..dd67656b63e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2018-12-23 François Dumont + + Respect pointer_traits on node deallocation in _ReuseOrAllocNode + parenthesis operator. + + * include/bits/hashtable_policy.h + (_Hashtable_alloc<>::_M_deallocate_node_ptr(__node_type*)): New. + (_Hashtable_alloc<>::_M_deallocate_node(__node_type*)): Use latter. + (_ReuseOrAllocNode<>::operator<_Arg>()(_Arg&&)): Likewise. + 2018-12-22 Iain Sandoe * /config/os/bsd/darwin/ppc-extra.ver: Append long double symbols. diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index 66fbfbe5f21..a02396b0308 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -135,8 +135,7 @@ namespace __detail } __catch(...) { - __node->~__node_type(); - __node_alloc_traits::deallocate(__a, __node, 1); + _M_h._M_deallocate_node_ptr(__node); __throw_exception_again; } return __node; @@ -2047,6 +2046,9 @@ namespace __detail void _M_deallocate_node(__node_type* __n); + void + _M_deallocate_node_ptr(__node_type* __n); + // Deallocate the linked list of nodes pointed to by __n void _M_deallocate_nodes(__node_type* __n); @@ -2085,10 +2087,17 @@ namespace __detail template void _Hashtable_alloc<_NodeAlloc>::_M_deallocate_node(__node_type* __n) + { + __node_alloc_traits::destroy(_M_node_allocator(), __n->_M_valptr()); + _M_deallocate_node_ptr(__n); + } + + template + void + _Hashtable_alloc<_NodeAlloc>::_M_deallocate_node_ptr(__node_type* __n) { typedef typename __node_alloc_traits::pointer _Ptr; auto __ptr = std::pointer_traits<_Ptr>::pointer_to(*__n); - __node_alloc_traits::destroy(_M_node_allocator(), __n->_M_valptr()); __n->~__node_type(); __node_alloc_traits::deallocate(_M_node_allocator(), __ptr, 1); } -- 2.30.2