Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d11dcf0f
Commit
d11dcf0f
authored
May 29, 2003
by
Guido van Rossum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
or emptying __dict__, just as we do for classic classes.
parent
c82d1d6b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
Objects/typeobject.c
Objects/typeobject.c
+12
-11
No files found.
Objects/typeobject.c
View file @
d11dcf0f
...
...
@@ -638,13 +638,6 @@ subtype_dealloc(PyObject *self)
--
_PyTrash_delete_nesting
;
_PyObject_GC_TRACK
(
self
);
/* We'll untrack for real later */
/* Maybe call finalizer; exit early if resurrected */
if
(
type
->
tp_del
)
{
type
->
tp_del
(
self
);
if
(
self
->
ob_refcnt
>
0
)
goto
endlabel
;
}
/* Find the nearest base with a different tp_dealloc
and clear slots while we're at it */
base
=
type
;
...
...
@@ -655,6 +648,18 @@ subtype_dealloc(PyObject *self)
assert
(
base
);
}
/* If we added a weaklist, we clear it. Do this *before* calling
the finalizer (__del__) or clearing the instance dict. */
if
(
type
->
tp_weaklistoffset
&&
!
base
->
tp_weaklistoffset
)
PyObject_ClearWeakRefs
(
self
);
/* Maybe call finalizer; exit early if resurrected */
if
(
type
->
tp_del
)
{
type
->
tp_del
(
self
);
if
(
self
->
ob_refcnt
>
0
)
goto
endlabel
;
}
/* If we added a dict, DECREF it */
if
(
type
->
tp_dictoffset
&&
!
base
->
tp_dictoffset
)
{
PyObject
**
dictptr
=
_PyObject_GetDictPtr
(
self
);
...
...
@@ -667,10 +672,6 @@ subtype_dealloc(PyObject *self)
}
}
/* If we added weaklist, we clear it */
if
(
type
->
tp_weaklistoffset
&&
!
base
->
tp_weaklistoffset
)
PyObject_ClearWeakRefs
(
self
);
/* Finalize GC if the base doesn't do GC and we do */
if
(
!
PyType_IS_GC
(
base
))
_PyObject_GC_UNTRACK
(
self
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment