This is an archive of the discontinued LLVM Phabricator instance.

Differential D132582

[libc++][experimental] Disables PMR in C++03.
ClosedPublic

Authored by Mordante on Aug 24 2022, 11:24 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rG982287a29b85: [libc++][experimental] Disables PMR in C++03.
Summary

While working on D132534 it appeared the experimental PMR code doesn't
have version guards and fails to compile on C++03. This adds the guards
for that version. It seems the tests already were only disabled for
C++03.

Diff Detail

Event Timeline

Mordante created this revision.Aug 24 2022, 11:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 24 2022, 11:24 AM
Mordante requested review of this revision.Aug 24 2022, 11:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 24 2022, 11:24 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Mordante added a child revision: D132584: [libc++] Tests transitive includes for all C++03..Aug 24 2022, 11:42 AM
Harbormaster completed remote builds in B183171: Diff 455302.Aug 24 2022, 2:43 PM
ldionne accepted this revision.Aug 31 2022, 8:55 AM
This revision is now accepted and ready to land.Aug 31 2022, 8:55 AM
This revision was landed with ongoing or failed builds.Aug 31 2022, 10:16 AM
Closed by commit rG982287a29b85: [libc++][experimental] Disables PMR in C++03. (authored by Mordante). · Explain Why
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rG982287a29b85: [libc++][experimental] Disables PMR in C++03..

Revision Contents

PathSize
libcxx/
include/
experimental/
4 lines
4 lines
4 lines
4 lines
4 lines
4 lines
4 lines
4 lines
4 lines
4 lines
4 lines

Diff 455302

libcxx/include/experimental/deque

Show All 34 Lines
#include <experimental/memory_resource> #include <experimental/memory_resource>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _ValueT> template <class _ValueT>
using deque = _VSTD::deque<_ValueT, polymorphic_allocator<_ValueT>>; using deque = _VSTD::deque<_ValueT, polymorphic_allocator<_ValueT>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_DEQUE */ #endif /* _LIBCPP_EXPERIMENTAL_DEQUE */

libcxx/include/experimental/forward_list

Show All 34 Lines
#include <forward_list> #include <forward_list>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _ValueT> template <class _ValueT>
using forward_list = _VSTD::forward_list<_ValueT, polymorphic_allocator<_ValueT>>; using forward_list = _VSTD::forward_list<_ValueT, polymorphic_allocator<_ValueT>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_FORWARD_LIST */ #endif /* _LIBCPP_EXPERIMENTAL_FORWARD_LIST */

libcxx/include/experimental/list

Show All 34 Lines
#include <list> #include <list>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _ValueT> template <class _ValueT>
using list = _VSTD::list<_ValueT, polymorphic_allocator<_ValueT>>; using list = _VSTD::list<_ValueT, polymorphic_allocator<_ValueT>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_LIST */ #endif /* _LIBCPP_EXPERIMENTAL_LIST */

libcxx/include/experimental/map

Show All 39 Lines
#include <map> #include <map>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _Key, class _Value, class _Compare = less<_Key>> template <class _Key, class _Value, class _Compare = less<_Key>>
using map = _VSTD::map<_Key, _Value, _Compare, using map = _VSTD::map<_Key, _Value, _Compare,
polymorphic_allocator<pair<const _Key, _Value>>>; polymorphic_allocator<pair<const _Key, _Value>>>;
template <class _Key, class _Value, class _Compare = less<_Key>> template <class _Key, class _Value, class _Compare = less<_Key>>
using multimap = _VSTD::multimap<_Key, _Value, _Compare, using multimap = _VSTD::multimap<_Key, _Value, _Compare,
polymorphic_allocator<pair<const _Key, _Value>>>; polymorphic_allocator<pair<const _Key, _Value>>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_MAP */ #endif /* _LIBCPP_EXPERIMENTAL_MAP */

libcxx/include/experimental/memory_resource

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Lines
# 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
#ifndef _LIBCPP_CXX03_LANG
// 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);
} }
▲ Show 20 Lines • Show All 310 Lines • ▼ Show 20 Linesprivate:
} }
}; };
template <class _Alloc> template <class _Alloc>
using resource_adaptor = __resource_adaptor_imp< using resource_adaptor = __resource_adaptor_imp<
typename allocator_traits<_Alloc>::template rebind_alloc<char> typename allocator_traits<_Alloc>::template rebind_alloc<char>
>; >;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
_LIBCPP_POP_MACROS _LIBCPP_POP_MACROS
#endif /* _LIBCPP_EXPERIMENTAL_MEMORY_RESOURCE */ #endif /* _LIBCPP_EXPERIMENTAL_MEMORY_RESOURCE */

libcxx/include/experimental/regex

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include <regex> #include <regex>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _BiDirIter> template <class _BiDirIter>
using match_results = using match_results =
_VSTD::match_results<_BiDirIter, _VSTD::match_results<_BiDirIter,
polymorphic_allocator<_VSTD::sub_match<_BiDirIter>>>; polymorphic_allocator<_VSTD::sub_match<_BiDirIter>>>;
typedef match_results<const char*> cmatch; typedef match_results<const char*> cmatch;
typedef match_results<_VSTD_LFTS_PMR::string::const_iterator> smatch; typedef match_results<_VSTD_LFTS_PMR::string::const_iterator> smatch;
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
typedef match_results<const wchar_t*> wcmatch; typedef match_results<const wchar_t*> wcmatch;
typedef match_results<_VSTD_LFTS_PMR::wstring::const_iterator> wsmatch; typedef match_results<_VSTD_LFTS_PMR::wstring::const_iterator> wsmatch;
#endif #endif
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_REGEX */ #endif /* _LIBCPP_EXPERIMENTAL_REGEX */

libcxx/include/experimental/set

Show All 39 Lines
#include <set> #include <set>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _Value, class _Compare = less<_Value>> template <class _Value, class _Compare = less<_Value>>
using set = _VSTD::set<_Value, _Compare, using set = _VSTD::set<_Value, _Compare,
polymorphic_allocator<_Value>>; polymorphic_allocator<_Value>>;
template <class _Value, class _Compare = less<_Value>> template <class _Value, class _Compare = less<_Value>>
using multiset = _VSTD::multiset<_Value, _Compare, using multiset = _VSTD::multiset<_Value, _Compare,
polymorphic_allocator<_Value>>; polymorphic_allocator<_Value>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_SET */ #endif /* _LIBCPP_EXPERIMENTAL_SET */

libcxx/include/experimental/string

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
#include <string> #include <string>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _CharT, class _Traits = char_traits<_CharT>> template <class _CharT, class _Traits = char_traits<_CharT>>
using basic_string = using basic_string =
_VSTD::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>; _VSTD::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>;
typedef basic_string<char> string; typedef basic_string<char> string;
typedef basic_string<char16_t> u16string; typedef basic_string<char16_t> u16string;
typedef basic_string<char32_t> u32string; typedef basic_string<char32_t> u32string;
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
typedef basic_string<wchar_t> wstring; typedef basic_string<wchar_t> wstring;
#endif #endif
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_STRING */ #endif /* _LIBCPP_EXPERIMENTAL_STRING */

libcxx/include/experimental/unordered_map

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Lines
#endif #endif
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _Key, class _Value, template <class _Key, class _Value,
class _Hash = hash<_Key>, class _Pred = equal_to<_Key>> class _Hash = hash<_Key>, class _Pred = equal_to<_Key>>
using unordered_map = _VSTD::unordered_map<_Key, _Value, _Hash, _Pred, using unordered_map = _VSTD::unordered_map<_Key, _Value, _Hash, _Pred,
polymorphic_allocator<pair<const _Key, _Value>>>; polymorphic_allocator<pair<const _Key, _Value>>>;
template <class _Key, class _Value, template <class _Key, class _Value,
class _Hash = hash<_Key>, class _Pred = equal_to<_Key>> class _Hash = hash<_Key>, class _Pred = equal_to<_Key>>
using unordered_multimap = _VSTD::unordered_multimap<_Key, _Value, _Hash, _Pred, using unordered_multimap = _VSTD::unordered_multimap<_Key, _Value, _Hash, _Pred,
polymorphic_allocator<pair<const _Key, _Value>>>; polymorphic_allocator<pair<const _Key, _Value>>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_MAP */ #endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_MAP */

libcxx/include/experimental/unordered_set

Show All 39 Lines
#include <unordered_set> #include <unordered_set>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _Value, template <class _Value,
class _Hash = hash<_Value>, class _Pred = equal_to<_Value>> class _Hash = hash<_Value>, class _Pred = equal_to<_Value>>
using unordered_set = _VSTD::unordered_set<_Value, _Hash, _Pred, using unordered_set = _VSTD::unordered_set<_Value, _Hash, _Pred,
polymorphic_allocator<_Value>>; polymorphic_allocator<_Value>>;
template <class _Value, template <class _Value,
class _Hash = hash<_Value>, class _Pred = equal_to<_Value>> class _Hash = hash<_Value>, class _Pred = equal_to<_Value>>
using unordered_multiset = _VSTD::unordered_multiset<_Value, _Hash, _Pred, using unordered_multiset = _VSTD::unordered_multiset<_Value, _Hash, _Pred,
polymorphic_allocator<_Value>>; polymorphic_allocator<_Value>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_SET */ #endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_SET */

libcxx/include/experimental/vector

Show All 34 Lines
#include <vector> #include <vector>
#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_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
#ifndef _LIBCPP_CXX03_LANG
template <class _ValueT> template <class _ValueT>
using vector = _VSTD::vector<_ValueT, polymorphic_allocator<_ValueT>>; using vector = _VSTD::vector<_ValueT, polymorphic_allocator<_ValueT>>;
#endif // _LIBCPP_CXX03_LANG
_LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS_PMR
#endif /* _LIBCPP_EXPERIMENTAL_VECTOR */ #endif /* _LIBCPP_EXPERIMENTAL_VECTOR */