From e0949ddadf5d0bd291c876f968f3c020b49f45e3 Mon Sep 17 00:00:00 2001 From: jschuh Date: Mon, 26 Jan 2015 15:30:49 -0800 Subject: Remove unused MSVS 2013 hack from base/numerics R=tsepez@chromium.org Review URL: https://codereview.chromium.org/875983006 Cr-Commit-Position: refs/heads/master@{#313166} --- base/numerics/safe_numerics_unittest.cc | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'base/numerics') diff --git a/base/numerics/safe_numerics_unittest.cc b/base/numerics/safe_numerics_unittest.cc index 0402cef..bdececb 100644 --- a/base/numerics/safe_numerics_unittest.cc +++ b/base/numerics/safe_numerics_unittest.cc @@ -26,14 +26,6 @@ using base::internal::RANGE_OVERFLOW; using base::internal::RANGE_UNDERFLOW; using base::enable_if; -// MSVS 2013 ia32 may not reset the FPU between calculations, and the test -// framework masks the exceptions. So we just force a manual reset after NaN. -inline void ResetFloatingPointUnit() { -#if defined(COMPILER_MSVC) && defined(ARCH_CPU_32_BITS) - _mm_empty(); -#endif -} - // These tests deliberately cause arithmetic overflows. If the compiler is // aggressive enough, it can const fold these overflows. Disable warnings about // overflows for const expressions. @@ -341,7 +333,6 @@ struct TestNumericConversion { TEST_EXPECTED_RANGE(RANGE_OVERFLOW, SrcLimits::infinity()); TEST_EXPECTED_RANGE(RANGE_UNDERFLOW, SrcLimits::infinity() * -1); TEST_EXPECTED_RANGE(RANGE_INVALID, SrcLimits::quiet_NaN()); - ResetFloatingPointUnit(); } else if (numeric_limits::is_signed) { TEST_EXPECTED_RANGE(RANGE_VALID, static_cast(-1)); TEST_EXPECTED_RANGE(RANGE_VALID, SrcLimits::min()); @@ -373,7 +364,6 @@ struct TestNumericConversion { TEST_EXPECTED_RANGE(RANGE_OVERFLOW, SrcLimits::infinity()); TEST_EXPECTED_RANGE(RANGE_UNDERFLOW, SrcLimits::infinity() * -1); TEST_EXPECTED_RANGE(RANGE_INVALID, SrcLimits::quiet_NaN()); - ResetFloatingPointUnit(); } else if (SrcLimits::is_signed) { TEST_EXPECTED_VALUE(-1, checked_dst - static_cast(1)); TEST_EXPECTED_RANGE(RANGE_UNDERFLOW, SrcLimits::min()); @@ -432,7 +422,6 @@ struct TestNumericConversion { TEST_EXPECTED_RANGE(RANGE_OVERFLOW, SrcLimits::infinity()); TEST_EXPECTED_RANGE(RANGE_UNDERFLOW, SrcLimits::infinity() * -1); TEST_EXPECTED_RANGE(RANGE_INVALID, SrcLimits::quiet_NaN()); - ResetFloatingPointUnit(); } else { TEST_EXPECTED_RANGE(RANGE_UNDERFLOW, SrcLimits::min()); } -- cgit v1.1