This is an archive of the discontinued LLVM Phabricator instance.

Differential D46806

Remove unused code from __functional_base. NFC.
ClosedPublic

Authored by • Quuxplusone on May 13 2018, 11:19 AM.

Details

Reviewers
EricWF
mclow.lists
Summary

__user_alloc_construct_impl is used by <experimental/memory_resource>, but this __user_alloc_construct is never used.

Also, <experimental/memory_resource> doesn't need a full definition of std::tuple; just the forward declaration in <__tuple> will suffice.

Diff Detail

Repository
rCXX libc++

Event Timeline

• Quuxplusone created this revision.May 13 2018, 11:19 AM
Herald added a subscriber: cfe-commits. · View Herald TranscriptMay 13 2018, 11:19 AM
• Quuxplusone mentioned this in D47090: Implement C++17 <memory_resource>..May 18 2018, 3:19 PM
• Quuxplusone updated this revision to Diff 147677.May 19 2018, 12:50 PM

@EricWF: would you mind landing these two drive-by fixes while you're at it?

• Quuxplusone added inline comments.May 19 2018, 12:53 PM
include/experimental/memory_resource
99

...although maybe I don't understand the rules here. For example, I see allocator_arg_t and monostate are both marked _LIBCPP_TEMPLATE_VIS as well, even though they're not templates.

• Quuxplusone added a child revision: D47360: Implement <memory_resource> as a copy of <experimental/memory_resource>..May 24 2018, 11:49 PM
• Quuxplusone added a reviewer: mclow.lists.May 26 2018, 9:46 PM
• Quuxplusone added a child revision: D47358: <experimental/memory_resource>: Implement {un,}synchronized_pool_resource..
• Quuxplusone added a child revision: D47111: <experimental/memory_resource>: Implement monotonic_buffer_resource..May 26 2018, 9:48 PM
• Quuxplusone updated this revision to Diff 150067.Jun 5 2018, 9:37 PM
• Quuxplusone edited the summary of this revision. (Show Details)

Also, <experimental/memory_resource> doesn't need a full definition of std::tuple; just the forward declaration in <__tuple> will suffice.

EricWF accepted this revision.Jun 5 2018, 11:46 PM
This revision is now accepted and ready to land.Jun 5 2018, 11:46 PM
EricWF closed this revision.Jun 5 2018, 11:47 PM

r334069

Revision Contents

PathSize
include/
10 lines
experimental/
4 lines

Diff 150067

include/__functional_base

Show First 20 Lines • Show All 640 Lines • ▼ Show 20 Lines
// FIXME: This should have a version which takes a non-const alloc. // FIXME: This should have a version which takes a non-const alloc.
template <class _Tp, class _Allocator, class... _Args> template <class _Tp, class _Allocator, class... _Args>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
void __user_alloc_construct_impl (integral_constant<int, 2>, _Tp *__storage, const _Allocator &__a, _Args &&... __args ) void __user_alloc_construct_impl (integral_constant<int, 2>, _Tp *__storage, const _Allocator &__a, _Args &&... __args )
{ {
new (__storage) _Tp (_VSTD::forward<_Args>(__args)..., __a); new (__storage) _Tp (_VSTD::forward<_Args>(__args)..., __a);
} }
// FIXME: Theis should have a version which takes a non-const alloc.
template <class _Tp, class _Allocator, class... _Args>
inline _LIBCPP_INLINE_VISIBILITY
void __user_alloc_construct (_Tp *__storage, const _Allocator &__a, _Args &&... __args)
{
__user_alloc_construct_impl(
__uses_alloc_ctor<_Tp, _Allocator>(),
__storage, __a, _VSTD::forward<_Args>(__args)...
);
}
#endif // _LIBCPP_CXX03_LANG #endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_FUNCTIONAL_BASE #endif // _LIBCPP_FUNCTIONAL_BASE

include/experimental/memory_resource

Show First 20 Lines • Show All 65 Lines • ▼ Show 20 Lines
*/ */
#include <experimental/__config> #include <experimental/__config>
#include <experimental/__memory> #include <experimental/__memory>
#include <limits> #include <limits>
#include <memory> #include <memory>
#include <new> #include <new>
#include <stdexcept> #include <stdexcept>
#include <tuple> #include <__tuple>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <cstddef> #include <cstddef>
#include <cstdlib> #include <cstdlib>
#include <__debug> #include <__debug>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
// Round __s up to next multiple of __a. // Round __s up to next multiple of __a.
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
size_t __aligned_allocation_size(size_t __s, size_t __a) _NOEXCEPT size_t __aligned_allocation_size(size_t __s, size_t __a) _NOEXCEPT
{ {
_LIBCPP_ASSERT(__s + __a > __s, "aligned allocation size overflows"); _LIBCPP_ASSERT(__s + __a > __s, "aligned allocation size overflows");
return (__s + __a - 1) & ~(__a - 1); return (__s + __a - 1) & ~(__a - 1);
} }
// 8.5, memory.resource // 8.5, memory.resource
class _LIBCPP_TEMPLATE_VIS memory_resource class _LIBCPP_TYPE_VIS memory_resource
QuuxplusoneAuthorUnsubmitted
Not Done
ReplyInline Actions

...although maybe I don't understand the rules here. For example, I see allocator_arg_t and monostate are both marked _LIBCPP_TEMPLATE_VIS as well, even though they're not templates.

Quuxplusone: ...although maybe I don't understand the rules here. For example, I see `allocator_arg_t` and…
{ {
static const size_t __max_align = alignof(max_align_t); static const size_t __max_align = alignof(max_align_t);
// 8.5.2, memory.resource.public // 8.5.2, memory.resource.public
public: public:
virtual ~memory_resource() = default; virtual ~memory_resource() = default;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
▲ Show 20 Lines • Show All 320 Lines • Show Last 20 Lines