Address code review

Author: corona10

Include/internal/pycore_object.h

@@ -767,6 +767,27 @@ _Py_TryIncref(PyObject *op)
 #endif
 }
 
+// Enqueue an object to be freed possibly after some delay
+#ifdef Py_GIL_DISABLED
+PyAPI_FUNC(void) _PyObject_XDecRefDelayed(PyObject *obj);
+#else
+static inline void _PyObject_XDecRefDelayed(PyObject *obj)
+{
+    Py_XDECREF(obj);
+}
+#endif
+
+#ifdef Py_GIL_DISABLED
+// Same as `Py_XSETREF` but in free-threading, it stores the object atomically
+// and queues the old object to be decrefed at a safe point using QSBR.
+PyAPI_FUNC(void) _PyObject_XSetRefDelayed(PyObject **p_obj, PyObject *obj);
+#else
+static inline void _PyObject_XSetRefDelayed(PyObject **p_obj, PyObject *obj)
+{
+    Py_XSETREF(*p_obj, obj);
+}
+#endif
+
 #ifdef Py_REF_DEBUG
 extern void _PyInterpreterState_FinalizeRefTotal(PyInterpreterState *);
 extern void _Py_FinalizeRefTotal(_PyRuntimeState *);

Include/internal/pycore_pymem.h

@@ -90,27 +90,6 @@ extern int _PyMem_DebugEnabled(void);
 // Enqueue a pointer to be freed possibly after some delay.
 extern void _PyMem_FreeDelayed(void *ptr);
 
-// Enqueue an object to be freed possibly after some delay
-#ifdef Py_GIL_DISABLED
-PyAPI_FUNC(void) _PyObject_XDecRefDelayed(PyObject *obj);
-#else
-static inline void _PyObject_XDecRefDelayed(PyObject *obj)
-{
-    Py_XDECREF(obj);
-}
-#endif
-
-#ifdef Py_GIL_DISABLED
-// Same as `Py_XSETREF` but in free-threading, it stores the object atomically
-// and queues the old object to be decrefed at a safe point using QSBR.
-PyAPI_FUNC(void) _PyObject_XSetRefDelayed(PyObject **p_obj, PyObject *obj);
-#else
-static inline void _PyObject_XSetRefDelayed(PyObject **p_obj, PyObject *obj)
-{
-    Py_XSETREF(*p_obj, obj);
-}
-#endif
-
 // Periodically process delayed free requests.
 extern void _PyMem_ProcessDelayed(PyThreadState *tstate);
 

Objects/genobject.c

@@ -705,7 +705,7 @@ static PyObject *
 gen_get_name(PyObject *self, void *Py_UNUSED(ignored))
 {
     PyGenObject *op = _PyGen_CAST(self);
-    PyObject *name = FT_ATOMIC_LOAD_PTR_RELAXED(op->gi_name);
+    PyObject *name = FT_ATOMIC_LOAD_PTR_ACQUIRE(op->gi_name);
     return Py_NewRef(name);
 }
 
@@ -721,7 +721,7 @@ gen_set_name(PyObject *self, PyObject *value, void *Py_UNUSED(ignored))
         return -1;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    // gh-133931: To prevent use-after-free from other threads that reference
+    // gh-133980: To prevent use-after-free from other threads that reference
     // the gi_name.
     _PyObject_XSetRefDelayed(&op->gi_name, Py_NewRef(value));
     Py_END_CRITICAL_SECTION();
@@ -732,7 +732,7 @@ static PyObject *
 gen_get_qualname(PyObject *self, void *Py_UNUSED(ignored))
 {
     PyGenObject *op = _PyGen_CAST(self);
-    PyObject *qualname = FT_ATOMIC_LOAD_PTR_RELAXED(op->gi_qualname);
+    PyObject *qualname = FT_ATOMIC_LOAD_PTR_ACQUIRE(op->gi_qualname);
     return Py_NewRef(qualname);
 }
 
@@ -748,7 +748,7 @@ gen_set_qualname(PyObject *self, PyObject *value, void *Py_UNUSED(ignored))
         return -1;
     }
     Py_BEGIN_CRITICAL_SECTION(self);
-    // gh-133931: To prevent use-after-free from other threads that reference
+    // gh-133980: To prevent use-after-free from other threads that reference
     // the gi_qualname.
     _PyObject_XSetRefDelayed(&op->gi_qualname, Py_NewRef(value));
     Py_END_CRITICAL_SECTION();

Objects/obmalloc.c

@@ -1235,7 +1235,7 @@ _PyObject_XDecRefDelayed(PyObject *ptr)
 void
 _PyObject_XSetRefDelayed(PyObject **ptr, PyObject *value)
 {
-    PyObject *old = FT_ATOMIC_LOAD_PTR_ACQUIRE(*ptr);
+    PyObject *old = *ptr;
     FT_ATOMIC_STORE_PTR_RELEASE(*ptr, value);
     if (old == NULL) {
         return;

Objects/typeobject.c

@@ -3967,7 +3967,7 @@ _PyObject_SetDict(PyObject *obj, PyObject *value)
         return -1;
     }
     Py_BEGIN_CRITICAL_SECTION(obj);
-    // gh-133931: To prevent use-after-free from other threads that reference
+    // gh-133980: To prevent use-after-free from other threads that reference
     // the __dict__
     _PyObject_XSetRefDelayed(dictptr, Py_NewRef(value));
     Py_END_CRITICAL_SECTION();