merge 3.2 (#3787e896dbe9)

1 files changed, 7 insertions, 2 deletions

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 50b9723..dae7ff8 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -862,8 +862,13 @@ subtype_clear(PyObject *self)
         assert(base);
     }
 
-    /* There's no need to clear the instance dict (if any);
-       the collector will call its tp_clear handler. */
+    /* Clear the instance dict (if any), to break cycles involving only
+       __dict__ slots (as in the case 'self.__dict__ is self'). */
+    if (type->tp_dictoffset != base->tp_dictoffset) {
+        PyObject **dictptr = _PyObject_GetDictPtr(self);
+        if (dictptr && *dictptr)
+            Py_CLEAR(*dictptr);
+    }
 
     if (baseclear)
         return baseclear(self);