[libcxx-commits] [libcxx] dd28e22 - [libc++][NFC] Rename __libcpp_*_or_builtin to __constexpr_*
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Dec 8 00:36:21 PST 2022
Author: Nikolas Klauser
Date: 2022-12-08T09:36:17+01:00
New Revision: dd28e22953ad4094248d3e47d1f63893c1612d8c
URL: https://github.com/llvm/llvm-project/commit/dd28e22953ad4094248d3e47d1f63893c1612d8c
DIFF: https://github.com/llvm/llvm-project/commit/dd28e22953ad4094248d3e47d1f63893c1612d8c.diff
LOG: [libc++][NFC] Rename __libcpp_*_or_builtin to __constexpr_*
We normally use the `__libcpp_` prefix to backport functions, but that doesn't really make sense here. The functions are always available. Using `__constexpr_` makes the intended use of the functions clear.
Reviewed By: Mordante, #libc
Spies: libcxx-commits
Differential Revision: https://reviews.llvm.org/D139521
Added:
Modified:
libcxx/include/cmath
libcxx/include/complex
libcxx/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/include/cmath b/libcxx/include/cmath
index ef3a67843e104..ed88fe8da219a 100644
--- a/libcxx/include/cmath
+++ b/libcxx/include/cmath
@@ -565,7 +565,7 @@ hypot(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT
template <class _A1>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type
-__libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT
+__constexpr_isnan(_A1 __lcpp_x) _NOEXCEPT
{
#if __has_builtin(__builtin_isnan)
return __builtin_isnan(__lcpp_x);
@@ -577,7 +577,7 @@ __libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT
template <class _A1>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type
-__libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT
+__constexpr_isnan(_A1 __lcpp_x) _NOEXCEPT
{
return isnan(__lcpp_x);
}
@@ -585,7 +585,7 @@ __libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT
template <class _A1>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type
-__libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT
+__constexpr_isinf(_A1 __lcpp_x) _NOEXCEPT
{
#if __has_builtin(__builtin_isinf)
return __builtin_isinf(__lcpp_x);
@@ -597,7 +597,7 @@ __libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT
template <class _A1>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type
-__libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT
+__constexpr_isinf(_A1 __lcpp_x) _NOEXCEPT
{
return isinf(__lcpp_x);
}
@@ -605,7 +605,7 @@ __libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT
template <class _A1>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type
-__libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT
+__constexpr_isfinite(_A1 __lcpp_x) _NOEXCEPT
{
#if __has_builtin(__builtin_isfinite)
return __builtin_isfinite(__lcpp_x);
@@ -617,7 +617,7 @@ __libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT
template <class _A1>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type
-__libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT
+__constexpr_isfinite(_A1 __lcpp_x) _NOEXCEPT
{
return isfinite(__lcpp_x);
}
diff --git a/libcxx/include/complex b/libcxx/include/complex
index af90aec78ba8d..2c1c5a2114a8a 100644
--- a/libcxx/include/complex
+++ b/libcxx/include/complex
@@ -596,39 +596,39 @@ operator*(const complex<_Tp>& __z, const complex<_Tp>& __w)
_Tp __bc = __b * __c;
_Tp __x = __ac - __bd;
_Tp __y = __ad + __bc;
- if (__libcpp_isnan_or_builtin(__x) && __libcpp_isnan_or_builtin(__y))
+ if (__constexpr_isnan(__x) && __constexpr_isnan(__y))
{
bool __recalc = false;
- if (__libcpp_isinf_or_builtin(__a) || __libcpp_isinf_or_builtin(__b))
+ if (__constexpr_isinf(__a) || __constexpr_isinf(__b))
{
- __a = copysign(__libcpp_isinf_or_builtin(__a) ? _Tp(1) : _Tp(0), __a);
- __b = copysign(__libcpp_isinf_or_builtin(__b) ? _Tp(1) : _Tp(0), __b);
- if (__libcpp_isnan_or_builtin(__c))
+ __a = copysign(__constexpr_isinf(__a) ? _Tp(1) : _Tp(0), __a);
+ __b = copysign(__constexpr_isinf(__b) ? _Tp(1) : _Tp(0), __b);
+ if (__constexpr_isnan(__c))
__c = copysign(_Tp(0), __c);
- if (__libcpp_isnan_or_builtin(__d))
+ if (__constexpr_isnan(__d))
__d = copysign(_Tp(0), __d);
__recalc = true;
}
- if (__libcpp_isinf_or_builtin(__c) || __libcpp_isinf_or_builtin(__d))
+ if (__constexpr_isinf(__c) || __constexpr_isinf(__d))
{
- __c = copysign(__libcpp_isinf_or_builtin(__c) ? _Tp(1) : _Tp(0), __c);
- __d = copysign(__libcpp_isinf_or_builtin(__d) ? _Tp(1) : _Tp(0), __d);
- if (__libcpp_isnan_or_builtin(__a))
+ __c = copysign(__constexpr_isinf(__c) ? _Tp(1) : _Tp(0), __c);
+ __d = copysign(__constexpr_isinf(__d) ? _Tp(1) : _Tp(0), __d);
+ if (__constexpr_isnan(__a))
__a = copysign(_Tp(0), __a);
- if (__libcpp_isnan_or_builtin(__b))
+ if (__constexpr_isnan(__b))
__b = copysign(_Tp(0), __b);
__recalc = true;
}
- if (!__recalc && (__libcpp_isinf_or_builtin(__ac) || __libcpp_isinf_or_builtin(__bd) ||
- __libcpp_isinf_or_builtin(__ad) || __libcpp_isinf_or_builtin(__bc)))
+ if (!__recalc && (__constexpr_isinf(__ac) || __constexpr_isinf(__bd) ||
+ __constexpr_isinf(__ad) || __constexpr_isinf(__bc)))
{
- if (__libcpp_isnan_or_builtin(__a))
+ if (__constexpr_isnan(__a))
__a = copysign(_Tp(0), __a);
- if (__libcpp_isnan_or_builtin(__b))
+ if (__constexpr_isnan(__b))
__b = copysign(_Tp(0), __b);
- if (__libcpp_isnan_or_builtin(__c))
+ if (__constexpr_isnan(__c))
__c = copysign(_Tp(0), __c);
- if (__libcpp_isnan_or_builtin(__d))
+ if (__constexpr_isnan(__d))
__d = copysign(_Tp(0), __d);
__recalc = true;
}
@@ -671,7 +671,7 @@ operator/(const complex<_Tp>& __z, const complex<_Tp>& __w)
_Tp __c = __w.real();
_Tp __d = __w.imag();
_Tp __logbw = logb(fmax(fabs(__c), fabs(__d)));
- if (__libcpp_isfinite_or_builtin(__logbw))
+ if (__constexpr_isfinite(__logbw))
{
__ilogbw = static_cast<int>(__logbw);
__c = scalbn(__c, -__ilogbw);
@@ -680,24 +680,24 @@ operator/(const complex<_Tp>& __z, const complex<_Tp>& __w)
_Tp __denom = __c * __c + __d * __d;
_Tp __x = scalbn((__a * __c + __b * __d) / __denom, -__ilogbw);
_Tp __y = scalbn((__b * __c - __a * __d) / __denom, -__ilogbw);
- if (__libcpp_isnan_or_builtin(__x) && __libcpp_isnan_or_builtin(__y))
+ if (__constexpr_isnan(__x) && __constexpr_isnan(__y))
{
- if ((__denom == _Tp(0)) && (!__libcpp_isnan_or_builtin(__a) || !__libcpp_isnan_or_builtin(__b)))
+ if ((__denom == _Tp(0)) && (!__constexpr_isnan(__a) || !__constexpr_isnan(__b)))
{
__x = copysign(_Tp(INFINITY), __c) * __a;
__y = copysign(_Tp(INFINITY), __c) * __b;
}
- else if ((__libcpp_isinf_or_builtin(__a) || __libcpp_isinf_or_builtin(__b)) && __libcpp_isfinite_or_builtin(__c) && __libcpp_isfinite_or_builtin(__d))
+ else if ((__constexpr_isinf(__a) || __constexpr_isinf(__b)) && __constexpr_isfinite(__c) && __constexpr_isfinite(__d))
{
- __a = copysign(__libcpp_isinf_or_builtin(__a) ? _Tp(1) : _Tp(0), __a);
- __b = copysign(__libcpp_isinf_or_builtin(__b) ? _Tp(1) : _Tp(0), __b);
+ __a = copysign(__constexpr_isinf(__a) ? _Tp(1) : _Tp(0), __a);
+ __b = copysign(__constexpr_isinf(__b) ? _Tp(1) : _Tp(0), __b);
__x = _Tp(INFINITY) * (__a * __c + __b * __d);
__y = _Tp(INFINITY) * (__b * __c - __a * __d);
}
- else if (__libcpp_isinf_or_builtin(__logbw) && __logbw > _Tp(0) && __libcpp_isfinite_or_builtin(__a) && __libcpp_isfinite_or_builtin(__b))
+ else if (__constexpr_isinf(__logbw) && __logbw > _Tp(0) && __constexpr_isfinite(__a) && __constexpr_isfinite(__b))
{
- __c = copysign(__libcpp_isinf_or_builtin(__c) ? _Tp(1) : _Tp(0), __c);
- __d = copysign(__libcpp_isinf_or_builtin(__d) ? _Tp(1) : _Tp(0), __d);
+ __c = copysign(__constexpr_isinf(__c) ? _Tp(1) : _Tp(0), __c);
+ __d = copysign(__constexpr_isinf(__d) ? _Tp(1) : _Tp(0), __d);
__x = _Tp(0) * (__a * __c + __b * __d);
__y = _Tp(0) * (__b * __c - __a * __d);
}
@@ -907,9 +907,9 @@ inline _LIBCPP_INLINE_VISIBILITY
_Tp
norm(const complex<_Tp>& __c)
{
- if (__libcpp_isinf_or_builtin(__c.real()))
+ if (__constexpr_isinf(__c.real()))
return abs(__c.real());
- if (__libcpp_isinf_or_builtin(__c.imag()))
+ if (__constexpr_isinf(__c.imag()))
return abs(__c.imag());
return __c.real() * __c.real() + __c.imag() * __c.imag();
}
@@ -952,7 +952,7 @@ complex<_Tp>
proj(const complex<_Tp>& __c)
{
complex<_Tp> __r = __c;
- if (__libcpp_isinf_or_builtin(__c.real()) || __libcpp_isinf_or_builtin(__c.imag()))
+ if (__constexpr_isinf(__c.real()) || __constexpr_isinf(__c.imag()))
__r = complex<_Tp>(INFINITY, copysign(_Tp(0), __c.imag()));
return __r;
}
@@ -966,7 +966,7 @@ typename enable_if
>::type
proj(_Tp __re)
{
- if (__libcpp_isinf_or_builtin(__re))
+ if (__constexpr_isinf(__re))
__re = abs(__re);
return complex<_Tp>(__re);
}
@@ -990,25 +990,25 @@ template<class _Tp>
_LIBCPP_HIDE_FROM_ABI complex<_Tp>
polar(const _Tp& __rho, const _Tp& __theta = _Tp())
{
- if (__libcpp_isnan_or_builtin(__rho) || signbit(__rho))
+ if (__constexpr_isnan(__rho) || signbit(__rho))
return complex<_Tp>(_Tp(NAN), _Tp(NAN));
- if (__libcpp_isnan_or_builtin(__theta))
+ if (__constexpr_isnan(__theta))
{
- if (__libcpp_isinf_or_builtin(__rho))
+ if (__constexpr_isinf(__rho))
return complex<_Tp>(__rho, __theta);
return complex<_Tp>(__theta, __theta);
}
- if (__libcpp_isinf_or_builtin(__theta))
+ if (__constexpr_isinf(__theta))
{
- if (__libcpp_isinf_or_builtin(__rho))
+ if (__constexpr_isinf(__rho))
return complex<_Tp>(__rho, _Tp(NAN));
return complex<_Tp>(_Tp(NAN), _Tp(NAN));
}
_Tp __x = __rho * cos(__theta);
- if (__libcpp_isnan_or_builtin(__x))
+ if (__constexpr_isnan(__x))
__x = 0;
_Tp __y = __rho * sin(__theta);
- if (__libcpp_isnan_or_builtin(__y))
+ if (__constexpr_isnan(__y))
__y = 0;
return complex<_Tp>(__x, __y);
}
@@ -1039,13 +1039,13 @@ template<class _Tp>
_LIBCPP_HIDE_FROM_ABI complex<_Tp>
sqrt(const complex<_Tp>& __x)
{
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(_Tp(INFINITY), __x.imag());
- if (__libcpp_isinf_or_builtin(__x.real()))
+ if (__constexpr_isinf(__x.real()))
{
if (__x.real() > _Tp(0))
- return complex<_Tp>(__x.real(), __libcpp_isnan_or_builtin(__x.imag()) ? __x.imag() : copysign(_Tp(0), __x.imag()));
- return complex<_Tp>(__libcpp_isnan_or_builtin(__x.imag()) ? __x.imag() : _Tp(0), copysign(__x.real(), __x.imag()));
+ return complex<_Tp>(__x.real(), __constexpr_isnan(__x.imag()) ? __x.imag() : copysign(_Tp(0), __x.imag()));
+ return complex<_Tp>(__constexpr_isnan(__x.imag()) ? __x.imag() : _Tp(0), copysign(__x.real(), __x.imag()));
}
return polar(sqrt(abs(__x)), arg(__x) / _Tp(2));
}
@@ -1060,16 +1060,16 @@ exp(const complex<_Tp>& __x)
if (__i == 0) {
return complex<_Tp>(exp(__x.real()), copysign(_Tp(0), __x.imag()));
}
- if (__libcpp_isinf_or_builtin(__x.real()))
+ if (__constexpr_isinf(__x.real()))
{
if (__x.real() < _Tp(0))
{
- if (!__libcpp_isfinite_or_builtin(__i))
+ if (!__constexpr_isfinite(__i))
__i = _Tp(1);
}
- else if (__i == 0 || !__libcpp_isfinite_or_builtin(__i))
+ else if (__i == 0 || !__constexpr_isfinite(__i))
{
- if (__libcpp_isinf_or_builtin(__i))
+ if (__constexpr_isinf(__i))
__i = _Tp(NAN);
return complex<_Tp>(__x.real(), __i);
}
@@ -1141,23 +1141,23 @@ _LIBCPP_HIDE_FROM_ABI complex<_Tp>
asinh(const complex<_Tp>& __x)
{
const _Tp __pi(atan2(+0., -0.));
- if (__libcpp_isinf_or_builtin(__x.real()))
+ if (__constexpr_isinf(__x.real()))
{
- if (__libcpp_isnan_or_builtin(__x.imag()))
+ if (__constexpr_isnan(__x.imag()))
return __x;
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
}
- if (__libcpp_isnan_or_builtin(__x.real()))
+ if (__constexpr_isnan(__x.real()))
{
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(__x.imag(), __x.real());
if (__x.imag() == 0)
return __x;
return complex<_Tp>(__x.real(), __x.real());
}
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(copysign(__x.imag(), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
complex<_Tp> __z = log(__x + sqrt(__sqr(__x) + _Tp(1)));
return complex<_Tp>(copysign(__z.real(), __x.real()), copysign(__z.imag(), __x.imag()));
@@ -1170,11 +1170,11 @@ _LIBCPP_HIDE_FROM_ABI complex<_Tp>
acosh(const complex<_Tp>& __x)
{
const _Tp __pi(atan2(+0., -0.));
- if (__libcpp_isinf_or_builtin(__x.real()))
+ if (__constexpr_isinf(__x.real()))
{
- if (__libcpp_isnan_or_builtin(__x.imag()))
+ if (__constexpr_isnan(__x.imag()))
return complex<_Tp>(abs(__x.real()), __x.imag());
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
{
if (__x.real() > 0)
return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
@@ -1185,13 +1185,13 @@ acosh(const complex<_Tp>& __x)
return complex<_Tp>(-__x.real(), copysign(__pi, __x.imag()));
return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
}
- if (__libcpp_isnan_or_builtin(__x.real()))
+ if (__constexpr_isnan(__x.real()))
{
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(abs(__x.imag()), __x.real());
return complex<_Tp>(__x.real(), __x.real());
}
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(abs(__x.imag()), copysign(__pi/_Tp(2), __x.imag()));
complex<_Tp> __z = log(__x + sqrt(__sqr(__x) - _Tp(1)));
return complex<_Tp>(copysign(__z.real(), _Tp(0)), copysign(__z.imag(), __x.imag()));
@@ -1204,21 +1204,21 @@ _LIBCPP_HIDE_FROM_ABI complex<_Tp>
atanh(const complex<_Tp>& __x)
{
const _Tp __pi(atan2(+0., -0.));
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
{
return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
}
- if (__libcpp_isnan_or_builtin(__x.imag()))
+ if (__constexpr_isnan(__x.imag()))
{
- if (__libcpp_isinf_or_builtin(__x.real()) || __x.real() == 0)
+ if (__constexpr_isinf(__x.real()) || __x.real() == 0)
return complex<_Tp>(copysign(_Tp(0), __x.real()), __x.imag());
return complex<_Tp>(__x.imag(), __x.imag());
}
- if (__libcpp_isnan_or_builtin(__x.real()))
+ if (__constexpr_isnan(__x.real()))
{
return complex<_Tp>(__x.real(), __x.real());
}
- if (__libcpp_isinf_or_builtin(__x.real()))
+ if (__constexpr_isinf(__x.real()))
{
return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
}
@@ -1236,11 +1236,11 @@ template<class _Tp>
_LIBCPP_HIDE_FROM_ABI complex<_Tp>
sinh(const complex<_Tp>& __x)
{
- if (__libcpp_isinf_or_builtin(__x.real()) && !__libcpp_isfinite_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.real()) && !__constexpr_isfinite(__x.imag()))
return complex<_Tp>(__x.real(), _Tp(NAN));
- if (__x.real() == 0 && !__libcpp_isfinite_or_builtin(__x.imag()))
+ if (__x.real() == 0 && !__constexpr_isfinite(__x.imag()))
return complex<_Tp>(__x.real(), _Tp(NAN));
- if (__x.imag() == 0 && !__libcpp_isfinite_or_builtin(__x.real()))
+ if (__x.imag() == 0 && !__constexpr_isfinite(__x.real()))
return __x;
return complex<_Tp>(sinh(__x.real()) * cos(__x.imag()), cosh(__x.real()) * sin(__x.imag()));
}
@@ -1251,13 +1251,13 @@ template<class _Tp>
_LIBCPP_HIDE_FROM_ABI complex<_Tp>
cosh(const complex<_Tp>& __x)
{
- if (__libcpp_isinf_or_builtin(__x.real()) && !__libcpp_isfinite_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.real()) && !__constexpr_isfinite(__x.imag()))
return complex<_Tp>(abs(__x.real()), _Tp(NAN));
- if (__x.real() == 0 && !__libcpp_isfinite_or_builtin(__x.imag()))
+ if (__x.real() == 0 && !__constexpr_isfinite(__x.imag()))
return complex<_Tp>(_Tp(NAN), __x.real());
if (__x.real() == 0 && __x.imag() == 0)
return complex<_Tp>(_Tp(1), __x.imag());
- if (__x.imag() == 0 && !__libcpp_isfinite_or_builtin(__x.real()))
+ if (__x.imag() == 0 && !__constexpr_isfinite(__x.real()))
return complex<_Tp>(abs(__x.real()), __x.imag());
return complex<_Tp>(cosh(__x.real()) * cos(__x.imag()), sinh(__x.real()) * sin(__x.imag()));
}
@@ -1268,19 +1268,19 @@ template<class _Tp>
_LIBCPP_HIDE_FROM_ABI complex<_Tp>
tanh(const complex<_Tp>& __x)
{
- if (__libcpp_isinf_or_builtin(__x.real()))
+ if (__constexpr_isinf(__x.real()))
{
- if (!__libcpp_isfinite_or_builtin(__x.imag()))
+ if (!__constexpr_isfinite(__x.imag()))
return complex<_Tp>(copysign(_Tp(1), __x.real()), _Tp(0));
return complex<_Tp>(copysign(_Tp(1), __x.real()), copysign(_Tp(0), sin(_Tp(2) * __x.imag())));
}
- if (__libcpp_isnan_or_builtin(__x.real()) && __x.imag() == 0)
+ if (__constexpr_isnan(__x.real()) && __x.imag() == 0)
return __x;
_Tp __2r(_Tp(2) * __x.real());
_Tp __2i(_Tp(2) * __x.imag());
_Tp __d(cosh(__2r) + cos(__2i));
_Tp __2rsh(sinh(__2r));
- if (__libcpp_isinf_or_builtin(__2rsh) && __libcpp_isinf_or_builtin(__d))
+ if (__constexpr_isinf(__2rsh) && __constexpr_isinf(__d))
return complex<_Tp>(__2rsh > _Tp(0) ? _Tp(1) : _Tp(-1),
__2i > _Tp(0) ? _Tp(0) : _Tp(-0.));
return complex<_Tp>(__2rsh/__d, sin(__2i)/__d);
@@ -1303,11 +1303,11 @@ _LIBCPP_HIDE_FROM_ABI complex<_Tp>
acos(const complex<_Tp>& __x)
{
const _Tp __pi(atan2(+0., -0.));
- if (__libcpp_isinf_or_builtin(__x.real()))
+ if (__constexpr_isinf(__x.real()))
{
- if (__libcpp_isnan_or_builtin(__x.imag()))
+ if (__constexpr_isnan(__x.imag()))
return complex<_Tp>(__x.imag(), __x.real());
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
{
if (__x.real() < _Tp(0))
return complex<_Tp>(_Tp(0.75) * __pi, -__x.imag());
@@ -1317,13 +1317,13 @@ acos(const complex<_Tp>& __x)
return complex<_Tp>(__pi, signbit(__x.imag()) ? -__x.real() : __x.real());
return complex<_Tp>(_Tp(0), signbit(__x.imag()) ? __x.real() : -__x.real());
}
- if (__libcpp_isnan_or_builtin(__x.real()))
+ if (__constexpr_isnan(__x.real()))
{
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(__x.real(), -__x.imag());
return complex<_Tp>(__x.real(), __x.real());
}
- if (__libcpp_isinf_or_builtin(__x.imag()))
+ if (__constexpr_isinf(__x.imag()))
return complex<_Tp>(__pi/_Tp(2), -__x.imag());
if (__x.real() == 0 && (__x.imag() == 0 || isnan(__x.imag())))
return complex<_Tp>(__pi/_Tp(2), -__x.imag());
diff --git a/libcxx/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp b/libcxx/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp
index 1fb031ca29dd5..3739bc6ef04dd 100644
--- a/libcxx/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp
+++ b/libcxx/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp
@@ -20,9 +20,9 @@
#include "test_macros.h"
-static_assert(std::__libcpp_isnan_or_builtin(0.) == false, "");
-static_assert(std::__libcpp_isinf_or_builtin(0.0) == false, "");
-static_assert(std::__libcpp_isfinite_or_builtin(0.0) == true, "");
+static_assert(std::__constexpr_isnan(0.) == false, "");
+static_assert(std::__constexpr_isinf(0.0) == false, "");
+static_assert(std::__constexpr_isfinite(0.0) == true, "");
int main(int, char**)
{
More information about the libcxx-commits
mailing list