commit e299a7e9c81aa1e79626076fb186716ac13bf977
author Marshall Clow <mclow.lists@gmail.com> Tue Jul 02 03:21:16 2019 +0000
committer Marshall Clow <mclow.lists@gmail.com> Tue Jul 02 03:21:16 2019 +0000
tree 255e0d9cd7a1d12cf234d6972d9015780cc93b12
parent 5e9ba251804fc4905e22fdcac47c4faa98a20c71

Use new '__libcpp_is_constant_evaluated' call to remove an '#ifdef' from the bit code. NFC

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@364884 91177308-0d34-0410-b5e6-96231b3b80d8

include/bit

diff --git a/include/bit b/include/bit
index 9c45edd..dbf7f8a 100644
--- a/include/bit
+++ b/include/bit
@@ -201,7 +201,7 @@
 
 // rotl
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY constexpr
+_LIBCPP_INLINE_VISIBILITY constexpr
 enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp>
 rotl(_Tp __t, unsigned int __cnt) noexcept
 {
@@ -362,11 +362,7 @@
 {
     if (__t < 2) return 1;
     const unsigned __n = numeric_limits<_Tp>::digits - countl_zero((_Tp)(__t - 1u));
-
-#ifndef _LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED
-    if (!__builtin_is_constant_evaluated ())
-        _LIBCPP_DEBUG_ASSERT( __n != numeric_limits<_Tp>::digits, "Bad input to ceil2" );
-#endif
+    _LIBCPP_DEBUG_ASSERT(__libcpp_is_constant_evaluated() || __n != numeric_limits<_Tp>::digits, "Bad input to ceil2");
 
     if constexpr (sizeof(_Tp) >= sizeof(unsigned))
         return _Tp{1} << __n;