Oct 9, 2024 · Oct 1, 2024 · Oct 1, 2024 · Oct 1, 2024 · Oct 1, 2024 · Oct 1, 2024
diff --git a/Objects/object.c b/Objects/object.c


 #ifdef Py_TRACE_REFS
 /* Make sure the ref is associated with the right interpreter.
 * This only needs special attention for heap-allocated objects
 * that have been immortalized, and only when the object might
 * outlive the interpreter where it was created.  That means the
 * object was necessarily created using a global allocator
 * (i.e. from the main interpreter).  Thus in that specific case
 * we move the object over to the main interpreter's refchain.
 *
 * This was added for the sake of the immortal interned strings,
 * where legacy subinterpreters share the main interpreter's
 * interned dict (and allocator), and therefore the strings can
 * outlive the subinterpreter.
 *
 * It may make sense to fold this into _Py_SetImmortalUntracked(),
 * but that requires further investigation.  In the meantime, it is
 * up to the caller to know if this is needed.  There should be
 * very few cases.
 */
 void
 _Py_NormalizeImmortalReference(PyObject *op)
 {
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
    _PyUnicode_STATE(s).interned = SSTATE_INTERNED_IMMORTAL;
    _Py_SetImmortal(s);
 #ifdef Py_TRACE_REFS
    /* Make sure the ref is associated with the right interpreter. */
    _Py_NormalizeImmortalReference(s);
 #endif
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2491,6 +2491,24 @@ _Py_ResurrectReference(PyObject *op)


		#ifdef Py_TRACE_REFS
		/* Make sure the ref is associated with the right interpreter.
		* This only needs special attention for heap-allocated objects
		* that have been immortalized, and only when the object might
		* outlive the interpreter where it was created. That means the
		* object was necessarily created using a global allocator
		* (i.e. from the main interpreter). Thus in that specific case
		* we move the object over to the main interpreter's refchain.
		*
		* This was added for the sake of the immortal interned strings,
		* where legacy subinterpreters share the main interpreter's
		* interned dict (and allocator), and therefore the strings can
		* outlive the subinterpreter.
		*
		* It may make sense to fold this into _Py_SetImmortalUntracked(),
		* but that requires further investigation. In the meantime, it is
		* up to the caller to know if this is needed. There should be
		* very few cases.
		*/
		void
		_Py_NormalizeImmortalReference(PyObject *op)
Copy link Member naschemeOct 1, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Having some comment here would be helpful. Otherwise this function looks quite mysterious. Copy link MemberAuthor ericsnowcurrentlyOct 1, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. done! nascheme and gpshead reacted with thumbs up emoji
		{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15457,6 +15457,7 @@ immortalize_interned(PyObject *s)
		_PyUnicode_STATE(s).interned = SSTATE_INTERNED_IMMORTAL;
		_Py_SetImmortal(s);
		#ifdef Py_TRACE_REFS
		/* Make sure the ref is associated with the right interpreter. */
		_Py_NormalizeImmortalReference(s);
		#endif
		}
Expand Down