maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[libc++] NFC: Move unwrap_iter to its own header" 

This reverts commit 924ea3bb53 *again*, this time because it broke the
LLDB build with modules. We need to figure out what's up with the libc++
modules build once and for all.

Differential Revision: https://reviews.llvm.org/D103369
This commit is contained in:
Louis Dionne 2021-06-02 15:58:27 -04:00
parent c89dff5855
commit 05d164b25c
4 changed files with 59 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libcxx/include/CMakeLists.txt
View File

@ -1,5 +1,4 @@
set(files
__algorithm/unwrap_iter.h
__availability
__bit_reference
__bits

89
libcxx/include/__algorithm/unwrap_iter.h
View File

@ -1,89 +0,0 @@
//===----------------------------------------------------------------------===//
//
// 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_UNWRAP_ITER_H
#define _LIBCPP___ALGORITHM_UNWRAP_ITER_H
#include <__config>
#include <__iterator/iterator_traits.h> // __is_cpp17_contiguous_iterator
#include <__memory/pointer_traits.h> // __to_address
#include <utility>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD
// __unwrap_iter, __rewrap_iter
// The job of __unwrap_iter is to lower contiguous iterators (such as
// vector<T>::iterator) into pointers, to reduce the number of template
// instantiations and to enable pointer-based optimizations e.g. in std::copy.
// For iterators that are not contiguous, it must be a no-op.
// In debug mode, we don't do this.
//
// __unwrap_iter is non-constexpr for user-defined iterators whose
// `to_address` and/or `operator->` is non-constexpr. This is okay; but we
// try to avoid doing __unwrap_iter in constant-evaluated contexts anyway.
//
// Some algorithms (e.g. std::copy, but not std::sort) need to convert an
// "unwrapped" result back into a contiguous iterator. Since contiguous iterators
// are random-access, we can do this portably using iterator arithmetic; this
// is the job of __rewrap_iter.
template <class _Iter, bool = __is_cpp17_contiguous_iterator<_Iter>::value>
struct __unwrap_iter_impl {
static _LIBCPP_CONSTEXPR _Iter
__apply(_Iter __i) _NOEXCEPT {
return __i;
}
};
#if _LIBCPP_DEBUG_LEVEL < 2
template <class _Iter>
struct __unwrap_iter_impl<_Iter, true> {
static _LIBCPP_CONSTEXPR decltype(_VSTD::__to_address(declval<_Iter>()))
__apply(_Iter __i) _NOEXCEPT {
return _VSTD::__to_address(__i);
}
};
#endif // _LIBCPP_DEBUG_LEVEL < 2
template<class _Iter, class _Impl = __unwrap_iter_impl<_Iter> >
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
decltype(_Impl::__apply(_VSTD::declval<_Iter>()))
__unwrap_iter(_Iter __i) _NOEXCEPT
{
return _Impl::__apply(__i);
}
template<class _OrigIter>
_OrigIter __rewrap_iter(_OrigIter, _OrigIter __result)
{
return __result;
}
template<class _OrigIter, class _UnwrappedIter>
_OrigIter __rewrap_iter(_OrigIter __first, _UnwrappedIter __result)
{
// Precondition: __result is reachable from __first
// Precondition: _OrigIter is a contiguous iterator
return __first + (__result - _VSTD::__unwrap_iter(__first));
}
_LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___ALGORITHM_UNWRAP_ITER_H

60
libcxx/include/algorithm
View File

@ -645,7 +645,6 @@ template <class BidirectionalIterator, class Compare>
*/
#include <__algorithm/unwrap_iter.h>
#include <__config>
#include <__bits> // __libcpp_clz
#include <cstddef>
@ -1640,6 +1639,65 @@ search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const
__value_, __equal_to<__v, _Tp>());
}
// __unwrap_iter, __rewrap_iter
// The job of __unwrap_iter is to lower contiguous iterators (such as
// vector<T>::iterator) into pointers, to reduce the number of template
// instantiations and to enable pointer-based optimizations e.g. in std::copy.
// For iterators that are not contiguous, it must be a no-op.
// In debug mode, we don't do this.
//
// __unwrap_iter is non-constexpr for user-defined iterators whose
// `to_address` and/or `operator->` is non-constexpr. This is okay; but we
// try to avoid doing __unwrap_iter in constant-evaluated contexts anyway.
//
// Some algorithms (e.g. std::copy, but not std::sort) need to convert an
// "unwrapped" result back into a contiguous iterator. Since contiguous iterators
// are random-access, we can do this portably using iterator arithmetic; this
// is the job of __rewrap_iter.
template <class _Iter, bool = __is_cpp17_contiguous_iterator<_Iter>::value>
struct __unwrap_iter_impl {
static _LIBCPP_CONSTEXPR _Iter
__apply(_Iter __i) _NOEXCEPT {
return __i;
}
};
#if _LIBCPP_DEBUG_LEVEL < 2
template <class _Iter>
struct __unwrap_iter_impl<_Iter, true> {
static _LIBCPP_CONSTEXPR decltype(_VSTD::__to_address(declval<_Iter>()))
__apply(_Iter __i) _NOEXCEPT {
return _VSTD::__to_address(__i);
}
};
#endif // _LIBCPP_DEBUG_LEVEL < 2
template<class _Iter, class _Impl = __unwrap_iter_impl<_Iter> >
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
decltype(_Impl::__apply(declval<_Iter>()))
__unwrap_iter(_Iter __i) _NOEXCEPT
{
return _Impl::__apply(__i);
}
template<class _OrigIter>
_OrigIter __rewrap_iter(_OrigIter, _OrigIter __result)
{
return __result;
}
template<class _OrigIter, class _UnwrappedIter>
_OrigIter __rewrap_iter(_OrigIter __first, _UnwrappedIter __result)
{
// Precondition: __result is reachable from __first
// Precondition: _OrigIter is a contiguous iterator
return __first + (__result - _VSTD::__unwrap_iter(__first));
}
// copy
template <class _InputIterator, class _OutputIterator>

1
libcxx/include/module.modulemap
View File

@ -539,7 +539,6 @@ module std [system] {
module __errc { header "__errc" export * }
module __functional_base { header "__functional_base" export * }
module __hash_table { header "__hash_table" export * }
module __iterator_iterator_traits { header "__iterator/iterator_traits.h" export * }
module __locale { header "__locale" export * }
module __mutex_base { header "__mutex_base" export * }
module __node_handle { header "__node_handle" export * }