Skip to content

Commit 4c19854

Browse files
ldionneldionne
authored
[libc++] Rename _LIBCPP_INLINE_VISIBILITY to _LIBCPP_HIDE_FROM_ABI (llvm#74095)
In preparation for running clang-format on the whole code base, we are also removing mentions of the legacy _LIBCPP_INLINE_VISIBILITY macro in favor of the newer _LIBCPP_HIDE_FROM_ABI. We're still leaving the definition of _LIBCPP_INLINE_VISIBILITY to avoid creating needless breakage in case some older patches are checked-in with mentions of the old macro. After we branch for LLVM 18, we can do another pass to clean up remaining uses of the macro that might have gotten introduced by mistake (if any) and remove the macro itself at the same time. This is just a minor convenience to smooth out the transition as much as possible. See https://discourse.llvm.org/t/rfc-clang-formatting-all-of-libc-once-and-for-all for the clang-format proposal.
1 parent c4b795d commit 4c19854

File tree

234 files changed

+5095
-5101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+5095
-5101
lines changed

‎libcxx/.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ AttributeMacros: [
3737
'_LIBCPP_HIDDEN',
3838
'_LIBCPP_HIDE_FROM_ABI_AFTER_V1',
3939
'_LIBCPP_HIDE_FROM_ABI',
40-
'_LIBCPP_INLINE_VISIBILITY',
4140
'_LIBCPP_INTERNAL_LINKAGE',
4241
'_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS',
4342
'_LIBCPP_NO_SANITIZE',

‎libcxx/docs/Contributing.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ In general, try to follow the style of existing code. There are a few
6868
exceptions:
6969

7070
- ``_VSTD::foo`` is no longer used in new code. Use ``std::foo`` instead.
71-
- ``_LIBCPP_INLINE_VISIBILITY`` is no longer used in new code. Use
72-
``_LIBCPP_HIDE_FROM_ABI`` instead.
7371
- Prefer ``using foo = int`` over ``typedef int foo``. The compilers supported
7472
by libc++ accept alias declarations in all standard modes.
7573

‎libcxx/docs/DesignDocs/VisibilityMacros.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ Visibility Macros
4949
Mark a function as not being part of the ABI of any final linked image that
5050
uses it.
5151

52-
**_LIBCPP_INLINE_VISIBILITY**
53-
Historical predecessor of ``_LIBCPP_HIDE_FROM_ABI`` -- please use
54-
``_LIBCPP_HIDE_FROM_ABI`` instead.
55-
5652
**_LIBCPP_HIDE_FROM_ABI_AFTER_V1**
5753
Mark a function as being hidden from the ABI (per `_LIBCPP_HIDE_FROM_ABI`)
5854
when libc++ is built with an ABI version after ABI v1. This macro is used to

‎libcxx/include/__algorithm/any_of.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
_LIBCPP_BEGIN_NAMESPACE_STD
2020

2121
template <class _InputIterator, class _Predicate>
22-
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
22+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
2323
any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
2424
for (; __first != __last; ++__first)
2525
if (__pred(*__first))

‎libcxx/include/__algorithm/binary_search.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2323

2424
template <class _ForwardIterator, class _Tp, class _Compare>
2525
_LIBCPP_NODISCARD_EXT inline
26-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
26+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2727
bool
2828
binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, _Compare __comp)
2929
{
@@ -33,7 +33,7 @@ binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va
3333

3434
template <class _ForwardIterator, class _Tp>
3535
_LIBCPP_NODISCARD_EXT inline
36-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
36+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3737
bool
3838
binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
3939
{

‎libcxx/include/__algorithm/comp_ref_type.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct __debug_less
4747

4848
template <class _LHS, class _RHS>
4949
_LIBCPP_CONSTEXPR_SINCE_CXX14
50-
inline _LIBCPP_INLINE_VISIBILITY
50+
inline _LIBCPP_HIDE_FROM_ABI
5151
decltype((void)std::declval<_Compare&>()(
5252
std::declval<_LHS &>(), std::declval<_RHS &>()))
5353
__do_compare_assert(int, _LHS & __l, _RHS & __r) {
@@ -59,7 +59,7 @@ struct __debug_less
5959

6060
template <class _LHS, class _RHS>
6161
_LIBCPP_CONSTEXPR_SINCE_CXX14
62-
inline _LIBCPP_INLINE_VISIBILITY
62+
inline _LIBCPP_HIDE_FROM_ABI
6363
void __do_compare_assert(long, _LHS &, _RHS &) {}
6464
};
6565

‎libcxx/include/__algorithm/copy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ __copy(_InIter __first, _Sent __last, _OutIter __result) {
113113
}
114114

115115
template <class _InputIterator, class _OutputIterator>
116-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
116+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
117117
copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
118118
return std::__copy<_ClassicAlgPolicy>(__first, __last, __result).second;
119119
}

‎libcxx/include/__algorithm/copy_if.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
_LIBCPP_BEGIN_NAMESPACE_STD
1919

2020
template<class _InputIterator, class _OutputIterator, class _Predicate>
21-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
21+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2222
_OutputIterator
2323
copy_if(_InputIterator __first, _InputIterator __last,
2424
_OutputIterator __result, _Predicate __pred)

‎libcxx/include/__algorithm/copy_n.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2424
template<class _InputIterator, class _Size, class _OutputIterator,
2525
__enable_if_t<__has_input_iterator_category<_InputIterator>::value &&
2626
!__has_random_access_iterator_category<_InputIterator>::value, int> = 0>
27-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
27+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2828
_OutputIterator
2929
copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result)
3030
{
@@ -46,7 +46,7 @@ copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result)
4646

4747
template<class _InputIterator, class _Size, class _OutputIterator,
4848
__enable_if_t<__has_random_access_iterator_category<_InputIterator>::value, int> = 0>
49-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
49+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
5050
_OutputIterator
5151
copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result)
5252
{

‎libcxx/include/__algorithm/count_if.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
_LIBCPP_BEGIN_NAMESPACE_STD
2121

2222
template <class _InputIterator, class _Predicate>
23-
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
23+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2424
typename iterator_traits<_InputIterator>::difference_type
2525
count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
2626
typename iterator_traits<_InputIterator>::difference_type __r(0);

‎libcxx/include/__algorithm/fill.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2222
// fill isn't specialized for std::memset, because the compiler already optimizes the loop to a call to std::memset.
2323

2424
template <class _ForwardIterator, class _Tp>
25-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
25+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2626
void
2727
__fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, forward_iterator_tag)
2828
{
@@ -31,15 +31,15 @@ __fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, fo
3131
}
3232

3333
template <class _RandomAccessIterator, class _Tp>
34-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
34+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3535
void
3636
__fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& __value, random_access_iterator_tag)
3737
{
3838
_VSTD::fill_n(__first, __last - __first, __value);
3939
}
4040

4141
template <class _ForwardIterator, class _Tp>
42-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
42+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4343
void
4444
fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
4545
{

‎libcxx/include/__algorithm/fill_n.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2222
// fill_n isn't specialized for std::memset, because the compiler already optimizes the loop to a call to std::memset.
2323

2424
template <class _OutputIterator, class _Size, class _Tp>
25-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
25+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2626
_OutputIterator
2727
__fill_n(_OutputIterator __first, _Size __n, const _Tp& __value)
2828
{
@@ -32,7 +32,7 @@ __fill_n(_OutputIterator __first, _Size __n, const _Tp& __value)
3232
}
3333

3434
template <class _OutputIterator, class _Size, class _Tp>
35-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
35+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3636
_OutputIterator
3737
fill_n(_OutputIterator __first, _Size __n, const _Tp& __value)
3838
{

‎libcxx/include/__algorithm/find.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ __find_impl(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst>
119119
}
120120

121121
template <class _InputIterator, class _Tp>
122-
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
122+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
123123
find(_InputIterator __first, _InputIterator __last, const _Tp& __value) {
124124
__identity __proj;
125125
return std::__rewrap_iter(

‎libcxx/include/__algorithm/find_first_of.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator1 __find_first_of_ce(_ForwardItera
3535
}
3636

3737
template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
38-
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator1
38+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator1
3939
find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
4040
_ForwardIterator2 __last2, _BinaryPredicate __pred) {
4141
return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __pred);
4242
}
4343

4444
template <class _ForwardIterator1, class _ForwardIterator2>
45-
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator1 find_first_of(
45+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator1 find_first_of(
4646
_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) {
4747
return std::__find_first_of_ce(__first1, __last1, __first2, __last2, __equal_to());
4848
}

‎libcxx/include/__algorithm/find_if.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
_LIBCPP_BEGIN_NAMESPACE_STD
2020

2121
template <class _InputIterator, class _Predicate>
22-
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
22+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
2323
find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
2424
for (; __first != __last; ++__first)
2525
if (__pred(*__first))

‎libcxx/include/__algorithm/find_if_not.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
_LIBCPP_BEGIN_NAMESPACE_STD
2020

2121
template <class _InputIterator, class _Predicate>
22-
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
22+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
2323
find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
2424
for (; __first != __last; ++__first)
2525
if (!__pred(*__first))

‎libcxx/include/__algorithm/for_each_n.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2222
#if _LIBCPP_STD_VER >= 17
2323

2424
template <class _InputIterator, class _Size, class _Function>
25-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator for_each_n(_InputIterator __first,
25+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator for_each_n(_InputIterator __first,
2626
_Size __orig_n,
2727
_Function __f) {
2828
typedef decltype(_VSTD::__convert_to_integral(__orig_n)) _IntegralSize;

‎libcxx/include/__algorithm/generate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
_LIBCPP_BEGIN_NAMESPACE_STD
1919

2020
template <class _ForwardIterator, class _Generator>
21-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
21+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2222
void
2323
generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)
2424
{

‎libcxx/include/__algorithm/generate_n.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
_LIBCPP_BEGIN_NAMESPACE_STD
2020

2121
template <class _OutputIterator, class _Size, class _Generator>
22-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2323
_OutputIterator
2424
generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)
2525
{

‎libcxx/include/__algorithm/half_positive.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2323
// Perform division by two quickly for positive integers (llvm.org/PR39129)
2424

2525
template <typename _Integral, __enable_if_t<is_integral<_Integral>::value, int> = 0>
26-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
26+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
2727
_Integral
2828
__half_positive(_Integral __value)
2929
{
3030
return static_cast<_Integral>(static_cast<__make_unsigned_t<_Integral> >(__value) / 2);
3131
}
3232

3333
template <typename _Tp, __enable_if_t<!is_integral<_Tp>::value, int> = 0>
34-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
34+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
3535
_Tp
3636
__half_positive(_Tp __value)
3737
{

‎libcxx/include/__algorithm/inplace_merge.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ class __invert // invert the sense of a comparison
4444
private:
4545
_Predicate __p_;
4646
public:
47-
_LIBCPP_INLINE_VISIBILITY __invert() {}
47+
_LIBCPP_HIDE_FROM_ABI __invert() {}
4848

49-
_LIBCPP_INLINE_VISIBILITY
49+
_LIBCPP_HIDE_FROM_ABI
5050
explicit __invert(_Predicate __p) : __p_(__p) {}
5151

5252
template <class _T1>
53-
_LIBCPP_INLINE_VISIBILITY
53+
_LIBCPP_HIDE_FROM_ABI
5454
bool operator()(const _T1& __x) {return !__p_(__x);}
5555

5656
template <class _T1, class _T2>
57-
_LIBCPP_INLINE_VISIBILITY
57+
_LIBCPP_HIDE_FROM_ABI
5858
bool operator()(const _T1& __x, const _T2& __y) {return __p_(__y, __x);}
5959
};
6060

‎libcxx/include/__algorithm/is_heap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2323

2424
template <class _RandomAccessIterator, class _Compare>
2525
_LIBCPP_NODISCARD_EXT inline
26-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
26+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2727
bool
2828
is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
2929
{
@@ -32,7 +32,7 @@ is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __
3232

3333
template<class _RandomAccessIterator>
3434
_LIBCPP_NODISCARD_EXT inline
35-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
35+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3636
bool
3737
is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
3838
{

‎libcxx/include/__algorithm/is_sorted.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2323

2424
template <class _ForwardIterator, class _Compare>
2525
_LIBCPP_NODISCARD_EXT inline
26-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
26+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2727
bool
2828
is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
2929
{
@@ -32,7 +32,7 @@ is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
3232

3333
template<class _ForwardIterator>
3434
_LIBCPP_NODISCARD_EXT inline
35-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
35+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3636
bool
3737
is_sorted(_ForwardIterator __first, _ForwardIterator __last)
3838
{

‎libcxx/include/__algorithm/iter_swap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
_LIBCPP_BEGIN_NAMESPACE_STD
2121

2222
template <class _ForwardIterator1, class _ForwardIterator2>
23-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void iter_swap(_ForwardIterator1 __a,
23+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void iter_swap(_ForwardIterator1 __a,
2424
_ForwardIterator2 __b)
2525
// _NOEXCEPT_(_NOEXCEPT_(swap(*__a, *__b)))
2626
_NOEXCEPT_(_NOEXCEPT_(swap(*std::declval<_ForwardIterator1>(), *std::declval<_ForwardIterator2>()))) {

‎libcxx/include/__algorithm/lexicographical_compare.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ __lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
3737

3838
template <class _InputIterator1, class _InputIterator2, class _Compare>
3939
_LIBCPP_NODISCARD_EXT inline
40-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
40+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4141
bool
4242
lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
4343
_InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
@@ -47,7 +47,7 @@ lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
4747

4848
template <class _InputIterator1, class _InputIterator2>
4949
_LIBCPP_NODISCARD_EXT inline
50-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
50+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
5151
bool
5252
lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
5353
_InputIterator2 __first2, _InputIterator2 __last2)

‎libcxx/include/__algorithm/max.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2626

2727
template <class _Tp, class _Compare>
2828
_LIBCPP_NODISCARD_EXT inline
29-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
29+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
3030
const _Tp&
3131
max(_LIBCPP_LIFETIMEBOUND const _Tp& __a, _LIBCPP_LIFETIMEBOUND const _Tp& __b, _Compare __comp)
3232
{
@@ -35,7 +35,7 @@ max(_LIBCPP_LIFETIMEBOUND const _Tp& __a, _LIBCPP_LIFETIMEBOUND const _Tp& __b,
3535

3636
template <class _Tp>
3737
_LIBCPP_NODISCARD_EXT inline
38-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
38+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
3939
const _Tp&
4040
max(_LIBCPP_LIFETIMEBOUND const _Tp& __a, _LIBCPP_LIFETIMEBOUND const _Tp& __b)
4141
{
@@ -46,7 +46,7 @@ max(_LIBCPP_LIFETIMEBOUND const _Tp& __a, _LIBCPP_LIFETIMEBOUND const _Tp& __b)
4646

4747
template<class _Tp, class _Compare>
4848
_LIBCPP_NODISCARD_EXT inline
49-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
49+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
5050
_Tp
5151
max(initializer_list<_Tp> __t, _Compare __comp)
5252
{
@@ -55,7 +55,7 @@ max(initializer_list<_Tp> __t, _Compare __comp)
5555

5656
template<class _Tp>
5757
_LIBCPP_NODISCARD_EXT inline
58-
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
58+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
5959
_Tp
6060
max(initializer_list<_Tp> __t)
6161
{

‎libcxx/include/__algorithm/merge.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ __merge(_InputIterator1 __first1, _InputIterator1 __last1,
4646
}
4747

4848
template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
49-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
49+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
5050
_OutputIterator
5151
merge(_InputIterator1 __first1, _InputIterator1 __last1,
5252
_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
@@ -55,7 +55,7 @@ merge(_InputIterator1 __first1, _InputIterator1 __last1,
5555
}
5656

5757
template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
58-
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
58+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
5959
_OutputIterator
6060
merge(_InputIterator1 __first1, _InputIterator1 __last1,
6161
_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)

0 commit comments

Comments
 (0)