Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-121110: Fix Extension Module Tests Under Py_TRACE_REFS Builds (gh-121517) 

The change in gh-118157 (b2cd54a) should have also updated clear_singlephase_extension() but didn't.  We fix that here.  Note that clear_singlephase_extension() (AKA _PyImport_ClearExtension()) is only used in tests.

(cherry picked from commit 15d48aea02, AKA gh-121503)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-07-08 23:34:58 +02:00 committed by GitHub
parent c128718f30
commit c1891e225e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_import/__init__.py
View File

@ -3053,13 +3053,6 @@ class SinglephaseInitTests(unittest.TestCase):
def test_basic_multiple_interpreters_reset_each(self):
# resetting between each interpreter
if Py_TRACE_REFS:
# It's a Py_TRACE_REFS build.
# This test breaks interpreter isolation a little,
# which causes problems on Py_TRACE_REF builds.
# See gh-121110.
raise unittest.SkipTest('crashes on Py_TRACE_REFS builds')
# At this point:
# * alive in 0 interpreters
# * module def may or may not be loaded already

62
Python/import.c
View File

@ -1532,6 +1532,35 @@ switch_to_main_interpreter(PyThreadState *tstate)
return main_tstate;
}
static void
switch_back_from_main_interpreter(PyThreadState *tstate,
PyThreadState *main_tstate,
PyObject *tempobj)
{
assert(main_tstate == PyThreadState_GET());
assert(_Py_IsMainInterpreter(main_tstate->interp));
assert(tstate->interp != main_tstate->interp);
/* Handle any exceptions, which we cannot propagate directly
* to the subinterpreter. */
if (PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
/* We trust it will be caught again soon. */
PyErr_Clear();
}
else {
/* Printing the exception should be sufficient. */
PyErr_PrintEx(0);
}
}
Py_XDECREF(tempobj);
PyThreadState_Clear(main_tstate);
(void)PyThreadState_Swap(tstate);
PyThreadState_Delete(main_tstate);
}
static PyObject *
get_core_module_dict(PyInterpreterState *interp,
PyObject *name, PyObject *path)
@ -2027,27 +2056,10 @@ main_finally:
/* Switch back to the subinterpreter. */
if (switched) {
assert(main_tstate != tstate);
/* Handle any exceptions, which we cannot propagate directly
* to the subinterpreter. */
if (PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
/* We trust it will be caught again soon. */
PyErr_Clear();
}
else {
/* Printing the exception should be sufficient. */
PyErr_PrintEx(0);
}
}
switch_back_from_main_interpreter(tstate, main_tstate, mod);
/* Any module we got from the init function will have to be
* reloaded in the subinterpreter. */
Py_CLEAR(mod);
PyThreadState_Clear(main_tstate);
(void)PyThreadState_Swap(tstate);
PyThreadState_Delete(main_tstate);
mod = NULL;
}
/*****************************************************************/
@ -2141,9 +2153,21 @@ clear_singlephase_extension(PyInterpreterState *interp,
}
}
/* We must use the main interpreter to clean up the cache.
* See the note in import_run_extension(). */
PyThreadState *tstate = PyThreadState_GET();
PyThreadState *main_tstate = switch_to_main_interpreter(tstate);
if (main_tstate == NULL) {
return -1;
}
/* Clear the cached module def. */
_extensions_cache_delete(path, name);
if (main_tstate != tstate) {
switch_back_from_main_interpreter(tstate, main_tstate, NULL);
}
return 0;
}