Skip to content

gh-121110: Fix Extension Module Tests Under Py_TRACE_REFS Builds #121503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 3 commits into from
Jul 8, 2024
Merged

gh-121110: Fix Extension Module Tests Under Py_TRACE_REFS Builds #121503

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1bb053
Factor out switch_back_from_main_interpreter().
ericsnowcurrently Jul 8, 2024
6e10c74
Switch to the main interpreter in clear_singlephase_extension().
ericsnowcurrently Jul 8, 2024
f64dbd5
Re-enable the test.
ericsnowcurrently Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Switch to the main interpreter in clear_singlephase_extension().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jul 8, 2024
commit 6e10c74f3c9c25fd8dd7e66788dadf6a4e7b6cc1
12 changes: 12 additions & 0 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2153,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;
}

Expand Down