diff options
Diffstat (limited to 'chromium/base/numerics')
| -rw-r--r-- | chromium/base/numerics/checked_math_impl.h | 20 | ||||
| -rw-r--r-- | chromium/base/numerics/safe_conversions.h | 4 |
2 files changed, 17 insertions, 7 deletions
diff --git a/chromium/base/numerics/checked_math_impl.h b/chromium/base/numerics/checked_math_impl.h index e083389ebf3..b6cc2966a6d 100644 --- a/chromium/base/numerics/checked_math_impl.h +++ b/chromium/base/numerics/checked_math_impl.h @@ -251,13 +251,23 @@ struct CheckedModOp<T, using result_type = typename MaxExponentPromotion<T, U>::type; template <typename V> static constexpr bool Do(T x, U y, V* result) { + if (BASE_NUMERICS_UNLIKELY(!y)) + return false; + using Promotion = typename BigEnoughPromotion<T, U>::type; - if (BASE_NUMERICS_LIKELY(y)) { - Promotion presult = static_cast<Promotion>(x) % static_cast<Promotion>(y); - *result = static_cast<Promotion>(presult); - return IsValueInRangeForNumericType<V>(presult); + if (BASE_NUMERICS_UNLIKELY( + (std::is_signed<T>::value && std::is_signed<U>::value && + IsTypeInRangeForNumericType<T, Promotion>::value && + static_cast<Promotion>(x) == + std::numeric_limits<Promotion>::lowest() && + y == static_cast<U>(-1)))) { + *result = 0; + return true; } - return false; + + Promotion presult = static_cast<Promotion>(x) % static_cast<Promotion>(y); + *result = static_cast<Promotion>(presult); + return IsValueInRangeForNumericType<V>(presult); } }; diff --git a/chromium/base/numerics/safe_conversions.h b/chromium/base/numerics/safe_conversions.h index b9636fec428..b9f81e85b85 100644 --- a/chromium/base/numerics/safe_conversions.h +++ b/chromium/base/numerics/safe_conversions.h @@ -170,7 +170,7 @@ struct SaturateFastOp< std::is_integral<Dst>::value && SaturateFastAsmOp<Dst, Src>::is_supported>::type> { static const bool is_supported = true; - static Dst Do(Src value) { return SaturateFastAsmOp<Dst, Src>::Do(value); } + static constexpr Dst Do(Src value) { return SaturateFastAsmOp<Dst, Src>::Do(value); } }; template <typename Dst, typename Src> @@ -181,7 +181,7 @@ struct SaturateFastOp< std::is_integral<Dst>::value && !SaturateFastAsmOp<Dst, Src>::is_supported>::type> { static const bool is_supported = true; - static Dst Do(Src value) { + static constexpr Dst Do(Src value) { // The exact order of the following is structured to hit the correct // optimization heuristics across compilers. Do not change without // checking the emitted code. |