gh-132775: Drop PyUnstable_InterpreterState_GetMainModule() (gh-132978)

We replace it with _Py_GetMainModule(), and add _Py_CheckMainModule(), but both in the internal-only C-API.  We also add _PyImport_GetModulesRef(), which is the equivalent of _PyImport_GetModules(), but which increfs before the lock is released.

This is used by a later change related to pickle and handling __main__.
This commit is contained in:
Eric Snow 2025-04-28 12:46:22 -06:00 committed by GitHub
parent c17238251f
commit fe462f5a91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 53 additions and 20 deletions

View file

@ -1517,16 +1517,6 @@ All of the following functions must be called after :c:func:`Py_Initialize`.
.. versionadded:: 3.8 .. versionadded:: 3.8
.. c:function:: PyObject* PyUnstable_InterpreterState_GetMainModule(PyInterpreterState *interp)
Return a :term:`strong reference` to the ``__main__`` :ref:`module object <moduleobjects>`
for the given interpreter.
The caller must have an :term:`attached thread state`.
.. versionadded:: 3.13
.. c:type:: PyObject* (*_PyFrameEvalFunction)(PyThreadState *tstate, _PyInterpreterFrame *frame, int throwflag) .. c:type:: PyObject* (*_PyFrameEvalFunction)(PyThreadState *tstate, _PyInterpreterFrame *frame, int throwflag)
Type of a frame evaluation function. Type of a frame evaluation function.

View file

@ -8,8 +8,6 @@
PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *); PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int); PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int);
PyAPI_FUNC(PyObject *) PyUnstable_InterpreterState_GetMainModule(PyInterpreterState *);
/* State unique per thread */ /* State unique per thread */
/* Py_tracefunc return -1 when raising an exception, or 0 for success. */ /* Py_tracefunc return -1 when raising an exception, or 0 for success. */

View file

@ -63,6 +63,7 @@ extern void _PyImport_SetDLOpenFlags(PyInterpreterState *interp, int new_val);
extern PyObject * _PyImport_InitModules(PyInterpreterState *interp); extern PyObject * _PyImport_InitModules(PyInterpreterState *interp);
extern PyObject * _PyImport_GetModules(PyInterpreterState *interp); extern PyObject * _PyImport_GetModules(PyInterpreterState *interp);
extern PyObject * _PyImport_GetModulesRef(PyInterpreterState *interp);
extern void _PyImport_ClearModules(PyInterpreterState *interp); extern void _PyImport_ClearModules(PyInterpreterState *interp);
extern void _PyImport_ClearModulesByIndex(PyInterpreterState *interp); extern void _PyImport_ClearModulesByIndex(PyInterpreterState *interp);

View file

@ -283,6 +283,9 @@ PyAPI_FUNC(const PyConfig*) _Py_GetConfig(void);
// See also PyInterpreterState_Get() and _PyInterpreterState_GET(). // See also PyInterpreterState_Get() and _PyInterpreterState_GET().
extern PyInterpreterState* _PyGILState_GetInterpreterStateUnsafe(void); extern PyInterpreterState* _PyGILState_GetInterpreterStateUnsafe(void);
extern PyObject * _Py_GetMainModule(PyThreadState *);
extern int _Py_CheckMainModule(PyObject *module);
#ifndef NDEBUG #ifndef NDEBUG
/* Modern equivalent of assert(PyGILState_Check()) */ /* Modern equivalent of assert(PyGILState_Check()) */
static inline void static inline void

View file

@ -1738,6 +1738,7 @@ _PyXI_Enter(_PyXI_session *session,
// Switch to the requested interpreter (if necessary). // Switch to the requested interpreter (if necessary).
_enter_session(session, interp); _enter_session(session, interp);
PyThreadState *session_tstate = session->init_tstate;
_PyXI_errcode errcode = _PyXI_ERR_UNCAUGHT_EXCEPTION; _PyXI_errcode errcode = _PyXI_ERR_UNCAUGHT_EXCEPTION;
// Ensure this thread owns __main__. // Ensure this thread owns __main__.
@ -1751,8 +1752,8 @@ _PyXI_Enter(_PyXI_session *session,
session->running = 1; session->running = 1;
// Cache __main__.__dict__. // Cache __main__.__dict__.
PyObject *main_mod = PyUnstable_InterpreterState_GetMainModule(interp); PyObject *main_mod = _Py_GetMainModule(session_tstate);
if (main_mod == NULL) { if (_Py_CheckMainModule(main_mod) < 0) {
errcode = _PyXI_ERR_MAIN_NS_FAILURE; errcode = _PyXI_ERR_MAIN_NS_FAILURE;
goto error; goto error;
} }

View file

@ -153,6 +153,20 @@ _PyImport_GetModules(PyInterpreterState *interp)
return MODULES(interp); return MODULES(interp);
} }
PyObject *
_PyImport_GetModulesRef(PyInterpreterState *interp)
{
_PyImport_AcquireLock(interp);
PyObject *modules = MODULES(interp);
if (modules == NULL) {
/* The interpreter hasn't been initialized yet. */
modules = Py_None;
}
Py_INCREF(modules);
_PyImport_ReleaseLock(interp);
return modules;
}
void void
_PyImport_ClearModules(PyInterpreterState *interp) _PyImport_ClearModules(PyInterpreterState *interp)
{ {

View file

@ -1210,14 +1210,40 @@ _PyInterpreterState_SetWhence(PyInterpreterState *interp, long whence)
PyObject * PyObject *
PyUnstable_InterpreterState_GetMainModule(PyInterpreterState *interp) _Py_GetMainModule(PyThreadState *tstate)
{ {
PyObject *modules = _PyImport_GetModules(interp); // We return None to indicate "not found" or "bogus".
if (modules == NULL) { PyObject *modules = _PyImport_GetModulesRef(tstate->interp);
PyErr_SetString(PyExc_RuntimeError, "interpreter not initialized"); if (modules == Py_None) {
return NULL; return modules;
} }
return PyMapping_GetItemString(modules, "__main__"); PyObject *module = NULL;
(void)PyMapping_GetOptionalItem(modules, &_Py_ID(__main__), &module);
Py_DECREF(modules);
if (module == NULL && !PyErr_Occurred()) {
Py_RETURN_NONE;
}
return module;
}
int
_Py_CheckMainModule(PyObject *module)
{
if (module == NULL || module == Py_None) {
if (!PyErr_Occurred()) {
(void)_PyErr_SetModuleNotFoundError(&_Py_ID(__main__));
}
return -1;
}
if (!Py_IS_TYPE(module, &PyModule_Type)) {
/* The __main__ module has been tampered with. */
PyObject *msg = PyUnicode_FromString("invalid __main__ module");
if (msg != NULL) {
(void)PyErr_SetImportError(msg, &_Py_ID(__main__), NULL);
}
return -1;
}
return 0;
} }