2013-01-16 Jonathan Wakely <jwakely.gcc@gmail.com>
+ PR libstdc++/55043 (again)
+ * include/bits/alloc_traits.h (allocator_traits::construct): Disable
+ unless construction would be well-formed.
+ (__allow_copy_cons, __check_copy_constructible): Define.
+ * include/bits/unordered_map.h (__check_copy_constructible): Use as
+ base class so copy constructor will be deleted if appropriate.
+ (is_copy_constructible): Remove specialization.
+ * include/bits/unordered_set.h: Likewise.
+ * include/debug/unordered_map.h: Undo previous commit. Default copy
+ and move constructors.
+ * include/debug/unordered_set.h: Likewise.
+ * include/profile/unordered_map.h: Undo previous commit.
+ * include/profile/unordered_set.h: Likewise.
+ * testsuite/23_containers/unordered_map/55043.cc: Fix test.
+ * testsuite/23_containers/unordered_multimap/55043.cc: Likewise.
+ * testsuite/23_containers/unordered_multiset/55043.cc: Likewise.
+ * testsuite/23_containers/unordered_set/55043.cc: Likewise.
+ * testsuite/23_containers/unordered_map/requirements/53339.cc: XFAIL,
+ cannot support incomplete types.
+ * testsuite/23_containers/unordered_multimap/requirements/53339.cc:
+ Likewise.
+
+2013-01-16 Jonathan Wakely <jwakely.gcc@gmail.com>
+
PR libstdc++/55043
* include/std/unordered_map: Include alloc_traits.h
* include/std/unordered_set: Likewise.
template<typename _Tp, typename... _Args>
static typename
- enable_if<!__construct_helper<_Tp, _Args...>::value, void>::type
+ enable_if<__and_<__not_<__construct_helper<_Tp, _Args...>>,
+ is_constructible<_Tp, _Args...>>::value, void>::type
_S_construct(_Alloc&, _Tp* __p, _Args&&... __args)
{ ::new((void*)__p) _Tp(std::forward<_Args>(__args)...); }
* arguments @a __args...
*/
template<typename _Tp, typename... _Args>
- static void construct(_Alloc& __a, _Tp* __p, _Args&&... __args)
+ static auto construct(_Alloc& __a, _Tp* __p, _Args&&... __args)
+ -> decltype(_S_construct(__a, __p, std::forward<_Args>(__args)...))
{ _S_construct(__a, __p, std::forward<_Args>(__args)...); }
/**
_M_select(...);
public:
- typedef decltype(_M_select<typename _Alloc::value_type>(0)) type;
+ typedef decltype(_M_select<typename _Alloc::value_type>(0)) type;
};
+ // true if _Alloc::value_type is CopyInsertable into containers using _Alloc
template<typename _Alloc>
struct __is_copy_insertable
: __is_copy_insertable_impl<_Alloc>::type
: is_copy_constructible<_Tp>
{ };
- template<typename _Container>
- using __has_copy_insertable_val
- = __is_copy_insertable<typename _Container::allocator_type>;
+ // Used to allow copy construction of unordered containers
+ template<bool> struct __allow_copy_cons { };
+
+ // Used to delete copy constructor of unordered containers
+ template<>
+ struct __allow_copy_cons<false>
+ {
+ __allow_copy_cons() = default;
+ __allow_copy_cons(const __allow_copy_cons&) = delete;
+ __allow_copy_cons(__allow_copy_cons&&) = default;
+ __allow_copy_cons& operator=(const __allow_copy_cons&) = default;
+ __allow_copy_cons& operator=(__allow_copy_cons&&) = default;
+ };
+
+ template<typename _Alloc>
+ using __check_copy_constructible
+ = __allow_copy_cons<__is_copy_insertable<_Alloc>::value>;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
class _Hash = hash<_Key>,
class _Pred = std::equal_to<_Key>,
class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
- class unordered_map
+ class unordered_map : __check_copy_constructible<_Alloc>
{
typedef __umap_hashtable<_Key, _Tp, _Hash, _Pred, _Alloc> _Hashtable;
_Hashtable _M_h;
class _Hash = hash<_Key>,
class _Pred = std::equal_to<_Key>,
class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
- class unordered_multimap
+ class unordered_multimap : __check_copy_constructible<_Alloc>
{
typedef __ummap_hashtable<_Key, _Tp, _Hash, _Pred, _Alloc> _Hashtable;
_Hashtable _M_h;
{ return !(__x == __y); }
_GLIBCXX_END_NAMESPACE_CONTAINER
-
- template<typename _Key, typename _Tp, typename _Hash, typename _Pred,
- typename _Alloc>
- struct
- is_copy_constructible<_GLIBCXX_STD_C::unordered_map<_Key, _Tp, _Hash,
- _Pred, _Alloc>>
- : __has_copy_insertable_val<_GLIBCXX_STD_C::unordered_map<_Key, _Tp, _Hash,
- _Pred, _Alloc>>
- { };
-
- template<typename _Key, typename _Tp, typename _Hash, typename _Pred,
- typename _Alloc>
- struct
- is_copy_constructible<_GLIBCXX_STD_C::unordered_multimap<_Key, _Tp, _Hash,
- _Pred, _Alloc>>
- : __has_copy_insertable_val<_GLIBCXX_STD_C::unordered_multimap<_Key, _Tp,
- _Hash, _Pred,
- _Alloc>>
- { };
-
} // namespace std
#endif /* _UNORDERED_MAP_H */
class _Hash = hash<_Value>,
class _Pred = std::equal_to<_Value>,
class _Alloc = std::allocator<_Value> >
- class unordered_set
+ class unordered_set : __check_copy_constructible<_Alloc>
{
typedef __uset_hashtable<_Value, _Hash, _Pred, _Alloc> _Hashtable;
_Hashtable _M_h;
class _Hash = hash<_Value>,
class _Pred = std::equal_to<_Value>,
class _Alloc = std::allocator<_Value> >
- class unordered_multiset
+ class unordered_multiset : __check_copy_constructible<_Alloc>
{
typedef __umset_hashtable<_Value, _Hash, _Pred, _Alloc> _Hashtable;
_Hashtable _M_h;
{ return !(__x == __y); }
_GLIBCXX_END_NAMESPACE_CONTAINER
-
- template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
- struct is_copy_constructible<_GLIBCXX_STD_C::unordered_set<_Key, _Hash,
- _Pred, _Alloc>>
- : __has_copy_insertable_val<_GLIBCXX_STD_C::unordered_set<_Key, _Hash,
- _Pred, _Alloc>>
- { };
-
- template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
- struct
- is_copy_constructible<_GLIBCXX_STD_C::unordered_multiset<_Key, _Hash,
- _Pred, _Alloc>>
- : __has_copy_insertable_val<_GLIBCXX_STD_C::unordered_multiset<_Key, _Hash,
- _Pred,
- _Alloc>>
- { };
-
} // namespace std
#endif /* _UNORDERED_SET_H */
__gnu_debug::__base(__last), __n,
__hf, __eql, __a) { }
- unordered_map(const unordered_map& __x)
- : _Base(__x) { }
+ unordered_map(const unordered_map& __x) = default;
unordered_map(const _Base& __x)
: _Base(__x) { }
- unordered_map(unordered_map&& __x)
- : _Base(std::move(__x)) { }
+ unordered_map(unordered_map&& __x) = default;
unordered_map(initializer_list<value_type> __l,
size_type __n = 0,
__gnu_debug::__base(__last), __n,
__hf, __eql, __a) { }
- unordered_multimap(const unordered_multimap& __x)
- : _Base(__x) { }
+ unordered_multimap(const unordered_multimap& __x) = default;
unordered_multimap(const _Base& __x)
: _Base(__x) { }
- unordered_multimap(unordered_multimap&& __x)
- : _Base(std::move(__x)) { }
+ unordered_multimap(unordered_multimap&& __x) = default;
unordered_multimap(initializer_list<value_type> __l,
size_type __n = 0,
{ return !(__x == __y); }
} // namespace __debug
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
- template<typename _Key, typename _Tp, typename _Hash, typename _Pred,
- typename _Alloc>
- struct
- is_copy_constructible<__debug::unordered_map<_Key, _Tp, _Hash, _Pred,
- _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_C::unordered_map<_Key, _Tp,
- _Hash, _Pred,
- _Alloc> >
- { };
-
- template<typename _Key, typename _Tp, typename _Hash, typename _Pred,
- typename _Alloc>
- struct
- is_copy_constructible<__debug::unordered_multimap<_Key, _Tp, _Hash, _Pred,
- _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_C::unordered_multimap<_Key, _Tp,
- _Hash, _Pred,
- _Alloc> >
- { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#endif // C++11
__gnu_debug::__base(__last), __n,
__hf, __eql, __a) { }
- unordered_set(const unordered_set& __x)
- : _Base(__x) { }
+ unordered_set(const unordered_set& __x) = default;
unordered_set(const _Base& __x)
: _Base(__x) { }
- unordered_set(unordered_set&& __x)
- : _Base(std::move(__x)) { }
+ unordered_set(unordered_set&& __x) = default;
unordered_set(initializer_list<value_type> __l,
size_type __n = 0,
__gnu_debug::__base(__last), __n,
__hf, __eql, __a) { }
- unordered_multiset(const unordered_multiset& __x)
- : _Base(__x) { }
+ unordered_multiset(const unordered_multiset& __x) = default;
unordered_multiset(const _Base& __x)
: _Base(__x) { }
- unordered_multiset(unordered_multiset&& __x)
- : _Base(std::move(__x)) { }
+ unordered_multiset(unordered_multiset&& __x) = default;
unordered_multiset(initializer_list<value_type> __l,
size_type __n = 0,
{ return !(__x == __y); }
} // namespace __debug
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
- template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
- struct
- is_copy_constructible<__debug::unordered_set<_Key, _Hash, _Pred, _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_C::unordered_set<_Key,
- _Hash, _Pred,
- _Alloc> >
- { };
-
- template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
- struct
- is_copy_constructible<__debug::unordered_multiset<_Key, _Hash, _Pred,
- _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_C::unordered_multiset<_Key,
- _Hash, _Pred,
- _Alloc> >
- { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#endif // C++11
const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
{ return !(__x == __y); }
-} // namespace __profile
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
- template<typename _Key, typename _Tp, typename _Hash, typename _Pred,
- typename _Alloc>
- struct
- is_copy_constructible<__profile::unordered_map<_Key, _Tp, _Hash,
- _Pred, _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_BASE >
- { };
-_GLIBCXX_END_NAMESPACE_VERSION
-
#undef _GLIBCXX_BASE
#undef _GLIBCXX_STD_BASE
#define _GLIBCXX_BASE unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
-namespace __profile
-{
/// Class std::unordered_multimap wrapper with performance instrumentation.
template<typename _Key, typename _Tp,
typename _Hash = std::hash<_Key>,
{ return !(__x == __y); }
} // namespace __profile
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
- template<typename _Key, typename _Tp, typename _Hash, typename _Pred,
- typename _Alloc>
- struct
- is_copy_constructible<__profile::unordered_multimap<_Key, _Tp, _Hash,
- _Pred, _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_BASE >
- { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#undef _GLIBCXX_BASE
const unordered_set<_Key, _Hash, _Pred, _Alloc>& __y)
{ return !(__x == __y); }
-} // namespace __profile
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
- template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
- struct
- is_copy_constructible<__profile::unordered_set<_Key, _Hash, _Pred, _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_BASE >
- { };
-_GLIBCXX_END_NAMESPACE_VERSION
-
#undef _GLIBCXX_BASE
#undef _GLIBCXX_STD_BASE
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
#define _GLIBCXX_BASE unordered_multiset<_Value, _Hash, _Pred, _Alloc>
-namespace __profile
-{
/** @brief Unordered_multiset wrapper with performance instrumentation. */
template<typename _Value,
typename _Hash = std::hash<_Value>,
{ return !(__x == __y); }
} // namespace __profile
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
- template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
- struct
- is_copy_constructible<__profile::unordered_multiset<_Value, _Hash,
- _Pred, _Alloc>>
- : is_copy_constructible< _GLIBCXX_STD_BASE >
- { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#undef _GLIBCXX_BASE
// verify is_copy_constructible depends on allocator
typedef test_type<Alloc<MoveOnly, true>> uim_rval;
-static_assert(std::is_copy_constructible<uim_rval>::value, "is not copyable");
+static_assert(!std::is_copy_constructible<uim_rval>::value, "is not copyable");
typedef test_type<Alloc<MoveOnly, false>> uim_lval;
static_assert(std::is_copy_constructible<uim_lval>::value, "is copyable");
-// { dg-do compile }
+// XFAIL because of PR libstdc++/55043 fix
+// { dg-do compile { xfail *-*-* } }
+// { dg-excess-errors "" }
// { dg-options "-std=gnu++11" }
-// Copyright (C) 2012 Free Software Foundation, Inc.
+// Copyright (C) 2012-2013 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// verify is_copy_constructible depends on allocator
typedef test_type<Alloc<MoveOnly, true>> uim_rval;
-static_assert(std::is_copy_constructible<uim_rval>::value, "is not copyable");
+static_assert(!std::is_copy_constructible<uim_rval>::value, "is not copyable");
typedef test_type<Alloc<MoveOnly, false>> uim_lval;
static_assert(std::is_copy_constructible<uim_lval>::value, "is copyable");
-// { dg-do compile }
+// XFAIL because of PR libstdc++/55043 fix
+// { dg-do compile { xfail *-*-* } }
+// { dg-excess-errors "" }
// { dg-options "-std=gnu++11" }
-// Copyright (C) 2012 Free Software Foundation, Inc.
+// Copyright (C) 2012-2013 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// verify is_copy_constructible depends on allocator
typedef test_type<Alloc<MoveOnly, true>> uim_rval;
-static_assert(std::is_copy_constructible<uim_rval>::value, "is not copyable");
+static_assert(!std::is_copy_constructible<uim_rval>::value, "is not copyable");
typedef test_type<Alloc<MoveOnly, false>> uim_lval;
static_assert(std::is_copy_constructible<uim_lval>::value, "is copyable");
// verify is_copy_constructible depends on allocator
typedef test_type<Alloc<MoveOnly, true>> uim_rval;
-static_assert(std::is_copy_constructible<uim_rval>::value, "is not copyable");
+static_assert(!std::is_copy_constructible<uim_rval>::value, "is not copyable");
typedef test_type<Alloc<MoveOnly, false>> uim_lval;
static_assert(std::is_copy_constructible<uim_lval>::value, "is copyable");
projects / platform / upstream / linaro-gcc.git / commitdiff