2022-07-08 13:46:27 -07:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#ifndef _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H
|
|
|
|
#define _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H
|
|
|
|
|
2022-07-17 18:11:51 -07:00
|
|
|
#include <__algorithm/iterator_operations.h>
|
2022-07-08 13:46:27 -07:00
|
|
|
#include <__algorithm/make_projected.h>
|
|
|
|
#include <__algorithm/pop_heap.h>
|
|
|
|
#include <__concepts/same_as.h>
|
|
|
|
#include <__config>
|
|
|
|
#include <__functional/identity.h>
|
|
|
|
#include <__functional/invoke.h>
|
|
|
|
#include <__functional/ranges_operations.h>
|
|
|
|
#include <__iterator/concepts.h>
|
|
|
|
#include <__iterator/iterator_traits.h>
|
|
|
|
#include <__iterator/next.h>
|
|
|
|
#include <__iterator/projected.h>
|
|
|
|
#include <__iterator/sortable.h>
|
|
|
|
#include <__ranges/access.h>
|
|
|
|
#include <__ranges/concepts.h>
|
|
|
|
#include <__ranges/dangling.h>
|
|
|
|
#include <__utility/forward.h>
|
|
|
|
#include <__utility/move.h>
|
|
|
|
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
|
|
# pragma GCC system_header
|
|
|
|
#endif
|
|
|
|
|
[libc++] Fix missing and incorrect push/pop macros (#79204)
We recently noticed that the unwrap_iter.h file was pushing macros, but
it was pushing them again instead of popping them at the end of the
file. This led to libc++ basically swallowing any custom definition of
these macros in user code:
#define min HELLO
#include <algorithm>
// min is not HELLO anymore, it's not defined
While investigating this issue, I noticed that our push/pop pragmas were
actually entirely wrong too. Indeed, instead of pushing macros like
`move`, we'd push `move(int, int)` in the pragma, which is not a valid
macro name. As a result, we would not actually push macros like `move`
-- instead we'd simply undefine them. This led to the following code not
working:
#define move HELLO
#include <algorithm>
// move is not HELLO anymore
Fixing the pragma push/pop incantations led to a cascade of issues
because we use identifiers like `move` in a large number of places, and
all of these headers would now need to do the push/pop dance.
This patch fixes all these issues. First, it adds a check that we don't
swallow important names like min, max, move or refresh as explained
above. This is done by augmenting the existing
system_reserved_names.gen.py test to also check that the macros are what
we expect after including each header.
Second, it fixes the push/pop pragmas to work properly and adds missing
pragmas to all the files I could detect a failure in via the newly added
test.
rdar://121365472
2024-01-25 15:48:46 -05:00
|
|
|
_LIBCPP_PUSH_MACROS
|
|
|
|
#include <__undef_macros>
|
|
|
|
|
2023-02-14 00:56:09 +01:00
|
|
|
#if _LIBCPP_STD_VER >= 20
|
2022-07-08 13:46:27 -07:00
|
|
|
|
|
|
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
|
|
|
|
|
namespace ranges {
|
2024-08-01 05:54:06 -07:00
|
|
|
struct __pop_heap {
|
2022-07-08 13:46:27 -07:00
|
|
|
template <class _Iter, class _Sent, class _Comp, class _Proj>
|
|
|
|
_LIBCPP_HIDE_FROM_ABI constexpr static _Iter
|
|
|
|
__pop_heap_fn_impl(_Iter __first, _Sent __last, _Comp& __comp, _Proj& __proj) {
|
|
|
|
auto __last_iter = ranges::next(__first, __last);
|
|
|
|
auto __len = __last_iter - __first;
|
|
|
|
|
2022-07-30 02:42:05 -07:00
|
|
|
auto&& __projected_comp = std::__make_projected(__comp, __proj);
|
2022-07-17 18:11:51 -07:00
|
|
|
std::__pop_heap<_RangeAlgPolicy>(std::move(__first), __last_iter, __projected_comp, __len);
|
2022-07-08 13:46:27 -07:00
|
|
|
|
|
|
|
return __last_iter;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <random_access_iterator _Iter, sentinel_for<_Iter> _Sent, class _Comp = ranges::less, class _Proj = identity>
|
|
|
|
requires sortable<_Iter, _Comp, _Proj>
|
|
|
|
_LIBCPP_HIDE_FROM_ABI constexpr _Iter
|
|
|
|
operator()(_Iter __first, _Sent __last, _Comp __comp = {}, _Proj __proj = {}) const {
|
|
|
|
return __pop_heap_fn_impl(std::move(__first), std::move(__last), __comp, __proj);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <random_access_range _Range, class _Comp = ranges::less, class _Proj = identity>
|
|
|
|
requires sortable<iterator_t<_Range>, _Comp, _Proj>
|
|
|
|
_LIBCPP_HIDE_FROM_ABI constexpr borrowed_iterator_t<_Range>
|
|
|
|
operator()(_Range&& __r, _Comp __comp = {}, _Proj __proj = {}) const {
|
|
|
|
return __pop_heap_fn_impl(ranges::begin(__r), ranges::end(__r), __comp, __proj);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
inline namespace __cpo {
|
2024-08-01 05:54:06 -07:00
|
|
|
inline constexpr auto pop_heap = __pop_heap{};
|
2022-07-08 13:46:27 -07:00
|
|
|
} // namespace __cpo
|
|
|
|
} // namespace ranges
|
|
|
|
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
|
2023-02-14 00:56:09 +01:00
|
|
|
#endif // _LIBCPP_STD_VER >= 20
|
2022-07-08 13:46:27 -07:00
|
|
|
|
[libc++] Fix missing and incorrect push/pop macros (#79204)
We recently noticed that the unwrap_iter.h file was pushing macros, but
it was pushing them again instead of popping them at the end of the
file. This led to libc++ basically swallowing any custom definition of
these macros in user code:
#define min HELLO
#include <algorithm>
// min is not HELLO anymore, it's not defined
While investigating this issue, I noticed that our push/pop pragmas were
actually entirely wrong too. Indeed, instead of pushing macros like
`move`, we'd push `move(int, int)` in the pragma, which is not a valid
macro name. As a result, we would not actually push macros like `move`
-- instead we'd simply undefine them. This led to the following code not
working:
#define move HELLO
#include <algorithm>
// move is not HELLO anymore
Fixing the pragma push/pop incantations led to a cascade of issues
because we use identifiers like `move` in a large number of places, and
all of these headers would now need to do the push/pop dance.
This patch fixes all these issues. First, it adds a check that we don't
swallow important names like min, max, move or refresh as explained
above. This is done by augmenting the existing
system_reserved_names.gen.py test to also check that the macros are what
we expect after including each header.
Second, it fixes the push/pop pragmas to work properly and adds missing
pragmas to all the files I could detect a failure in via the newly added
test.
rdar://121365472
2024-01-25 15:48:46 -05:00
|
|
|
_LIBCPP_POP_MACROS
|
|
|
|
|
2022-07-08 13:46:27 -07:00
|
|
|
#endif // _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H
|