Loosen restrictions on CheckedNumeric bitwise operators

base/numerics/safe_numerics_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <type_traits>
 
@@ skipping 204 matching lines @@
   TEST_EXPECTED_FAILURE(CheckedNumeric<Dst>(0) << (sizeof(Dst) * CHAR_BIT));
   TEST_EXPECTED_FAILURE(CheckedNumeric<Dst>(DstLimits::max()) << 1);
   TEST_EXPECTED_VALUE(static_cast<Dst>(1) << (sizeof(Dst) * CHAR_BIT - 1),
                       CheckedNumeric<Dst>(1) << (sizeof(Dst) * CHAR_BIT - 1));
   TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) << 0);
   TEST_EXPECTED_VALUE(2, CheckedNumeric<Dst>(1) << 1);
   TEST_EXPECTED_FAILURE(CheckedNumeric<Dst>(1) >> (sizeof(Dst) * CHAR_BIT));
   TEST_EXPECTED_VALUE(0,
                       CheckedNumeric<Dst>(1) >> (sizeof(Dst) * CHAR_BIT - 1));
   TEST_EXPECTED_FAILURE(CheckedNumeric<Dst>(1) >> negative_one);
-  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) & static_cast<Dst>(1));
-  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(1) & static_cast<Dst>(0));
-  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(0) & static_cast<Dst>(1));
-  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(1) & static_cast<Dst>(0));
-  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) | static_cast<Dst>(1));
-  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) | static_cast<Dst>(0));
-  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(0) | static_cast<Dst>(1));
-  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(0) | static_cast<Dst>(0));
-  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(1) ^ static_cast<Dst>(1));
-  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) ^ static_cast<Dst>(0));
-  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(0) ^ static_cast<Dst>(1));
-  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(0) ^ static_cast<Dst>(0));
+  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) & 0x1);
+  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(1) & 0x0);
+  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(0) & 0x1);
+  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(1) & 0x0);
+  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) | 0x1);
+  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) | 0x0);
+  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(0) | 0x1);
+  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(0) | 0x0);
+  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(1) ^ 0x1);
+  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(1) ^ 0x0);
+  TEST_EXPECTED_VALUE(1, CheckedNumeric<Dst>(0) ^ 0x1);
+  TEST_EXPECTED_VALUE(0, CheckedNumeric<Dst>(0) ^ 0x0);
   TEST_EXPECTED_VALUE(DstLimits::max(), ~CheckedNumeric<Dst>(0));
 }
 
 // Floating point arithmetic.
 template <typename Dst>
 void TestSpecializedArithmetic(
     const char* dst,
     int line,
     typename std::enable_if<numeric_limits<Dst>::is_iec559, int>::type = 0) {
   typedef numeric_limits<Dst> DstLimits;
@@ skipping 652 matching lines @@
   EXPECT_EQ(static_cast<decltype(d)>(-.5), d);
   auto e = CheckMod(CheckNum(20), 3).ValueOrDie();
   EXPECT_EQ(static_cast<decltype(e)>(2), e);
   auto f = CheckLsh(1, CheckNum(2)).ValueOrDie();
   EXPECT_EQ(static_cast<decltype(f)>(4), f);
   auto g = CheckRsh(4, CheckNum(2)).ValueOrDie();
   EXPECT_EQ(static_cast<decltype(g)>(1), g);
   auto h = CheckRsh(CheckAdd(1, 1, 1, 1), CheckSub(4, 2)).ValueOrDie();
   EXPECT_EQ(static_cast<decltype(h)>(1), h);
 }