mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-17 08:36:41 +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
106 lines
2.8 KiB
C++
106 lines
2.8 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_SHIFT_RIGHT_H
|
|
#define _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
|
|
|
|
#include <__algorithm/move.h>
|
|
#include <__algorithm/move_backward.h>
|
|
#include <__algorithm/swap_ranges.h>
|
|
#include <__config>
|
|
#include <__iterator/iterator_traits.h>
|
|
#include <__utility/swap.h>
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
# pragma GCC system_header
|
|
#endif
|
|
|
|
_LIBCPP_PUSH_MACROS
|
|
#include <__undef_macros>
|
|
|
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
|
#if _LIBCPP_STD_VER >= 20
|
|
|
|
template <class _ForwardIterator>
|
|
inline _LIBCPP_HIDE_FROM_ABI constexpr _ForwardIterator
|
|
shift_right(_ForwardIterator __first,
|
|
_ForwardIterator __last,
|
|
typename iterator_traits<_ForwardIterator>::difference_type __n) {
|
|
if (__n == 0) {
|
|
return __first;
|
|
}
|
|
|
|
if constexpr (__has_random_access_iterator_category<_ForwardIterator>::value) {
|
|
decltype(__n) __d = __last - __first;
|
|
if (__n >= __d) {
|
|
return __last;
|
|
}
|
|
_ForwardIterator __m = __first + (__d - __n);
|
|
return std::move_backward(__first, __m, __last);
|
|
} else if constexpr (__has_bidirectional_iterator_category<_ForwardIterator>::value) {
|
|
_ForwardIterator __m = __last;
|
|
for (; __n > 0; --__n) {
|
|
if (__m == __first) {
|
|
return __last;
|
|
}
|
|
--__m;
|
|
}
|
|
return std::move_backward(__first, __m, __last);
|
|
} else {
|
|
_ForwardIterator __ret = __first;
|
|
for (; __n > 0; --__n) {
|
|
if (__ret == __last) {
|
|
return __last;
|
|
}
|
|
++__ret;
|
|
}
|
|
|
|
// We have an __n-element scratch space from __first to __ret.
|
|
// Slide an __n-element window [__trail, __lead) from left to right.
|
|
// We're essentially doing swap_ranges(__first, __ret, __trail, __lead)
|
|
// over and over; but once __lead reaches __last we needn't bother
|
|
// to save the values of elements [__trail, __last).
|
|
|
|
auto __trail = __first;
|
|
auto __lead = __ret;
|
|
while (__trail != __ret) {
|
|
if (__lead == __last) {
|
|
std::move(__first, __trail, __ret);
|
|
return __ret;
|
|
}
|
|
++__trail;
|
|
++__lead;
|
|
}
|
|
|
|
_ForwardIterator __mid = __first;
|
|
while (true) {
|
|
if (__lead == __last) {
|
|
__trail = std::move(__mid, __ret, __trail);
|
|
std::move(__first, __mid, __trail);
|
|
return __ret;
|
|
}
|
|
swap(*__mid, *__trail);
|
|
++__mid;
|
|
++__trail;
|
|
++__lead;
|
|
if (__mid == __ret) {
|
|
__mid = __first;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif // _LIBCPP_STD_VER >= 20
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
_LIBCPP_POP_MACROS
|
|
|
|
#endif // _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
|