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
107 lines
3.3 KiB
C++
107 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_RANGES_FIND_FIRST_OF_H
|
|
#define _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H
|
|
|
|
#include <__config>
|
|
#include <__functional/identity.h>
|
|
#include <__functional/invoke.h>
|
|
#include <__functional/ranges_operations.h>
|
|
#include <__iterator/concepts.h>
|
|
#include <__iterator/indirectly_comparable.h>
|
|
#include <__ranges/access.h>
|
|
#include <__ranges/concepts.h>
|
|
#include <__ranges/dangling.h>
|
|
#include <__utility/move.h>
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
# pragma GCC system_header
|
|
#endif
|
|
|
|
_LIBCPP_PUSH_MACROS
|
|
#include <__undef_macros>
|
|
|
|
#if _LIBCPP_STD_VER >= 20
|
|
|
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
|
namespace ranges {
|
|
namespace __find_first_of {
|
|
struct __fn {
|
|
template <class _Iter1, class _Sent1, class _Iter2, class _Sent2, class _Pred, class _Proj1, class _Proj2>
|
|
_LIBCPP_HIDE_FROM_ABI constexpr static _Iter1 __find_first_of_impl(
|
|
_Iter1 __first1,
|
|
_Sent1 __last1,
|
|
_Iter2 __first2,
|
|
_Sent2 __last2,
|
|
_Pred& __pred,
|
|
_Proj1& __proj1,
|
|
_Proj2& __proj2) {
|
|
for (; __first1 != __last1; ++__first1) {
|
|
for (auto __j = __first2; __j != __last2; ++__j) {
|
|
if (std::invoke(__pred, std::invoke(__proj1, *__first1), std::invoke(__proj2, *__j)))
|
|
return __first1;
|
|
}
|
|
}
|
|
return __first1;
|
|
}
|
|
|
|
template <input_iterator _Iter1,
|
|
sentinel_for<_Iter1> _Sent1,
|
|
forward_iterator _Iter2,
|
|
sentinel_for<_Iter2> _Sent2,
|
|
class _Pred = ranges::equal_to,
|
|
class _Proj1 = identity,
|
|
class _Proj2 = identity>
|
|
requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>
|
|
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr _Iter1 operator()(
|
|
_Iter1 __first1,
|
|
_Sent1 __last1,
|
|
_Iter2 __first2,
|
|
_Sent2 __last2,
|
|
_Pred __pred = {},
|
|
_Proj1 __proj1 = {},
|
|
_Proj2 __proj2 = {}) const {
|
|
return __find_first_of_impl(
|
|
std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2), __pred, __proj1, __proj2);
|
|
}
|
|
|
|
template <input_range _Range1,
|
|
forward_range _Range2,
|
|
class _Pred = ranges::equal_to,
|
|
class _Proj1 = identity,
|
|
class _Proj2 = identity>
|
|
requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>
|
|
_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr borrowed_iterator_t<_Range1> operator()(
|
|
_Range1&& __range1, _Range2&& __range2, _Pred __pred = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const {
|
|
return __find_first_of_impl(
|
|
ranges::begin(__range1),
|
|
ranges::end(__range1),
|
|
ranges::begin(__range2),
|
|
ranges::end(__range2),
|
|
__pred,
|
|
__proj1,
|
|
__proj2);
|
|
}
|
|
};
|
|
} // namespace __find_first_of
|
|
|
|
inline namespace __cpo {
|
|
inline constexpr auto find_first_of = __find_first_of::__fn{};
|
|
} // namespace __cpo
|
|
} // namespace ranges
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
#endif // _LIBCPP_STD_VER >= 20
|
|
|
|
_LIBCPP_POP_MACROS
|
|
|
|
#endif // _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H
|