merge 3.1 (#14509)

diff --cc Objects/bytesobject.c
index 62ddf2153279b9a43e9f72a1925dbcd40bb34a6d,a0c121ededf5653734fad5d87355dfbb6b94f662..796e400a822051afa6cccecc4da3ebba6b473785
--- 1/Objects/bytesobject.c
--- 2/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@@ -873,9 -894,11 +873,11 @@@ bytes_hash(PyBytesObject *a
  {
      register Py_ssize_t len;
      register unsigned char *p;
 -    register long x;
 +    register Py_hash_t x;
  
+ #ifdef Py_DEBUG
      assert(_Py_HashSecret_Initialized);
+ #endif
      if (a->ob_shash != -1)
          return a->ob_shash;
      len = Py_SIZE(a);

diff --cc Objects/unicodeobject.c
index a5ffc56260a8d795c44df1d9f04641f863d2d34f,341114f9431b9822c64b8232440dea8b90b653a7..cd17789f53bb87929f3f373b19688d421e47d137
--- 1/Objects/unicodeobject.c
--- 2/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@@ -7671,9 -7339,11 +7671,11 @@@ unicode_hash(PyUnicodeObject *self
  {
      Py_ssize_t len;
      Py_UNICODE *p;
 -    long x;
 +    Py_hash_t x;
  
+ #ifdef Py_DEBUG
      assert(_Py_HashSecret_Initialized);
+ #endif
      if (self->hash != -1)
          return self->hash;
      len = Py_SIZE(self);