review comments

Author: eendebakpt

Lib/test/test_long.py

@@ -1693,11 +1693,14 @@ class MyInt(int):
         # GH-117195 -- This shouldn't crash
         object.__sizeof__(1)
 
-    def test_long_hash(self):
+    def test_hash(self):
         # gh-136599
-        assert hash(10) == 10
-        assert hash(-1) == -2
-        assert hash(-2**61) != -1
+        self.assertEqual(hash(-1), -2)
+        self.assertEqual(hash(10), 10)
+        self.assertEqual(hash(2**31 -1), 2**31 - 1)
+        self.assertNotEqual(hash(-2**31), -1)
+        self.assertNotEqual(hash(-2**61), -1)
+
 
 if __name__ == "__main__":
     unittest.main()

Objects/longobject.c

@@ -3682,11 +3682,12 @@ long_hash(PyObject *obj)
     --i;
     x = v->long_value.ob_digit[i];
     assert(x < _PyHASH_MODULUS);
+#if ( PyHASH_BITS > (2*PyLong_SHIFT))
     --i;
     x = ((x << PyLong_SHIFT));
     x += v->long_value.ob_digit[i];
     assert(x < _PyHASH_MODULUS);
-
+#endif
     while (--i >= 0) {
         /* Here x is a quantity in the range [0, _PyHASH_MODULUS); we
            want to compute x * 2**PyLong_SHIFT + v->long_value.ob_digit[i] modulo