Update test so that RNG is in _Py_Dealloc

colesbury · colesbury · commit 7c86a25034ce · 2025-06-17T17:07:08.000Z
diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h
@@ -210,6 +210,7 @@ struct _ts {
     _PyRemoteDebuggerSupport remote_debugger_support;
 
     uint64_t prng;
+    Py_ssize_t ob_dealloc_depth;
 };
 
 /* other API */
diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h
@@ -325,16 +325,6 @@ _Py_RecursionLimit_GetMargin(PyThreadState *tstate)
     _PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate;
     assert(_tstate->c_stack_hard_limit != 0);
     intptr_t here_addr = _Py_get_machine_stack_pointer();
-
-    // splitmix64 from https://prng.di.unimi.it/splitmix64.c
-    uint64_t z = (tstate->prng += 0x9e3779b97f4a7c15);
-    z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9;
-    z = (z ^ (z >> 27)) * 0x94d049bb133111eb;
-    uint64_t r = z ^ (z >> 31);
-    if ((r & 0xFF) < 2) { // 2/256 chance = ~ 0.8% chance
-        return 1;
-    }
-
     return Py_ARITHMETIC_RIGHT_SHIFT(intptr_t, here_addr - (intptr_t)_tstate->c_stack_soft_limit, PYOS_STACK_MARGIN_SHIFT);
 }
 
diff --git a/Objects/object.c b/Objects/object.c
@@ -3155,6 +3155,16 @@ _PyObject_AssertFailed(PyObject *obj, const char *expr, const char *msg,
     Py_FatalError("_PyObject_AssertFailed");
 }
 
+static int
+should_randomly_deposit_object(PyThreadState *tstate)
+{
+    // splitmix64 from https://prng.di.unimi.it/splitmix64.c
+    uint64_t z = (tstate->prng += 0x9e3779b97f4a7c15);
+    z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9;
+    z = (z ^ (z >> 27)) * 0x94d049bb133111eb;
+    uint64_t r = z ^ (z >> 31);
+    return (r & 0xFF) < 2;
+}
 
 /*
 When deallocating a container object, it's possible to trigger an unbounded
@@ -3170,7 +3180,7 @@ _Py_Dealloc(PyObject *op)
     destructor dealloc = type->tp_dealloc;
     PyThreadState *tstate = _PyThreadState_GET();
     intptr_t margin = _Py_RecursionLimit_GetMargin(tstate);
-    if (margin < 2) {
+    if (margin < 2 || (tstate->ob_dealloc_depth > 0 && should_randomly_deposit_object(tstate))) {
         _PyTrash_thread_deposit_object(tstate, (PyObject *)op);
         return;
     }
@@ -3192,7 +3202,9 @@ _Py_Dealloc(PyObject *op)
     _Py_ForgetReference(op);
 #endif
     _PyReftracerTrack(op, PyRefTracer_DESTROY);
+    tstate->ob_dealloc_depth++;
     (*dealloc)(op);
+    tstate->ob_dealloc_depth--;
 
 #ifdef Py_DEBUG
     // gh-89373: The tp_dealloc function must leave the current exception
