Fix hashtable node deallocation

[François Dumont]

Here is the same patch but this time with a test change which is 
supposed to show the problem.

However it doesn't because of:
 Â Â Â Â Â  _Pointer_adapter(element_type* __arg = 0)
 Â Â Â Â Â  { _Storage_policy::set(__arg); }

which is not explicit.

So is this patch really necessary ? If it isn't, is usage of 
pointer_traits<>::pointer_to really necessary ?

Note that I also found a bug in the 
__gnu_test::CustomPointerAlloc::allocate, the signature with hint is wrong.

 Â Â Â  * include/ext/throw_allocator.h
 Â Â Â  (annotate_base::insert(void*, size_t)): Use insert result to check for
 Â Â Â  double insert attempt.
 Â Â Â  (annotate_base::insert_construct(void*)): Likewise.
 Â Â Â  (annotate_base::check_allocated(void*, size_t)): Return found iterator.
 Â Â Â  (annotate_base::erase(void*, size_t)): Use latter method returned
 Â Â Â  iterator.
 Â Â Â  (annotate_base::check_constructed(void*, size_t)): Return found 
iterator.
 Â Â Â  (annotate_base::erase_construct(void*)): Use latter method returned
 Â Â Â  iterator.
 Â Â Â  * libstdc++-v3/testsuite/util/testsuite_allocator.h
 Â Â Â  (CustomPointerAlloc<>::allocate(size_t, pointer)): Replace by...
 Â Â Â  (CustomPointerAlloc<>::allocate(size_t, const_void_pointer)): ...this.
 Â Â Â  * testsuite/23_containers/unordered_set/allocator/ext_ptr.cc: Add
 Â Â Â  check.

François


On 11/10/18 10:40 PM, François Dumont wrote:
> While working on a hashtable enhancement I noticed that we are not 
> using the correct method to deallocate node if the constructor throws 
> in _ReuseOrAllocNode operator(). I had to introduce a new 
> _M_deallocate_node_ptr for that as node value shall not be destroy again.
>
> I also check other places and noticed that a __node_type destructor 
> call was missing.
>
> Â Â Â  * 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.
> Â Â Â  (_Hashtable_alloc<>::_M_allocate_node): Add ~__node_type call.
>
> Tested under Linux x86_64.
>
> Ok to commit ?
>
> François
>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: hashtable_dealloc.patch
Type: text/x-patch
Size: 2865 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/libstdc++/attachments/20181117/cd3f1776/attachment.bin>