[libcxx-commits] [libcxx] r364884 - Use new '__libcpp_is_constant_evaluated' call to remove an '#ifdef' from the bit code. NFC

[Marshall Clow via libcxx-commits]

Author: marshall
Date: Mon Jul  1 20:21:16 2019
New Revision: 364884

URL: http://llvm.org/viewvc/llvm-project?rev=364884&view=rev
Log:
Use new '__libcpp_is_constant_evaluated' call to remove an '#ifdef' from the bit code. NFC

Modified:
    libcxx/trunk/include/bit

Modified: libcxx/trunk/include/bit
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/bit?rev=364884&r1=364883&r2=364884&view=diff
==============================================================================
--- libcxx/trunk/include/bit (original)
+++ libcxx/trunk/include/bit Mon Jul  1 20:21:16 2019
@@ -201,7 +201,7 @@ using __bitop_unsigned_integer _LIBCPP_N
 
 // 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 @@ ceil2(_Tp __t) noexcept
 {
     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;