libstdc++: fix is_default_constructible for hash containers [PR 100863]
The recent change to _Hashtable_ebo_helper for this PR broke the is_default_constructible trait for a hash container with a non-default constructible allocator. That happens because the constructor needs to be user-provided in order to initialize the member, and so is not defined as deleted when the type is not default constructible. By making _Hashtable derive from _Enable_special_members we can ensure that the default constructor for the std::unordered_xxx containers is deleted when it would be ill-formed. This makes the trait give the correct answer. Signed-off-by: Jonathan Wakely <jwakely@redhat.com> libstdc++-v3/ChangeLog: PR libstdc++/100863 * include/bits/hashtable.h (_Hashtable): Conditionally delete default constructor by deriving from _Enable_special_members. * testsuite/23_containers/unordered_map/cons/default.cc: New test. * testsuite/23_containers/unordered_set/cons/default.cc: New test.
This commit is contained in:
parent
1ef9b13579
commit
89ec3b67db
@ -33,6 +33,7 @@
|
||||
#pragma GCC system_header
|
||||
|
||||
#include <bits/hashtable_policy.h>
|
||||
#include <bits/enable_special_members.h>
|
||||
#if __cplusplus > 201402L
|
||||
# include <bits/node_handle.h>
|
||||
#endif
|
||||
@ -48,6 +49,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
// Mandatory to have erase not throwing.
|
||||
__is_nothrow_invocable<const _Hash&, const _Tp&>>>;
|
||||
|
||||
// Helper to conditionally delete the default constructor.
|
||||
// The _Hash_node_base type is used to distinguish this specialization
|
||||
// from any other potentially-overlapping subobjects of the hashtable.
|
||||
template<typename _Equal, typename _Hash, typename _Allocator>
|
||||
using _Hashtable_enable_default_ctor
|
||||
= _Enable_special_members<__and_<is_default_constructible<_Equal>,
|
||||
is_default_constructible<_Hash>,
|
||||
is_default_constructible<_Allocator>>{},
|
||||
true, true, true, true, true,
|
||||
__detail::_Hash_node_base>;
|
||||
|
||||
/**
|
||||
* Primary class template _Hashtable.
|
||||
*
|
||||
@ -183,7 +195,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
private __detail::_Hashtable_alloc<
|
||||
__alloc_rebind<_Alloc,
|
||||
__detail::_Hash_node<_Value,
|
||||
_Traits::__hash_cached::value>>>
|
||||
_Traits::__hash_cached::value>>>,
|
||||
private _Hashtable_enable_default_ctor<_Equal, _Hash, _Alloc>
|
||||
{
|
||||
static_assert(is_same<typename remove_cv<_Value>::type, _Value>::value,
|
||||
"unordered container must have a non-const, non-volatile value_type");
|
||||
|
@ -0,0 +1,33 @@
|
||||
// { dg-do compile { target c++11 } }
|
||||
#include <unordered_map>
|
||||
|
||||
static_assert( std::is_default_constructible<std::unordered_map<int, int>>{}, "" );
|
||||
|
||||
template<typename T>
|
||||
struct NoDefaultConsAlloc
|
||||
{
|
||||
using value_type = T;
|
||||
|
||||
NoDefaultConsAlloc(int) noexcept { }
|
||||
|
||||
template<typename U>
|
||||
NoDefaultConsAlloc(const NoDefaultConsAlloc<U>&) { }
|
||||
|
||||
T *allocate(std::size_t n)
|
||||
{ return std::allocator<T>().allocate(n); }
|
||||
|
||||
void deallocate(T *p, std::size_t n)
|
||||
{ std::allocator<T>().deallocate(p, n); }
|
||||
};
|
||||
|
||||
using Map = std::unordered_map<int, int, std::hash<int>, std::equal_to<int>,
|
||||
NoDefaultConsAlloc<std::pair<const int, int>>>;
|
||||
static_assert( ! std::is_default_constructible<Map>{}, "PR libstdc++/100863" );
|
||||
|
||||
struct Hash : std::hash<int> { Hash(int) { } };
|
||||
using Map2 = std::unordered_map<int, int, Hash>;
|
||||
static_assert( ! std::is_default_constructible<Map2>{}, "PR libstdc++/100863" );
|
||||
|
||||
struct Equal : std::equal_to<int> { Equal(int) { } };
|
||||
using Map3 = std::unordered_map<int, int, std::hash<int>, Equal>;
|
||||
static_assert( ! std::is_default_constructible<Map3>{}, "PR libstdc++/100863" );
|
@ -0,0 +1,33 @@
|
||||
// { dg-do compile { target c++11 } }
|
||||
#include <unordered_set>
|
||||
|
||||
static_assert( std::is_default_constructible<std::unordered_set<int>>{}, "" );
|
||||
|
||||
template<typename T>
|
||||
struct NoDefaultConsAlloc
|
||||
{
|
||||
using value_type = T;
|
||||
|
||||
NoDefaultConsAlloc(int) noexcept { }
|
||||
|
||||
template<typename U>
|
||||
NoDefaultConsAlloc(const NoDefaultConsAlloc<U>&) { }
|
||||
|
||||
T *allocate(std::size_t n)
|
||||
{ return std::allocator<T>().allocate(n); }
|
||||
|
||||
void deallocate(T *p, std::size_t n)
|
||||
{ std::allocator<T>().deallocate(p, n); }
|
||||
};
|
||||
|
||||
using Set = std::unordered_set<int, std::hash<int>, std::equal_to<int>,
|
||||
NoDefaultConsAlloc<int>>;
|
||||
static_assert( ! std::is_default_constructible<Set>{}, "PR libstdc++/100863" );
|
||||
|
||||
struct Hash : std::hash<int> { Hash(int) { } };
|
||||
using Set2 = std::unordered_set<int, Hash>;
|
||||
static_assert( ! std::is_default_constructible<Set2>{}, "PR libstdc++/100863" );
|
||||
|
||||
struct Equal : std::equal_to<int> { Equal(int) { } };
|
||||
using Set3 = std::unordered_set<int, std::hash<int>, Equal>;
|
||||
static_assert( ! std::is_default_constructible<Set3>{}, "PR libstdc++/100863" );
|
Loading…
Reference in New Issue
Block a user