Lock dict in instance_has_key

Author: mpage

Python/specialize.c

@@ -1072,17 +1072,6 @@ specialize_attr_loadclassattr(PyObject *owner, _Py_CODEUNIT *instr,
 static int specialize_class_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject* name);
 #endif
 
-static PyDictObject *
-get_managed_dict_ref(PyObject *obj)
-{
-    PyDictObject *dict;
-    Py_BEGIN_CRITICAL_SECTION(obj);
-    dict = _PyObject_GetManagedDict(obj);
-    Py_XINCREF(dict);
-    Py_END_CRITICAL_SECTION();
-    return dict;
-}
-
 /* Returns true if instances of obj's class are
  * likely to have `name` in their __dict__.
  * For objects with inline values, we check in the shared keys.
@@ -1101,17 +1090,17 @@ instance_has_key(PyObject *obj, PyObject *name, uint32_t *shared_keys_version)
             _PyDictKeys_StringLookupAndVersion(keys, name, shared_keys_version);
         return index >= 0;
     }
-    PyDictObject *dict = get_managed_dict_ref(obj);
+    PyDictObject *dict = _PyObject_GetManagedDict(obj);
     if (dict == NULL || !PyDict_CheckExact(dict)) {
-        Py_XDECREF(dict);
         return false;
     }
-    if (dict->ma_values) {
-        Py_DECREF(dict);
+    if (FT_ATOMIC_LOAD_PTR(dict->ma_values)) {
         return false;
     }
-    Py_ssize_t index = _PyDict_LookupIndex(dict, name);
-    Py_DECREF(dict);
+    Py_ssize_t index;
+    Py_BEGIN_CRITICAL_SECTION(dict);
+    index = _PyDict_LookupIndex(dict, name);
+    Py_END_CRITICAL_SECTION();
     if (index < 0) {
         return false;
     }