OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Value-initialize objects held by EBO helpers [PR 100863] 

The allocator, hash function and equality function should all be
value-initialized by the default constructor of an unordered container.
Do it in the EBO helper, so we don't have to get it right in multiple
places.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	PR libstdc++/100863
	PR libstdc++/65816
	* include/bits/hashtable_policy.h (_Hashtable_ebo_helper):
	Value-initialize subobject.
	* testsuite/23_containers/unordered_map/allocator/default_init.cc:
	Remove XFAIL.
	* testsuite/23_containers/unordered_set/allocator/default_init.cc:
	Remove XFAIL.
This commit is contained in:
Jonathan Wakely 2021-06-02 12:34:48 +01:00
parent 81eab204a5
commit f8f0193b5b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/include/bits/hashtable_policy.h
View File

@ -1162,7 +1162,7 @@ namespace __detail
struct _Hashtable_ebo_helper<_Nm, _Tp, true>
: private _Tp
{
_Hashtable_ebo_helper() = default;
_Hashtable_ebo_helper() noexcept(noexcept(_Tp())) : _Tp() { }
template<typename _OtherTp>
_Hashtable_ebo_helper(_OtherTp&& __tp)
@ -1188,7 +1188,7 @@ namespace __detail
_Tp& _M_get() { return _M_tp; }
private:
_Tp _M_tp;
_Tp _M_tp{};
};
/**
@ -1246,6 +1246,7 @@ namespace __detail
// We need the default constructor for the local iterators and _Hashtable
// default constructor.
_Hash_code_base() = default;
_Hash_code_base(const _Hash& __hash) : __ebo_hash(__hash) { }
__hash_code
@ -1639,6 +1640,7 @@ namespace __detail
protected:
_Hashtable_base() = default;
_Hashtable_base(const _Hash& __hash, const _Equal& __eq)
: __hash_code_base(__hash), _EqualEBO(__eq)
{ }

1
libstdc++-v3/testsuite/23_containers/unordered_map/allocator/default_init.cc
View File

@ -17,7 +17,6 @@
// { dg-do run { target c++11 } }
// { dg-options "-O0" }
// { dg-xfail-run-if "PR c++/65816" { *-*-* } }
#include <unordered_map>
#include <testsuite_hooks.h>

1
libstdc++-v3/testsuite/23_containers/unordered_set/allocator/default_init.cc
View File

@ -17,7 +17,6 @@
// { dg-do run { target c++11 } }
// { dg-options "-O0" }
// { dg-xfail-run-if "PR c++/65816" { *-*-* } }
#include <unordered_set>
#include <testsuite_hooks.h>