This is an archive of the discontinued LLVM Phabricator instance.

Differential D80067

[NFC] Remove non-variadic overloads of allocator_traits::construct.
ClosedPublic

Authored by zoecarver on May 16 2020, 2:10 PM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGa521532aa16d: [NFC] Remove non-variadic overloads of allocator_traits::construct.
Summary

Libcxx only supports compilers with variadics. We can safely remove all "fake" variadic overloads of allocator_traits::construct.

This also provides the correct behavior if anything other than exactly one argument is supplied to allocator_traits::construct in C++03 mode.

Diff Detail

Event Timeline

zoecarver created this revision.May 16 2020, 2:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 16 2020, 2:10 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, dexonsmith. · View Herald Transcript
zoecarver edited the summary of this revision. (Show Details)May 16 2020, 2:11 PM
Harbormaster failed remote builds in B56972: Diff 264453!May 16 2020, 3:22 PM
ldionne requested changes to this revision.May 19 2020, 6:04 AM
ldionne added inline comments.
libcxx/include/memory
1491

Is there any reason why this can't be shared with the non-C++03 implementation above?

This revision now requires changes to proceed.May 19 2020, 6:04 AM
zoecarver marked an inline comment as done.May 19 2020, 5:29 PM
zoecarver added inline comments.
libcxx/include/memory
1491

No reason. I'll replace the current implementation with this one.

zoecarver updated this revision to Diff 265098.May 19 2020, 5:32 PM
  • Rebase off master
  • Unify __has_construct implementation
Harbormaster failed remote builds in B57308: Diff 265098!May 19 2020, 6:11 PM
ldionne accepted this revision.May 20 2020, 2:46 PM

LGTM if this passes in both pre and post C++11.

This revision is now accepted and ready to land.May 20 2020, 2:46 PM
Closed by commit rGa521532aa16d: [NFC] Remove non-variadic overloads of allocator_traits::construct. (authored by zoecarver). · Explain WhyMay 23 2020, 2:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
include/
58 lines

Diff 264453

libcxx/include/memory

Show First 20 Lines • Show All 1,481 Lines • ▼ Show 20 Lines
template <class _Alloc> template <class _Alloc>
struct __has_select_on_container_copy_construction struct __has_select_on_container_copy_construction
: decltype(_VSTD::__has_select_on_container_copy_construction_test(declval<_Alloc&>())) : decltype(_VSTD::__has_select_on_container_copy_construction_test(declval<_Alloc&>()))
{ {
}; };
#else // _LIBCPP_CXX03_LANG #else // _LIBCPP_CXX03_LANG
template <class _Alloc, class _Pointer, class _Tp, class = void> template <class _Alloc, class ..._Args,
struct __has_construct : std::false_type {}; class = decltype(_VSTD::declval<_Alloc>().construct(_VSTD::declval<_Args>()...))>
ldionneUnsubmitted
Not Done
ReplyInline Actions

Is there any reason why this can't be shared with the non-C++03 implementation above?

ldionne: Is there any reason why this can't be shared with the non-C++03 implementation above?
zoecarverAuthorUnsubmitted
Done
ReplyInline Actions

No reason. I'll replace the current implementation with this one.

zoecarver: No reason. I'll replace the current implementation with this one.
static true_type __test_has_construct(int);
template <class _Alloc, class...>
static false_type __test_has_construct(...);
template <class _Alloc, class _Pointer, class _Tp> template <class _Alloc, class ..._Args>
struct __has_construct<_Alloc, _Pointer, _Tp, typename __void_t< struct __has_construct : decltype(__test_has_construct<_Alloc, _Args...>(0)) {};
decltype(_VSTD::declval<_Alloc>().construct(_VSTD::declval<_Pointer>(), _VSTD::declval<_Tp>()))
>::type> : std::true_type {};
template <class _Alloc, class _Pointer, class = void> template <class _Alloc, class _Pointer, class = void>
struct __has_destroy : false_type {}; struct __has_destroy : false_type {};
template <class _Alloc, class _Pointer> template <class _Alloc, class _Pointer>
struct __has_destroy<_Alloc, _Pointer, typename __void_t< struct __has_destroy<_Alloc, _Pointer, typename __void_t<
decltype(_VSTD::declval<_Alloc>().destroy(_VSTD::declval<_Pointer>())) decltype(_VSTD::declval<_Alloc>().destroy(_VSTD::declval<_Pointer>()))
>::type> : std::true_type {}; >::type> : std::true_type {};
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Lines#endif // _LIBCPP_CXX03_LANG
static pointer allocate(allocator_type& __a, size_type __n, const_void_pointer __hint) static pointer allocate(allocator_type& __a, size_type __n, const_void_pointer __hint)
{return __allocate(__a, __n, __hint, {return __allocate(__a, __n, __hint,
__has_allocate_hint<allocator_type, size_type, const_void_pointer>());} __has_allocate_hint<allocator_type, size_type, const_void_pointer>());}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static void deallocate(allocator_type& __a, pointer __p, size_type __n) _NOEXCEPT static void deallocate(allocator_type& __a, pointer __p, size_type __n) _NOEXCEPT
{__a.deallocate(__p, __n);} {__a.deallocate(__p, __n);}
#ifndef _LIBCPP_HAS_NO_VARIADICS
template <class _Tp, class... _Args> template <class _Tp, class... _Args>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static void construct(allocator_type& __a, _Tp* __p, _Args&&... __args) static void construct(allocator_type& __a, _Tp* __p, _Args&&... __args)
{__construct(__has_construct<allocator_type, _Tp*, _Args...>(), {__construct(__has_construct<allocator_type, _Tp*, _Args...>(),
__a, __p, _VSTD::forward<_Args>(__args)...);} __a, __p, _VSTD::forward<_Args>(__args)...);}
#else // _LIBCPP_HAS_NO_VARIADICS
template <class _Tp>
_LIBCPP_INLINE_VISIBILITY
static void construct(allocator_type&, _Tp* __p)
{
::new ((void*)__p) _Tp();
}
template <class _Tp, class _A0>
_LIBCPP_INLINE_VISIBILITY
static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0)
{
__construct(__has_construct<allocator_type, _Tp*, const _A0&>(),
__a, __p, __a0);
}
template <class _Tp, class _A0, class _A1>
_LIBCPP_INLINE_VISIBILITY
static void construct(allocator_type&, _Tp* __p, const _A0& __a0,
const _A1& __a1)
{
::new ((void*)__p) _Tp(__a0, __a1);
}
template <class _Tp, class _A0, class _A1, class _A2>
_LIBCPP_INLINE_VISIBILITY
static void construct(allocator_type&, _Tp* __p, const _A0& __a0,
const _A1& __a1, const _A2& __a2)
{
::new ((void*)__p) _Tp(__a0, __a1, __a2);
}
#endif // _LIBCPP_HAS_NO_VARIADICS
template <class _Tp> template <class _Tp>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static void destroy(allocator_type& __a, _Tp* __p) static void destroy(allocator_type& __a, _Tp* __p)
{__destroy(__has_destroy<allocator_type, _Tp*>(), __a, __p);} {__destroy(__has_destroy<allocator_type, _Tp*>(), __a, __p);}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static size_type max_size(const allocator_type& __a) _NOEXCEPT static size_type max_size(const allocator_type& __a) _NOEXCEPT
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Lines static pointer __allocate(allocator_type& __a, size_type __n,
return __a.allocate(__n, __hint); return __a.allocate(__n, __hint);
_LIBCPP_SUPPRESS_DEPRECATED_POP _LIBCPP_SUPPRESS_DEPRECATED_POP
} }
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static pointer __allocate(allocator_type& __a, size_type __n, static pointer __allocate(allocator_type& __a, size_type __n,
const_void_pointer, false_type) const_void_pointer, false_type)
{return __a.allocate(__n);} {return __a.allocate(__n);}
#ifndef _LIBCPP_HAS_NO_VARIADICS
template <class _Tp, class... _Args> template <class _Tp, class... _Args>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static void __construct(true_type, allocator_type& __a, _Tp* __p, _Args&&... __args) static void __construct(true_type, allocator_type& __a, _Tp* __p, _Args&&... __args)
{ {
_LIBCPP_SUPPRESS_DEPRECATED_PUSH _LIBCPP_SUPPRESS_DEPRECATED_PUSH
__a.construct(__p, _VSTD::forward<_Args>(__args)...); __a.construct(__p, _VSTD::forward<_Args>(__args)...);
_LIBCPP_SUPPRESS_DEPRECATED_POP _LIBCPP_SUPPRESS_DEPRECATED_POP
} }
template <class _Tp, class... _Args> template <class _Tp, class... _Args>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static void __construct(false_type, allocator_type&, _Tp* __p, _Args&&... __args) static void __construct(false_type, allocator_type&, _Tp* __p, _Args&&... __args)
{ {
::new ((void*)__p) _Tp(_VSTD::forward<_Args>(__args)...); ::new ((void*)__p) _Tp(_VSTD::forward<_Args>(__args)...);
} }
#else // _LIBCPP_HAS_NO_VARIADICS
template <class _Tp, class _A0>
_LIBCPP_INLINE_VISIBILITY
static void __construct(true_type, allocator_type& __a, _Tp* __p,
const _A0& __a0)
{__a.construct(__p, __a0);}
template <class _Tp, class _A0>
_LIBCPP_INLINE_VISIBILITY
static void __construct(false_type, allocator_type&, _Tp* __p,
const _A0& __a0)
{
::new ((void*)__p) _Tp(__a0);
}
#endif // _LIBCPP_HAS_NO_VARIADICS
template <class _Tp> template <class _Tp>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
static void __destroy(true_type, allocator_type& __a, _Tp* __p) static void __destroy(true_type, allocator_type& __a, _Tp* __p)
{ {
_LIBCPP_SUPPRESS_DEPRECATED_PUSH _LIBCPP_SUPPRESS_DEPRECATED_PUSH
__a.destroy(__p); __a.destroy(__p);
_LIBCPP_SUPPRESS_DEPRECATED_POP _LIBCPP_SUPPRESS_DEPRECATED_POP
▲ Show 20 Lines • Show All 3,638 Lines • Show Last 20 Lines