Address review comments

Author: markshannon

Include/pythonrun.h

@@ -26,22 +26,22 @@ PyAPI_DATA(int) (*PyOS_InputHook)(void);
  * apart. In practice, that means it must be larger than the C
  * stack consumption of PyEval_EvalDefault */
 #if defined(_Py_ADDRESS_SANITIZER) || defined(_Py_THREAD_SANITIZER)
-#  define PYOS_LOG_STACK_MARGIN 12
+#  define PYOS_LOG2_STACK_MARGIN 12
 #elif defined(Py_DEBUG) && defined(WIN32)
-#  define PYOS_LOG_STACK_MARGIN 12
+#  define PYOS_LOG2_STACK_MARGIN 12
 #elif defined(__wasi__)
    /* Web assembly has two stacks, so this isn't really a size */
-#  define PYOS_LOG_STACK_MARGIN 9
+#  define PYOS_LOG2_STACK_MARGIN 9
 #else
-#  define PYOS_LOG_STACK_MARGIN 11
+#  define PYOS_LOG2_STACK_MARGIN 11
 #endif
-#define PYOS_STACK_MARGIN (1 << PYOS_LOG_STACK_MARGIN)
+#define PYOS_STACK_MARGIN (1 << PYOS_LOG2_STACK_MARGIN)
 #define PYOS_STACK_MARGIN_BYTES (PYOS_STACK_MARGIN * sizeof(void *))
 
 #if SIZEOF_VOID_P == 8
-#define PYOS_STACK_MARGIN_SHIFT (PYOS_LOG_STACK_MARGIN + 3)
+#define PYOS_STACK_MARGIN_SHIFT (PYOS_LOG2_STACK_MARGIN + 3)
 #else
-#define PYOS_STACK_MARGIN_SHIFT (PYOS_LOG_STACK_MARGIN + 2)
+#define PYOS_STACK_MARGIN_SHIFT (PYOS_LOG2_STACK_MARGIN + 2)
 #endif
 
 

Misc/NEWS.d/next/Core_and_Builtins/2025-04-08-17-48-11.gh-issue-124715.xxzQoD.rst

@@ -1,3 +1,3 @@
-Prevents against stack overflows when calling Py_DECREF. Third-party
+Prevents against stack overflows when calling :c:func:`Py_DECREF`. Third-party
 extension objects no longer need to use the "trashcan" mechanism, as
-protection is now built into the ``Py_DECREF`` macro.
+protection is now built into the :c:func:`Py_DECREF` macro.

Objects/capsule.c

@@ -287,9 +287,7 @@ static void
 capsule_dealloc(PyObject *op)
 {
     PyCapsule *capsule = _PyCapsule_CAST(op);
-    if (_PyObject_GC_IS_TRACKED(op)) {
-        PyObject_GC_UnTrack(op);
-    }
+    PyObject_GC_UnTrack(op);
     if (capsule->destructor) {
         capsule->destructor(op);
     }

Objects/object.c

@@ -2912,7 +2912,7 @@ _PyTrash_thread_deposit_object(PyThreadState *tstate, PyObject *op)
 #ifdef Py_GIL_DISABLED
     op->ob_tid = (uintptr_t)tstate->delete_later;
 #else
-    /* Store the pointer in the refcnt field.
+    /* Store the delete_later pointer in the refcnt field.
      * As this object may still be tracked by the GC,
      * it is important that we never store 0 (NULL). */
     uintptr_t refcnt = (uintptr_t)tstate->delete_later;
@@ -2935,6 +2935,8 @@ _PyTrash_thread_destroy_chain(PyThreadState *tstate)
         op->ob_tid = 0;
         _Py_atomic_store_ssize_relaxed(&op->ob_ref_shared, _Py_REF_MERGED);
 #else
+        /* Get the delete_later pointer from the refcnt field.
+         * See _PyTrash_thread_deposit_object(). */
         uintptr_t refcnt = *((uintptr_t*)op);
         tstate->delete_later = (PyObject *)(refcnt - 1);
         op->ob_refcnt = 0;

Objects/typeobject.c

@@ -2654,7 +2654,6 @@ subtype_dealloc(PyObject *self)
     if (type_needs_decref) {
         _Py_DECREF_TYPE(type);
     }
-
 }
 
 static PyTypeObject *solid_base(PyTypeObject *type);