diff options
| author | Sjoerd Mullender <sjoerd@acm.org> | 1995-08-28 09:00:43 (GMT) |
|---|---|---|
| committer | Sjoerd Mullender <sjoerd@acm.org> | 1995-08-28 09:00:43 (GMT) |
| commit | 740f357363edce210347aed9e4a869a03e8befec (patch) | |
| tree | 516c4f62a3c3509b997bcc9d097f186768b96f18 /Objects | |
| parent | 24260ec91623c18569225229d5becb852010ae2c (diff) | |
| download | cpython-740f357363edce210347aed9e4a869a03e8befec.zip cpython-740f357363edce210347aed9e4a869a03e8befec.tar.gz cpython-740f357363edce210347aed9e4a869a03e8befec.tar.bz2 | |
Fixed calling of __del__ method with TRACE_REFS defined.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/classobject.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c index 0d0a109..94ed2db 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -347,7 +347,18 @@ instance_dealloc(inst) object *del; /* Call the __del__ method if it exists. First temporarily revive the object and save the current exception, if any. */ +#ifdef TRACE_REFS + /* much too complicated if TRACE_REFS defined */ + extern long ref_total; + inst->ob_type = &Instancetype; + ref_total--; /* compensate for increment in NEWREF */ +#ifdef COUNT_ALLOCS + inst->ob_type->tp_alloc--; /* ditto */ +#endif + NEWREF(inst); +#else INCREF(inst); +#endif /* TRACE_REFS */ err_fetch(&error_type, &error_value, &error_traceback); if ((del = instance_getattr1(inst, "__del__")) != NULL) { object *res = call_object(del, (object *)NULL); @@ -358,8 +369,19 @@ instance_dealloc(inst) /* Restore the saved exception and undo the temporary revival */ err_restore(error_type, error_value, error_traceback); /* Can't use DECREF here, it would cause a recursive call */ - if (--inst->ob_refcnt > 0) + if (--inst->ob_refcnt > 0) { +#ifdef COUNT_ALLOCS + inst->ob_type->tp_free--; +#endif return; /* __del__ added a reference; don't delete now */ + } +#ifdef TRACE_REFS +#ifdef COUNT_ALLOCS + inst->ob_type->tp_free--; /* compensate for increment in UNREF */ +#endif + UNREF(inst); + inst->ob_type = NULL; +#endif /* TRACE_REFS */ DECREF(inst->in_class); XDECREF(inst->in_dict); free((ANY *)inst); |