Reuse hash

Author: aivarsk

Modules/_json.c

@@ -10,6 +10,7 @@
 
 #include "Python.h"
 #include "pycore_ceval.h"         // _Py_EnterRecursiveCall()
+#include "pycore_dict.h"          // _PyDict_SetItem_KnownHash()
 #include "pycore_global_strings.h" // _Py_ID()
 #include "pycore_pyerrors.h"      // _PyErr_FormatNote
 #include "pycore_runtime.h"       // _PyRuntime
@@ -1523,16 +1524,23 @@ encoder_listencode_obj(PyEncoderObject *s, PyUnicodeWriter *writer,
     }
     else {
         PyObject *ident = NULL;
+        Py_hash_t ident_hash = -1;
         if (s->markers != Py_None) {
             Py_ssize_t len;
 
             ident = PyLong_FromVoidPtr(obj);
             if (ident == NULL)
                 return -1;
 
+            ident_hash = PyObject_Hash(ident);
+            if (ident_hash == -1) {
+                Py_DECREF(ident);
+                return -1;
+            }
+
             len = PyDict_GET_SIZE(s->markers);
 
-            if (PyDict_SetItem(s->markers, ident, obj)) {
+            if (_PyDict_SetItem_KnownHash(s->markers, ident, obj, ident_hash)) {
                 Py_DECREF(ident);
                 return -1;
             }
@@ -1564,7 +1572,7 @@ encoder_listencode_obj(PyEncoderObject *s, PyUnicodeWriter *writer,
             return -1;
         }
         if (ident != NULL) {
-            if (PyDict_DelItem(s->markers, ident)) {
+            if (_PyDict_DelItem_KnownHash(s->markers, ident, ident_hash)) {
                 Py_XDECREF(ident);
                 return -1;
             }
@@ -1655,6 +1663,7 @@ encoder_listencode_dict(PyEncoderObject *s, PyUnicodeWriter *writer,
     PyObject *ident = NULL;
     PyObject *items = NULL;
     PyObject *key, *value;
+    Py_hash_t ident_hash = -1;
     bool first = true;
 
     if (PyDict_GET_SIZE(dct) == 0) {
@@ -1669,9 +1678,14 @@ encoder_listencode_dict(PyEncoderObject *s, PyUnicodeWriter *writer,
         if (ident == NULL)
             return -1;
 
+        ident_hash = PyObject_Hash(ident);
+        if (ident_hash == -1) {
+            goto bail;
+        }
+
         len = PyDict_GET_SIZE(s->markers);
 
-        if (PyDict_SetItem(s->markers, ident, dct)) {
+        if (_PyDict_SetItem_KnownHash(s->markers, ident, dct, ident_hash)) {
             goto bail;
         }
 
@@ -1726,7 +1740,7 @@ encoder_listencode_dict(PyEncoderObject *s, PyUnicodeWriter *writer,
     }
 
     if (ident != NULL) {
-        if (PyDict_DelItem(s->markers, ident))
+        if (_PyDict_DelItem_KnownHash(s->markers, ident, ident_hash))
             goto bail;
         Py_CLEAR(ident);
     }
@@ -1756,6 +1770,7 @@ encoder_listencode_list(PyEncoderObject *s, PyUnicodeWriter *writer,
     PyObject *ident = NULL;
     PyObject *s_fast = NULL;
     Py_ssize_t i;
+    Py_hash_t ident_hash = -1;
 
     ident = NULL;
     s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
@@ -1773,9 +1788,14 @@ encoder_listencode_list(PyEncoderObject *s, PyUnicodeWriter *writer,
         if (ident == NULL)
             return -1;
 
+        ident_hash = PyObject_Hash(ident);
+        if (ident_hash == -1) {
+            goto bail;
+        }
+
         len = PyDict_GET_SIZE(s->markers);
 
-        if (PyDict_SetItem(s->markers, ident, seq)) {
+        if (_PyDict_SetItem_KnownHash(s->markers, ident, seq, ident_hash)) {
             goto bail;
         }
 
@@ -1811,7 +1831,7 @@ encoder_listencode_list(PyEncoderObject *s, PyUnicodeWriter *writer,
         }
     }
     if (ident != NULL) {
-        if (PyDict_DelItem(s->markers, ident))
+        if (_PyDict_DelItem_KnownHash(s->markers, ident, ident_hash))
             goto bail;
         Py_CLEAR(ident);
     }