Simplify clear managed dict

Author: DinoV

Objects/dictobject.c

@@ -7168,7 +7168,8 @@ try_set_dict_inline_only_or_other_dict(PyObject *obj, PyObject *new_dict, PyDict
 // and replaced it with another dictionary though.
 static int
 replace_dict_probably_inline_materialized(PyObject *obj, PyDictObject *inline_dict,
-                                          PyObject *new_dict, PyDictObject **replaced_dict)
+                                          PyObject *new_dict, bool clear,
+                                          PyDictObject **replaced_dict)
 {
     // But we could have had another thread race in after we released
     // the object lock
@@ -7184,7 +7185,11 @@ replace_dict_probably_inline_materialized(PyObject *obj, PyDictObject *inline_di
         // We incref'd the inline dict and the object owns a ref.
         // Clear the object's reference, we'll clear the local
         // reference after releasing the lock.
-        _PyObject_XDecRefDelayed((PyObject *)*replaced_dict);
+        if (clear) {
+            Py_XDECREF((PyObject *)replaced_dict);
+        } else {
+            _PyObject_XDecRefDelayed((PyObject *)*replaced_dict);
+        }
         *replaced_dict = NULL;
     }
 
@@ -7195,8 +7200,8 @@ replace_dict_probably_inline_materialized(PyObject *obj, PyDictObject *inline_di
 
 #endif
 
-int
-_PyObject_SetManagedDict(PyObject *obj, PyObject *new_dict)
+static int
+set_or_clear_managed_dict(PyObject *obj, PyObject *new_dict, bool clear)
 {
     assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
     assert(_PyObject_InlineValuesConsistencyCheck(obj));
@@ -7215,7 +7220,8 @@ _PyObject_SetManagedDict(PyObject *obj, PyObject *new_dict)
             assert(prev_dict != NULL);
             Py_BEGIN_CRITICAL_SECTION2(obj, prev_dict);
 
-            err = replace_dict_probably_inline_materialized(obj, prev_dict, new_dict, &replaced_dict);
+            err = replace_dict_probably_inline_materialized(obj, prev_dict, new_dict,
+                                                            clear, &replaced_dict);
 
             Py_END_CRITICAL_SECTION2();
 
@@ -7229,7 +7235,11 @@ _PyObject_SetManagedDict(PyObject *obj, PyObject *new_dict)
         if (prev_dict != NULL) {
             // Readers from the old dictionary use a borrowed reference. We need
             // to set the decref the dict at the next safe point.
-            _PyObject_XDecRefDelayed((PyObject *)prev_dict);
+            if (clear) {
+                Py_XDECREF((PyObject *)prev_dict);
+            } else {
+                _PyObject_XDecRefDelayed((PyObject *)prev_dict);
+            }
         }
         return 0;
 #else
@@ -7257,16 +7267,26 @@ _PyObject_SetManagedDict(PyObject *obj, PyObject *new_dict)
                             (PyDictObject *)Py_XNewRef(new_dict));
 
         Py_END_CRITICAL_SECTION();
-        _PyObject_XDecRefDelayed((PyObject *)dict);
+        if (clear) {
+            Py_XDECREF((PyObject *)dict);
+        } else {
+            _PyObject_XDecRefDelayed((PyObject *)dict);
+        }
     }
     assert(_PyObject_InlineValuesConsistencyCheck(obj));
     return err;
 }
 
+int
+_PyObject_SetManagedDict(PyObject *obj, PyObject *new_dict)
+{
+    return set_or_clear_managed_dict(obj, new_dict, false);
+}
+
 void
 PyObject_ClearManagedDict(PyObject *obj)
 {
-    if (_PyObject_SetManagedDict(obj, NULL) < 0) {
+    if (set_or_clear_managed_dict(obj, NULL, true) < 0) {
         PyErr_WriteUnraisable(NULL);
     }
 }