Invoke trashcan earlier to avoid hitting C recursion limit during object finalization.

Author: markshannon

Include/cpython/object.h

@@ -471,15 +471,15 @@ PyAPI_FUNC(void) PyTrash_thread_destroy_chain(PyThreadState *tstate);
 #define Py_TRASHCAN_BEGIN(op, dealloc) \
 do { \
     PyThreadState *tstate = PyThreadState_Get(); \
-    if (tstate->c_recursion_remaining <= 0 && Py_TYPE(op)->tp_dealloc == (destructor)dealloc) { \
+    if (tstate->c_recursion_remaining <= 50 && Py_TYPE(op)->tp_dealloc == (destructor)dealloc) { \
         PyTrash_thread_deposit_object(tstate, (PyObject *)op); \
         break; \
     } \
     tstate->c_recursion_remaining--;
     /* The body of the deallocator is here. */
 #define Py_TRASHCAN_END \
     tstate->c_recursion_remaining++; \
-    if (tstate->delete_later && tstate->c_recursion_remaining > 50) { \
+    if (tstate->delete_later && tstate->c_recursion_remaining > 100) { \
         PyTrash_thread_destroy_chain(tstate); \
     } \
 } while (0);

Lib/test/test_ordered_dict.py

@@ -31,8 +31,6 @@ def replaced_module(name, replacement):
 
 class OrderedDictTests:
 
-    maxDiff = None
-
     def test_init(self):
         OrderedDict = self.OrderedDict
         with self.assertRaises(TypeError):

Objects/object.c

@@ -2723,7 +2723,7 @@ PyTrash_thread_destroy_chain(PyThreadState *tstate)
                tups = [(tup,) for tup in tups]
            del tups
     */
-    assert(tstate->c_recursion_remaining > 50);
+    assert(tstate->c_recursion_remaining > 100);
     tstate->c_recursion_remaining--;
     while (tstate->delete_later) {
         PyObject *op = tstate->delete_later;