Commit623fb87

committed

Move non-isolated immortal objects to the right ref chain.

1 parent884f398 commit623fb87Copy full SHA for 623fb87

File tree

+25

-0

lines changed

+25

-0

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2491,6 +2491,24 @@ _Py_ResurrectReference(PyObject *op)`
`2491`	`2491`
`2492`	`2492`
`2493`	`2493`	`#ifdefPy_TRACE_REFS`
	`2494`	`+void`
	`2495`	`+_Py_NormalizeImmortalReference(PyObject*op)`
	`2496`	`+{`
	`2497`	`+assert(_Py_IsImmortal(op));`
	`2498`	`+PyInterpreterState*interp=_PyInterpreterState_GET();`
	`2499`	`+if (!_PyRefchain_IsTraced(interp,op)) {`
	`2500`	`+return;`
	`2501`	`+ }`
	`2502`	`+PyInterpreterState*main_interp=_PyInterpreterState_Main();`
	`2503`	`+if (interp!=main_interp`
	`2504`	`+&&interp->feature_flags&Py_RTFLAGS_USE_MAIN_OBMALLOC)`
	`2505`	`+ {`
	`2506`	`+assert(!_PyRefchain_IsTraced(main_interp,op));`
	`2507`	`+_PyRefchain_Remove(interp,op);`
	`2508`	`+_PyRefchain_Trace(main_interp,op);`
	`2509`	`+ }`
	`2510`	`+}`
	`2511`	`+`
`2494`	`2512`	`void`
`2495`	`2513`	`_Py_ForgetReference(PyObject*op)`
`2496`	`2514`	`{`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15437,6 +15437,10 @@ _PyUnicode_InternStatic(PyInterpreterState interp, PyObject *p)`
`15437`	`15437`	`assert(*p);`
`15438`	`15438`	`}`
`15439`	`15439`
	`15440`	`+#ifdefPy_TRACE_REFS`
	`15441`	`+externvoid_Py_NormalizeImmortalReference(PyObject*);`
	`15442`	`+#endif`
	`15443`	`+`
`15440`	`15444`	`staticvoid`
`15441`	`15445`	`immortalize_interned(PyObject*s)`
`15442`	`15446`	`{`
`@@ -15452,6 +15456,9 @@ immortalize_interned(PyObject *s)`
`15452`	`15456`	`#endif`
`15453`	`15457`	`_PyUnicode_STATE(s).interned=SSTATE_INTERNED_IMMORTAL;`
`15454`	`15458`	`_Py_SetImmortal(s);`
	`15459`	`+#ifdefPy_TRACE_REFS`
	`15460`	`+_Py_NormalizeImmortalReference(s);`
	`15461`	`+#endif`
`15455`	`15462`	`}`
`15456`	`15463`
`15457`	`15464`	`static/* non-null /PyObject`

Comments

(0)