Call PyObject_GC_UnTrack before putting an object on the list of trash.

nascheme · nascheme · commit 9723ae213e02 · 2002-03-29T03:07:29.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@26012 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -35,8 +35,8 @@ tb_getattr(tracebackobject *tb, char *name)
 static void
 tb_dealloc(tracebackobject *tb)
 {
+	PyObject_GC_UnTrack(tb);
 	Py_TRASHCAN_SAFE_BEGIN(tb)
-	_PyObject_GC_UNTRACK(tb);
 	Py_XDECREF(tb->tb_next);
 	Py_XDECREF(tb->tb_frame);
 	PyObject_GC_Del(tb);
@@ -120,7 +120,7 @@ newtracebackobject(tracebackobject *next, PyFrameObject *frame, int lasti,
 		tb->tb_frame = frame;
 		tb->tb_lasti = lasti;
 		tb->tb_lineno = lineno;
-		_PyObject_GC_TRACK(tb);
+		PyObject_GC_Track(tb);
 	}
 	return tb;
 }

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ tb_getattr(tracebackobject tb, char name)`
`35`	`35`	`static void`
`36`	`36`	`tb_dealloc(tracebackobject *tb)`
`37`	`37`	`{`
	`38`	`+ PyObject_GC_UnTrack(tb);`
`38`	`39`	`Py_TRASHCAN_SAFE_BEGIN(tb)`
`39`		`- _PyObject_GC_UNTRACK(tb);`
`40`	`40`	`Py_XDECREF(tb->tb_next);`
`41`	`41`	`Py_XDECREF(tb->tb_frame);`
`42`	`42`	`PyObject_GC_Del(tb);`
`@@ -120,7 +120,7 @@ newtracebackobject(tracebackobject next, PyFrameObject frame, int lasti,`
`120`	`120`	`tb->tb_frame = frame;`
`121`	`121`	`tb->tb_lasti = lasti;`
`122`	`122`	`tb->tb_lineno = lineno;`
`123`		`- _PyObject_GC_TRACK(tb);`
	`123`	`+ PyObject_GC_Track(tb);`
`124`	`124`	`}`
`125`	`125`	`return tb;`
`126`	`126`	`}`