mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-18 00:36:37 +00:00
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
76 lines
2.6 KiB
C++
76 lines
2.6 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_NEXT_PERMUTATION_H
|
|
#define _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
|
|
|
|
#include <__algorithm/comp.h>
|
|
#include <__algorithm/comp_ref_type.h>
|
|
#include <__algorithm/iterator_operations.h>
|
|
#include <__algorithm/reverse.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 _AlgPolicy, class _Compare, class _BidirectionalIterator, class _Sentinel>
|
|
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator, bool>
|
|
__next_permutation(_BidirectionalIterator __first, _Sentinel __last, _Compare&& __comp) {
|
|
using _Result = pair<_BidirectionalIterator, bool>;
|
|
|
|
_BidirectionalIterator __last_iter = _IterOps<_AlgPolicy>::next(__first, __last);
|
|
_BidirectionalIterator __i = __last_iter;
|
|
if (__first == __last || __first == --__i)
|
|
return _Result(std::move(__last_iter), false);
|
|
|
|
while (true) {
|
|
_BidirectionalIterator __ip1 = __i;
|
|
if (__comp(*--__i, *__ip1)) {
|
|
_BidirectionalIterator __j = __last_iter;
|
|
while (!__comp(*__i, *--__j))
|
|
;
|
|
_IterOps<_AlgPolicy>::iter_swap(__i, __j);
|
|
std::__reverse<_AlgPolicy>(__ip1, __last_iter);
|
|
return _Result(std::move(__last_iter), true);
|
|
}
|
|
if (__i == __first) {
|
|
std::__reverse<_AlgPolicy>(__first, __last_iter);
|
|
return _Result(std::move(__last_iter), false);
|
|
}
|
|
}
|
|
}
|
|
|
|
template <class _BidirectionalIterator, class _Compare>
|
|
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
|
|
next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp) {
|
|
return std::__next_permutation<_ClassicAlgPolicy>(
|
|
std::move(__first), std::move(__last), static_cast<__comp_ref_type<_Compare> >(__comp))
|
|
.second;
|
|
}
|
|
|
|
template <class _BidirectionalIterator>
|
|
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
|
|
next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last) {
|
|
return std::next_permutation(__first, __last, __less<>());
|
|
}
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
_LIBCPP_POP_MACROS
|
|
|
|
#endif // _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
|