Revert "gh-130327: Only set the managed dictionary if there aren't inline values"

ZeroIntensity · ZeroIntensity · commit 2fa09a9ad927 · 2025-02-22T13:47:13.000-05:00
This reverts commit 8a29421.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -7170,16 +7170,15 @@ set_dict_inline_values(PyObject *obj, PyDictObject *new_dict)
 
     PyDictValues *values = _PyObject_InlineValues(obj);
 
+    Py_XINCREF(new_dict);
+    FT_ATOMIC_STORE_PTR(_PyObject_ManagedDictPointer(obj)->dict, new_dict);
+
     if (values->valid) {
         FT_ATOMIC_STORE_UINT8(values->valid, 0);
         for (Py_ssize_t i = 0; i < values->capacity; i++) {
             Py_CLEAR(values->values[i]);
         }
     }
-    else {
-        Py_XINCREF(new_dict);
-        FT_ATOMIC_STORE_PTR(_PyObject_ManagedDictPointer(obj)->dict, new_dict);
-    }
 }
 
 #ifdef Py_GIL_DISABLED

Original file line number	Diff line number	Diff line change
`@@ -7170,16 +7170,15 @@ set_dict_inline_values(PyObject obj, PyDictObject new_dict)`
`7170`	`7170`
`7171`	`7171`	`PyDictValues *values = _PyObject_InlineValues(obj);`
`7172`	`7172`
	`7173`	`+ Py_XINCREF(new_dict);`
	`7174`	`+ FT_ATOMIC_STORE_PTR(_PyObject_ManagedDictPointer(obj)->dict, new_dict);`
	`7175`	`+`
`7173`	`7176`	`if (values->valid) {`
`7174`	`7177`	`FT_ATOMIC_STORE_UINT8(values->valid, 0);`
`7175`	`7178`	`for (Py_ssize_t i = 0; i < values->capacity; i++) {`
`7176`	`7179`	`Py_CLEAR(values->values[i]);`
`7177`	`7180`	`}`
`7178`	`7181`	`}`
`7179`		`- else {`
`7180`		`- Py_XINCREF(new_dict);`
`7181`		`- FT_ATOMIC_STORE_PTR(_PyObject_ManagedDictPointer(obj)->dict, new_dict);`
`7182`		`- }`
`7183`	`7182`	`}`
`7184`	`7183`
`7185`	`7184`	`#ifdef Py_GIL_DISABLED`