mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-20 13:23:43 +08:00
[libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@370900 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -303,11 +303,15 @@ long double truncl(long double x);
|
|||||||
#include <__config>
|
#include <__config>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <version>
|
#include <version>
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
||||||
#pragma GCC system_header
|
#pragma GCC system_header
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
_LIBCPP_PUSH_MACROS
|
||||||
|
#include <__undef_macros>
|
||||||
|
|
||||||
_LIBCPP_BEGIN_NAMESPACE_STD
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
||||||
|
|
||||||
using ::signbit;
|
using ::signbit;
|
||||||
@@ -632,6 +636,38 @@ lerp(long double __a, long double __b, long double __t) _NOEXCEPT { return __ler
|
|||||||
|
|
||||||
#endif // _LIBCPP_STD_VER > 17
|
#endif // _LIBCPP_STD_VER > 17
|
||||||
|
|
||||||
|
template <class _IntT, class _FloatT,
|
||||||
|
bool _FloatBigger = (numeric_limits<_FloatT>::digits > numeric_limits<_IntT>::digits),
|
||||||
|
int _Bits = (numeric_limits<_IntT>::digits - numeric_limits<_FloatT>::digits)>
|
||||||
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
|
_LIBCPP_CONSTEXPR _IntT __max_representable_int_for_float() _NOEXCEPT {
|
||||||
|
static_assert(is_floating_point<_FloatT>::value, "must be a floating point type");
|
||||||
|
static_assert(is_integral<_IntT>::value, "must be an integral type");
|
||||||
|
static_assert(numeric_limits<_FloatT>::radix == 2, "FloatT has incorrect radix");
|
||||||
|
static_assert(_IsSame<_FloatT, float>::value || _IsSame<_FloatT, double>::value
|
||||||
|
|| _IsSame<_FloatT,long double>::value, "unsupported floating point type");
|
||||||
|
return _FloatBigger ? numeric_limits<_IntT>::max() : (numeric_limits<_IntT>::max() >> _Bits << _Bits);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert a floating point number to the specified integral type after
|
||||||
|
// clamping to the integral types representable range.
|
||||||
|
//
|
||||||
|
// The behavior is undefined if `__r` is NaN.
|
||||||
|
template <class _IntT, class _RealT>
|
||||||
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
|
_IntT __clamp_to_integral(_RealT __r) _NOEXCEPT {
|
||||||
|
using _Lim = std::numeric_limits<_IntT>;
|
||||||
|
const _IntT _MaxVal = std::__max_representable_int_for_float<_IntT, _RealT>();
|
||||||
|
if (__r >= ::nextafter(static_cast<_RealT>(_MaxVal), INFINITY)) {
|
||||||
|
return _Lim::max();
|
||||||
|
} else if (__r <= _Lim::lowest()) {
|
||||||
|
return _Lim::min();
|
||||||
|
}
|
||||||
|
return static_cast<_IntT>(__r);
|
||||||
|
}
|
||||||
|
|
||||||
_LIBCPP_END_NAMESPACE_STD
|
_LIBCPP_END_NAMESPACE_STD
|
||||||
|
|
||||||
|
_LIBCPP_POP_MACROS
|
||||||
|
|
||||||
#endif // _LIBCPP_CMATH
|
#endif // _LIBCPP_CMATH
|
||||||
|
@@ -1553,40 +1553,6 @@ inline _LIBCPP_INLINE_VISIBILITY
|
|||||||
typename std::enable_if<std::is_integral<_A1>::value, double>::type
|
typename std::enable_if<std::is_integral<_A1>::value, double>::type
|
||||||
trunc(_A1 __lcpp_x) _NOEXCEPT {return ::trunc((double)__lcpp_x);}
|
trunc(_A1 __lcpp_x) _NOEXCEPT {return ::trunc((double)__lcpp_x);}
|
||||||
|
|
||||||
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
||||||
|
|
||||||
template <class _IntT, class _FloatT,
|
|
||||||
bool _FloatBigger = (numeric_limits<_FloatT>::digits > numeric_limits<_IntT>::digits),
|
|
||||||
int _Bits = (numeric_limits<_IntT>::digits - numeric_limits<_FloatT>::digits)>
|
|
||||||
_LIBCPP_INLINE_VISIBILITY
|
|
||||||
_LIBCPP_CONSTEXPR _IntT __max_representable_int_for_float() _NOEXCEPT {
|
|
||||||
static_assert(is_floating_point<_FloatT>::value, "must be a floating point type");
|
|
||||||
static_assert(is_integral<_IntT>::value, "must be an integral type");
|
|
||||||
static_assert(numeric_limits<_FloatT>::radix == 2, "FloatT has incorrect radix");
|
|
||||||
static_assert(_IsSame<_FloatT, float>::value || _IsSame<_FloatT, double>::value
|
|
||||||
|| _IsSame<_FloatT,long double>::value, "unsupported floating point type");
|
|
||||||
return _FloatBigger ? numeric_limits<_IntT>::max() : (numeric_limits<_IntT>::max() >> _Bits << _Bits);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert a floating point number to the specified integral type after
|
|
||||||
// clamping to the integral types representable range.
|
|
||||||
//
|
|
||||||
// The behavior is undefined if `__r` is NaN.
|
|
||||||
template <class _IntT, class _RealT>
|
|
||||||
_LIBCPP_INLINE_VISIBILITY
|
|
||||||
_IntT __clamp_to_integral(_RealT __r) _NOEXCEPT {
|
|
||||||
using _Lim = std::numeric_limits<_IntT>;
|
|
||||||
const _IntT _MaxVal = std::__max_representable_int_for_float<_IntT, _RealT>();
|
|
||||||
if (__r >= ::nextafter(static_cast<_RealT>(_MaxVal), INFINITY)) {
|
|
||||||
return _Lim::max();
|
|
||||||
} else if (__r <= _Lim::lowest()) {
|
|
||||||
return _Lim::min();
|
|
||||||
}
|
|
||||||
return static_cast<_IntT>(__r);
|
|
||||||
}
|
|
||||||
|
|
||||||
_LIBCPP_END_NAMESPACE_STD
|
|
||||||
|
|
||||||
} // extern "C++"
|
} // extern "C++"
|
||||||
|
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
19
test/libcxx/numerics/c.math/undef_min_max.pass.cpp
Normal file
19
test/libcxx/numerics/c.math/undef_min_max.pass.cpp
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
//
|
||||||
|
// 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
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
#if defined(__GNUC__) || defined(__clang__)
|
||||||
|
#pragma GCC diagnostic ignored "-W#warnings"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define min THIS IS A NASTY MACRO!
|
||||||
|
#define max THIS IS A NASTY MACRO!
|
||||||
|
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
|
#include "test_macros.h"
|
||||||
|
|
||||||
|
int main(int, char**) { return 0; }
|
Reference in New Issue
Block a user