7b4622514d
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
91 lines
3.3 KiB
C++
91 lines
3.3 KiB
C++
//===----------------------------------------------------------------------===//
|
|
//
|
|
// 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_PARTITION_H
|
|
#define _LIBCPP___ALGORITHM_PARTITION_H
|
|
|
|
#include <__algorithm/iterator_operations.h>
|
|
#include <__config>
|
|
#include <__iterator/iterator_traits.h>
|
|
#include <__utility/move.h>
|
|
#include <__utility/pair.h>
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
# pragma GCC system_header
|
|
#endif
|
|
|
|
_LIBCPP_PUSH_MACROS
|
|
#include <__undef_macros>
|
|
|
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
|
template <class _Predicate, class _AlgPolicy, class _ForwardIterator, class _Sentinel>
|
|
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_ForwardIterator, _ForwardIterator>
|
|
__partition_impl(_ForwardIterator __first, _Sentinel __last, _Predicate __pred, forward_iterator_tag) {
|
|
while (true) {
|
|
if (__first == __last)
|
|
return std::make_pair(std::move(__first), std::move(__first));
|
|
if (!__pred(*__first))
|
|
break;
|
|
++__first;
|
|
}
|
|
|
|
_ForwardIterator __p = __first;
|
|
while (++__p != __last) {
|
|
if (__pred(*__p)) {
|
|
_IterOps<_AlgPolicy>::iter_swap(__first, __p);
|
|
++__first;
|
|
}
|
|
}
|
|
return std::make_pair(std::move(__first), std::move(__p));
|
|
}
|
|
|
|
template <class _Predicate, class _AlgPolicy, class _BidirectionalIterator, class _Sentinel>
|
|
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator, _BidirectionalIterator>
|
|
__partition_impl(_BidirectionalIterator __first, _Sentinel __sentinel, _Predicate __pred, bidirectional_iterator_tag) {
|
|
_BidirectionalIterator __original_last = _IterOps<_AlgPolicy>::next(__first, __sentinel);
|
|
_BidirectionalIterator __last = __original_last;
|
|
|
|
while (true) {
|
|
while (true) {
|
|
if (__first == __last)
|
|
return std::make_pair(std::move(__first), std::move(__original_last));
|
|
if (!__pred(*__first))
|
|
break;
|
|
++__first;
|
|
}
|
|
do {
|
|
if (__first == --__last)
|
|
return std::make_pair(std::move(__first), std::move(__original_last));
|
|
} while (!__pred(*__last));
|
|
_IterOps<_AlgPolicy>::iter_swap(__first, __last);
|
|
++__first;
|
|
}
|
|
}
|
|
|
|
template <class _AlgPolicy, class _ForwardIterator, class _Sentinel, class _Predicate, class _IterCategory>
|
|
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_ForwardIterator, _ForwardIterator>
|
|
__partition(_ForwardIterator __first, _Sentinel __last, _Predicate&& __pred, _IterCategory __iter_category) {
|
|
return std::__partition_impl<__remove_cvref_t<_Predicate>&, _AlgPolicy>(
|
|
std::move(__first), std::move(__last), __pred, __iter_category);
|
|
}
|
|
|
|
template <class _ForwardIterator, class _Predicate>
|
|
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
|
|
partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) {
|
|
using _IterCategory = typename iterator_traits<_ForwardIterator>::iterator_category;
|
|
auto __result = std::__partition<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __pred, _IterCategory());
|
|
return __result.first;
|
|
}
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
_LIBCPP_POP_MACROS
|
|
|
|
#endif // _LIBCPP___ALGORITHM_PARTITION_H
|