review comments

Author: eendebakpt

Lib/test/test_long.py

@@ -1696,10 +1696,18 @@ class MyInt(int):
     def test_hash(self):
         # gh-136599
         self.assertEqual(hash(-1), -2)
+        self.assertEqual(hash(0), 0)
         self.assertEqual(hash(10), 10)
-        self.assertEqual(hash(2**31 - 2), 2**31 - 2)
-        self.assertNotEqual(hash(-2**31), -1)
-        self.assertNotEqual(hash(-2**61), -1)
+
+        self.assertEqual(hash(sys.hash_info.modulus - 2), sys.hash_info.modulus - 2)
+        self.assertEqual(hash(sys.hash_info.modulus - 1), sys.hash_info.modulus - 1)
+        self.assertEqual(hash(sys.hash_info.modulus), 0)
+        self.assertEqual(hash(sys.hash_info.modulus + 1), 1)
+
+        self.assertEqual(hash(-sys.hash_info.modulus - 2), -2)
+        self.assertEqual(hash(-sys.hash_info.modulus - 1), -2)
+        self.assertEqual(hash(-sys.hash_info.modulus), 0)
+        self.assertEqual(hash(-sys.hash_info.modulus + 1), - (sys.hash_info.modulus - 1))
 
 
 if __name__ == "__main__":

Objects/longobject.c

@@ -3678,11 +3678,13 @@ long_hash(PyObject *obj)
     sign = _PyLong_NonCompactSign(v);
 
     // unroll first two digits
+#if ( PyHASH_BITS > PyLong_SHIFT )
     assert(i>=2);
     --i;
     x = v->long_value.ob_digit[i];
     assert(x < _PyHASH_MODULUS);
-#if ( PyHASH_BITS > (2*PyLong_SHIFT))
+#endif
+#if ( PyHASH_BITS > (2 * PyLong_SHIFT) )
     --i;
     x = ((x << PyLong_SHIFT));
     x += v->long_value.ob_digit[i];