Skip to content

gh-117953: Cleanups For fix_up_extension() in import.c #118192

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 11 commits into from
Apr 24, 2024
Merged

gh-117953: Cleanups For fix_up_extension() in import.c #118192

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d87d212
Factor out fix_up_extension_for_interpreter().
ericsnowcurrently Apr 22, 2024
b85c5af
Pass tstate through to fix_up_extension().
ericsnowcurrently Apr 17, 2024
319c461
We already know the def is okay.
ericsnowcurrently Apr 19, 2024
e6ea054
Let the modules arg to fix_up_extension_for_interpreter() be NULL.
ericsnowcurrently Apr 19, 2024
439661f
Always expect a valid modules dict passed to fix_up_extension().
ericsnowcurrently Apr 17, 2024
0d28e0f
Do interpreter fixups after the extension cache, not before.
ericsnowcurrently Apr 23, 2024
abd69f4
Call fix_up_extension_for_interpreter() separately.
ericsnowcurrently Apr 23, 2024
f347f8d
fix_up_extension_for_interpreter() -> finish_singlephase_extension()
ericsnowcurrently Apr 23, 2024
4976089
fix_up_extension() -> update_global_state_for_extension()
ericsnowcurrently Apr 23, 2024
5627ad9
Update the comment about extensions.
ericsnowcurrently Apr 23, 2024
8b4e216
Make sure __file__ is set before m_copy gets populated.
ericsnowcurrently Apr 23, 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
Do interpreter fixups after the extension cache, not before.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 23, 2024
commit 0d28e0faa47c80797fd3323d6c11f2590ec785eb
23 changes: 9 additions & 14 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,6 @@ fix_up_extension_for_interpreter(PyThreadState *tstate,
return 0;
}


static int
fix_up_extension(PyThreadState *tstate, PyObject *mod, PyModuleDef *def,
PyObject *name, PyObject *path,
Expand All @@ -1201,12 +1200,6 @@ fix_up_extension(PyThreadState *tstate, PyObject *mod, PyModuleDef *def,
assert(mod != NULL && PyModule_Check(mod));
assert(def == _PyModule_GetDef(mod));

if (fix_up_extension_for_interpreter(
tstate, mod, def, name, modules) < 0)
{
return -1;
}

// bpo-44050: Extensions and def->m_base.m_copy can be updated
// when the extension module doesn't support sub-interpreters.
if (def->m_size == -1) {
Expand All @@ -1221,11 +1214,11 @@ fix_up_extension(PyThreadState *tstate, PyObject *mod, PyModuleDef *def,
}
PyObject *dict = PyModule_GetDict(mod);
if (dict == NULL) {
goto error;
return -1;
}
def->m_base.m_copy = PyDict_Copy(dict);
if (def->m_base.m_copy == NULL) {
goto error;
return -1;
}
}
}
Expand All @@ -1237,15 +1230,17 @@ fix_up_extension(PyThreadState *tstate, PyObject *mod, PyModuleDef *def,
assert(cached == NULL || cached == def);
#endif
if (_extensions_cache_set(path, name, def) < 0) {
goto error;
return -1;
}
}

return 0;
if (fix_up_extension_for_interpreter(
tstate, mod, def, name, modules) < 0)
{
return -1;
}

error:
PyMapping_DelItem(modules, name);
return -1;
return 0;
}

int
Expand Down