mirror of
https://github.com/capstone-engine/llvm-capstone.git
synced 2025-05-17 03:16:35 +00:00
615e6dd1c5
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
(cherry picked from commit 7b4622514d232ce5f7110dd8b20d90e81127c467)
93 lines
3.0 KiB
C++
93 lines
3.0 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_PSTL_MERGE_H
|
|
#define _LIBCPP___ALGORITHM_PSTL_MERGE_H
|
|
|
|
#include <__algorithm/pstl_backend.h>
|
|
#include <__config>
|
|
#include <__functional/operations.h>
|
|
#include <__type_traits/enable_if.h>
|
|
#include <__type_traits/is_execution_policy.h>
|
|
#include <__type_traits/remove_cvref.h>
|
|
#include <__utility/move.h>
|
|
#include <optional>
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
# pragma GCC system_header
|
|
#endif
|
|
|
|
_LIBCPP_PUSH_MACROS
|
|
#include <__undef_macros>
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_INCOMPLETE_PSTL) && _LIBCPP_STD_VER >= 17
|
|
|
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
|
template <class _ExecutionPolicy,
|
|
class _ForwardIterator1,
|
|
class _ForwardIterator2,
|
|
class _ForwardOutIterator,
|
|
class _Comp = std::less<>,
|
|
class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
|
|
enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
|
|
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI optional<_ForwardOutIterator>
|
|
__merge(_ExecutionPolicy&&,
|
|
_ForwardIterator1 __first1,
|
|
_ForwardIterator1 __last1,
|
|
_ForwardIterator2 __first2,
|
|
_ForwardIterator2 __last2,
|
|
_ForwardOutIterator __result,
|
|
_Comp __comp = {}) noexcept {
|
|
using _Backend = typename __select_backend<_RawPolicy>::type;
|
|
return std::__pstl_merge<_RawPolicy>(
|
|
_Backend{},
|
|
std::move(__first1),
|
|
std::move(__last1),
|
|
std::move(__first2),
|
|
std::move(__last2),
|
|
std::move(__result),
|
|
std::move(__comp));
|
|
}
|
|
|
|
template <class _ExecutionPolicy,
|
|
class _ForwardIterator1,
|
|
class _ForwardIterator2,
|
|
class _ForwardOutIterator,
|
|
class _Comp = std::less<>,
|
|
class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
|
|
enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
|
|
_LIBCPP_HIDE_FROM_ABI _ForwardOutIterator
|
|
merge(_ExecutionPolicy&& __policy,
|
|
_ForwardIterator1 __first1,
|
|
_ForwardIterator1 __last1,
|
|
_ForwardIterator2 __first2,
|
|
_ForwardIterator2 __last2,
|
|
_ForwardOutIterator __result,
|
|
_Comp __comp = {}) {
|
|
auto __res = std::__merge(
|
|
__policy,
|
|
std::move(__first1),
|
|
std::move(__last1),
|
|
std::move(__first2),
|
|
std::move(__last2),
|
|
std::move(__result),
|
|
std::move(__comp));
|
|
if (!__res)
|
|
std::__throw_bad_alloc();
|
|
return *std::move(__res);
|
|
}
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
#endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_PSTL) && _LIBCPP_STD_VER >= 17
|
|
|
|
_LIBCPP_POP_MACROS
|
|
|
|
#endif // _LIBCPP___ALGORITHM_PSTL_MERGE_H
|