Skip to content

R
riscv-gcc-1
Commit 44f46885 by Tim Shen Committed by Tim Shen
Options

variant (__erased_use_alloc_ctor, [...]): Remove uses-allocator related functions. 

	* include/std/variant (__erased_use_alloc_ctor,
	_Variant_base::_Variant_base, variant::variant): Remove uses-allocator
	related functions.
	* testsuite/20_util/variant/compile.cc: Remove related tests.
	* testsuite/20_util/variant/run.cc: Remove related tests.

From-SVN: r243292
parent b6f684ae
Showing with 8 additions and 207 deletions
libstdc++-v3/ChangeLog
2016-12-07 Tim Shen <timshen@google.com>
* include/std/variant (__erased_use_alloc_ctor,
_Variant_base::_Variant_base, variant::variant): Remove uses-allocator
related functions.
* testsuite/20_util/variant/compile.cc: Remove related tests.
* testsuite/20_util/variant/run.cc: Remove related tests.
2016-12-06 Aditya Kumar <hiraditya@msn.com>
* src/c++11/shared_ptr.cc (_Sp_locker::_Sp_locker(const void* p)): Add
......
libstdc++-v3/include/std/variant
......@@ -40,7 +40,6 @@
#include <bits/enable_special_members.h>
#include <bits/functexcept.h>
#include <bits/move.h>
#include <bits/uses_allocator.h>
#include <bits/functional_hash.h>
namespace std _GLIBCXX_VISIBILITY(default)
......@@ -202,14 +201,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__erased_ctor(void* __lhs, void* __rhs)
{ ::new (__lhs) decay_t<_Lhs>(__get_alternative<_Rhs>(__rhs)); }
template<typename _Alloc, typename _Lhs, typename _Rhs>
constexpr void
__erased_use_alloc_ctor(const _Alloc& __a, void* __lhs, void* __rhs)
{
__uses_allocator_construct(__a, static_cast<decay_t<_Lhs>*>(__lhs),
__get_alternative<_Rhs>(__rhs));
}
// TODO: Find a potential chance to reuse this accross the project.
template<typename _Tp>
constexpr void
......@@ -353,47 +344,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: _Storage(__i, std::forward<_Args>(__args)...), _M_index(_Np)
{ }
template<typename _Alloc>
_Variant_base(const _Alloc& __a, const _Variant_base& __rhs)
: _Storage(), _M_index(__rhs._M_index)
{
if (__rhs._M_valid())
{
static constexpr void
(*_S_vtable[])(const _Alloc&, void*, void*) =
{ &__erased_use_alloc_ctor<_Alloc, __storage<_Types>&,
const __storage<_Types>&>... };
_S_vtable[__rhs._M_index](__a, _M_storage(), __rhs._M_storage());
}
}
template<typename _Alloc>
_Variant_base(const _Alloc& __a, _Variant_base&& __rhs)
: _Storage(), _M_index(__rhs._M_index)
{
if (__rhs._M_valid())
{
static constexpr void
(*_S_vtable[])(const _Alloc&, void*, void*) =
{ &__erased_use_alloc_ctor<_Alloc, __storage<_Types>&,
__storage<_Types>&&>... };
_S_vtable[__rhs._M_index](__a, _M_storage(), __rhs._M_storage());
}
}
template<typename _Alloc, size_t _Np, typename... _Args>
constexpr explicit
_Variant_base(const _Alloc& __a, in_place_index_t<_Np>,
_Args&&... __args)
: _Storage(), _M_index(_Np)
{
using _Storage =
__storage<variant_alternative_t<_Np, variant<_Types...>>>;
__uses_allocator_construct(__a, static_cast<_Storage*>(_M_storage()),
std::forward<_Args>(__args)...);
__glibcxx_assert(_M_index == _Np);
}
_Variant_base&
operator=(const _Variant_base& __rhs)
{
......@@ -1033,84 +983,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Default_ctor_enabler(_Enable_default_constructor_tag{})
{ __glibcxx_assert(index() == _Np); }
template<typename _Alloc,
typename = enable_if_t<
__is_uses_allocator_constructible_v<__to_type<0>, _Alloc>>>
variant(allocator_arg_t, const _Alloc& __a)
: variant(allocator_arg, __a, in_place_index<0>)
{ }
template<typename _Alloc,
typename = enable_if_t<__and_<__is_uses_allocator_constructible<
_Types, _Alloc,
add_lvalue_reference_t<add_const_t<_Types>>>...>::value>>
variant(allocator_arg_t, const _Alloc& __a, const variant& __rhs)
: _Base(__a, __rhs),
_Default_ctor_enabler(_Enable_default_constructor_tag{})
{ }
template<typename _Alloc,
typename = enable_if_t<__and_<
__is_uses_allocator_constructible<
_Types, _Alloc, add_rvalue_reference_t<_Types>>...>::value>>
variant(allocator_arg_t, const _Alloc& __a, variant&& __rhs)
: _Base(__a, std::move(__rhs)),
_Default_ctor_enabler(_Enable_default_constructor_tag{})
{ }
template<typename _Alloc, typename _Tp,
typename = enable_if_t<
__exactly_once<__accepted_type<_Tp&&>>
&& __is_uses_allocator_constructible_v<
__accepted_type<_Tp&&>, _Alloc, _Tp&&>
&& !is_same_v<decay_t<_Tp>, variant>, variant&>>
variant(allocator_arg_t, const _Alloc& __a, _Tp&& __t)
: variant(allocator_arg, __a, in_place_index<__accepted_index<_Tp&&>>,
std::forward<_Tp>(__t))
{ __glibcxx_assert(holds_alternative<__accepted_type<_Tp&&>>(*this)); }
template<typename _Alloc, typename _Tp, typename... _Args,
typename = enable_if_t<
__exactly_once<_Tp>
&& __is_uses_allocator_constructible_v<
_Tp, _Alloc, _Args&&...>>>
variant(allocator_arg_t, const _Alloc& __a, in_place_type_t<_Tp>,
_Args&&... __args)
: variant(allocator_arg, __a, in_place_index<__index_of<_Tp>>,
std::forward<_Args>(__args)...)
{ __glibcxx_assert(holds_alternative<_Tp>(*this)); }
template<typename _Alloc, typename _Tp, typename _Up, typename... _Args,
typename = enable_if_t<
__exactly_once<_Tp>
&& __is_uses_allocator_constructible_v<
_Tp, _Alloc, initializer_list<_Up>&, _Args&&...>>>
variant(allocator_arg_t, const _Alloc& __a, in_place_type_t<_Tp>,
initializer_list<_Up> __il, _Args&&... __args)
: variant(allocator_arg, __a, in_place_index<__index_of<_Tp>>, __il,
std::forward<_Args>(__args)...)
{ __glibcxx_assert(holds_alternative<_Tp>(*this)); }
template<typename _Alloc, size_t _Np, typename... _Args,
typename = enable_if_t<
__is_uses_allocator_constructible_v<
__to_type<_Np>, _Alloc, _Args&&...>>>
variant(allocator_arg_t, const _Alloc& __a, in_place_index_t<_Np>,
_Args&&... __args)
: _Base(__a, in_place_index<_Np>, std::forward<_Args>(__args)...),
_Default_ctor_enabler(_Enable_default_constructor_tag{})
{ __glibcxx_assert(index() == _Np); }
template<typename _Alloc, size_t _Np, typename _Up, typename... _Args,
typename = enable_if_t<
__is_uses_allocator_constructible_v<
__to_type<_Np>, _Alloc, initializer_list<_Up>&, _Args&&...>>>
variant(allocator_arg_t, const _Alloc& __a, in_place_index_t<_Np>,
initializer_list<_Up> __il, _Args&&... __args)
: _Base(__a, in_place_index<_Np>, __il, std::forward<_Args>(__args)...),
_Default_ctor_enabler(_Enable_default_constructor_tag{})
{ __glibcxx_assert(index() == _Np); }
~variant() = default;
variant& operator=(const variant&) = default;
......@@ -1300,10 +1172,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__detail::__variant::__get_storage(__variants)...);
}
template<typename... _Types, typename _Alloc>
struct uses_allocator<variant<_Types...>, _Alloc>
: true_type { };
template<typename... _Types>
struct hash<variant<_Types...>>
: private __poison_hash<remove_const_t<_Types>>...
......
libstdc++-v3/testsuite/20_util/variant/compile.cc
......@@ -117,31 +117,6 @@ void in_place_type_ctor()
static_assert(!is_constructible_v<variant<string, string>, in_place_type_t<string>, const char*>, "");
}
void uses_alloc_ctors()
{
std::allocator<char> alloc;
variant<int> a(allocator_arg, alloc);
static_assert(!is_constructible_v<variant<AllDeleted>, allocator_arg_t, std::allocator<char>>, "");
{
variant<string, int> b(allocator_arg, alloc, "a");
static_assert(!is_constructible_v<variant<string, string>, allocator_arg_t, std::allocator<char>, const char*>, "");
}
{
variant<string, int> b(allocator_arg, alloc, in_place_index<0>, "a");
variant<string, string> c(allocator_arg, alloc, in_place_index<1>, "a");
}
{
variant<string, int> b(allocator_arg, alloc, in_place_index<0>, {'a'});
variant<string, string> c(allocator_arg, alloc, in_place_index<1>, {'a'});
}
{
variant<int, string, int> b(allocator_arg, alloc, in_place_type<string>, "a");
}
{
variant<int, string, int> b(allocator_arg, alloc, in_place_type<string>, {'a'});
}
}
void dtor()
{
static_assert(is_destructible_v<variant<int, string>>, "");
......@@ -324,9 +299,7 @@ namespace adl_trap
void test_adl()
{
using adl_trap::X;
using std::allocator_arg;
X x;
std::allocator<int> a;
std::initializer_list<int> il;
adl_trap::Visitor vis;
......@@ -339,11 +312,6 @@ void test_adl()
variant<X> v2{in_place_type<X>, x};
variant<X> v3{in_place_index<0>, il, x};
variant<X> v4{in_place_type<X>, il, x};
variant<X> v5{allocator_arg, a, in_place_index<0>, x};
variant<X> v6{allocator_arg, a, in_place_type<X>, x};
variant<X> v7{allocator_arg, a, in_place_index<0>, il, x};
variant<X> v8{allocator_arg, a, in_place_type<X>, il, x};
variant<X> v9{allocator_arg, a, in_place_type<X>, 1};
}
void test_variant_alternative() {
......
libstdc++-v3/testsuite/20_util/variant/run.cc
......@@ -160,48 +160,6 @@ void in_place_type_ctor()
}
}
struct UsesAllocatable
{
template<typename Alloc>
UsesAllocatable(std::allocator_arg_t, const Alloc& a)
: d(0), a(static_cast<const void*>(&a)) { }
template<typename Alloc>
UsesAllocatable(std::allocator_arg_t, const Alloc& a, const UsesAllocatable&)
: d(1), a(static_cast<const void*>(&a)) { }
template<typename Alloc>
UsesAllocatable(std::allocator_arg_t, const Alloc& a, UsesAllocatable&&)
: d(2), a(static_cast<const void*>(&a)) { }
int d;
const void* a;
};
namespace std
{
template<>
struct uses_allocator<UsesAllocatable, std::allocator<char>> : true_type { };
}
void uses_allocator_ctor()
{
std::allocator<char> a;
variant<UsesAllocatable> v(std::allocator_arg, a);
VERIFY(get<0>(v).d == 0);
VERIFY(get<0>(v).a == &a);
{
variant<UsesAllocatable> u(std::allocator_arg, a, v);
VERIFY(get<0>(u).d == 1);
VERIFY(get<0>(u).a == &a);
}
{
variant<UsesAllocatable> u(std::allocator_arg, a, std::move(v));
VERIFY(get<0>(u).d == 2);
VERIFY(get<0>(u).a == &a);
}
}
void emplace()
{
variant<int, string> v;
......@@ -450,7 +408,6 @@ int main()
arbitrary_ctor();
in_place_index_ctor();
in_place_type_ctor();
uses_allocator_ctor();
copy_assign();
move_assign();
arbitrary_assign();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment