Add _PyXI_session_result.

Author: ericsnowcurrently

Include/internal/pycore_crossinterp.h

@@ -350,17 +350,19 @@ typedef struct xi_session _PyXI_session;
 PyAPI_FUNC(_PyXI_session *) _PyXI_NewSession(void);
 PyAPI_FUNC(void) _PyXI_FreeSession(_PyXI_session *);
 
+typedef struct {
+    PyObject *excinfo;
+} _PyXI_session_result;
+
 PyAPI_FUNC(int) _PyXI_Enter(
     _PyXI_session *session,
     PyInterpreterState *interp,
-    PyObject *nsupdates);
-PyAPI_FUNC(void) _PyXI_Exit(_PyXI_session *session);
+    PyObject *nsupdates,
+    _PyXI_session_result *);
+PyAPI_FUNC(int) _PyXI_Exit(_PyXI_session *, _PyXI_session_result *);
 
 PyAPI_FUNC(PyObject *) _PyXI_GetMainNamespace(_PyXI_session *);
 
-PyAPI_FUNC(PyObject *) _PyXI_ApplyCapturedException(_PyXI_session *session);
-PyAPI_FUNC(int) _PyXI_HasCapturedException(_PyXI_session *session);
-
 
 /*************/
 /* other API */

Modules/_interpretersmodule.c

@@ -441,7 +441,7 @@ _run_script(_PyXIData_t *script, PyObject *ns)
 static int
 _exec_in_interpreter(PyThreadState *tstate, PyInterpreterState *interp,
                     _PyXIData_t *script, PyObject *shareables,
-                    PyObject **p_excinfo)
+                    _PyXI_session_result *result)
 {
     assert(!_PyErr_Occurred(tstate));
     _PyXI_session *session = _PyXI_NewSession();
@@ -450,19 +450,9 @@ _exec_in_interpreter(PyThreadState *tstate, PyInterpreterState *interp,
     }
 
     // Prep and switch interpreters.
-    if (_PyXI_Enter(session, interp, shareables) < 0) {
-        if (_PyErr_Occurred(tstate)) {
-            // If an error occured at this step, it means that interp
-            // was not prepared and switched.
-            _PyXI_FreeSession(session);
-            return -1;
-        }
-        // Now, apply the error from another interpreter:
-        PyObject *excinfo = _PyXI_ApplyCapturedException(session);
-        if (excinfo != NULL) {
-            *p_excinfo = excinfo;
-        }
-        assert(PyErr_Occurred());
+    if (_PyXI_Enter(session, interp, shareables, result) < 0) {
+        // If an error occured at this step, it means that interp
+        // was not prepared and switched.
         _PyXI_FreeSession(session);
         return -1;
     }
@@ -476,20 +466,7 @@ _exec_in_interpreter(PyThreadState *tstate, PyInterpreterState *interp,
 
 finally:
     // Clean up and switch back.
-    _PyXI_Exit(session);
-
-    // Propagate any exception out to the caller.
-    assert(!PyErr_Occurred());
-    if (res < 0) {
-        PyObject *excinfo = _PyXI_ApplyCapturedException(session);
-        if (excinfo != NULL) {
-            *p_excinfo = excinfo;
-        }
-    }
-    else {
-        assert(!_PyXI_HasCapturedException(session));
-    }
-
+    (void)_PyXI_Exit(session, result);
     _PyXI_FreeSession(session);
     return res;
 }
@@ -841,21 +818,23 @@ interp_set___main___attrs(PyObject *self, PyObject *args, PyObject *kwargs)
     }
 
     // Prep and switch interpreters, including apply the updates.
-    if (_PyXI_Enter(session, interp, updates) < 0) {
-        if (!PyErr_Occurred()) {
-            _PyXI_ApplyCapturedException(session);
-            assert(PyErr_Occurred());
-        }
-        else {
-            assert(!_PyXI_HasCapturedException(session));
-        }
+    if (_PyXI_Enter(session, interp, updates, NULL) < 0) {
         _PyXI_FreeSession(session);
         return NULL;
     }
 
     // Clean up and switch back.
-    _PyXI_Exit(session);
+    assert(!PyErr_Occurred());
+    int res = _PyXI_Exit(session, NULL);
     _PyXI_FreeSession(session);
+    assert(res == 0);
+    if (res < 0) {
+        // unreachable
+        if (!PyErr_Occurred()) {
+            PyErr_SetString(PyExc_RuntimeError, "unresolved error");
+        }
+        return NULL;
+    }
 
     Py_RETURN_NONE;
 }
@@ -917,12 +896,12 @@ interp_exec(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    PyObject *excinfo = NULL;
-    int res = _exec_in_interpreter(tstate, interp, &xidata, shared, &excinfo);
+    _PyXI_session_result result = {0};
+    int res = _exec_in_interpreter(tstate, interp, &xidata, shared, &result);
     _PyXIData_Release(&xidata);
     if (res < 0) {
-        assert((excinfo == NULL) != (PyErr_Occurred() == NULL));
-        return excinfo;
+        assert((result.excinfo == NULL) != (PyErr_Occurred() == NULL));
+        return result.excinfo;
     }
     Py_RETURN_NONE;
 #undef FUNCNAME
@@ -980,12 +959,12 @@ interp_run_string(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    PyObject *excinfo = NULL;
-    int res = _exec_in_interpreter(tstate, interp, &xidata, shared, &excinfo);
+    _PyXI_session_result result = {0};
+    int res = _exec_in_interpreter(tstate, interp, &xidata, shared, &result);
     _PyXIData_Release(&xidata);
     if (res < 0) {
-        assert((excinfo == NULL) != (PyErr_Occurred() == NULL));
-        return excinfo;
+        assert((result.excinfo == NULL) != (PyErr_Occurred() == NULL));
+        return result.excinfo;
     }
     Py_RETURN_NONE;
 #undef FUNCNAME
@@ -1042,12 +1021,12 @@ interp_run_func(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    PyObject *excinfo = NULL;
-    int res = _exec_in_interpreter(tstate, interp, &xidata, shared, &excinfo);
+    _PyXI_session_result result = {0};
+    int res = _exec_in_interpreter(tstate, interp, &xidata, shared, &result);
     _PyXIData_Release(&xidata);
     if (res < 0) {
-        assert((excinfo == NULL) != (PyErr_Occurred() == NULL));
-        return excinfo;
+        assert((result.excinfo == NULL) != (PyErr_Occurred() == NULL));
+        return result.excinfo;
     }
     Py_RETURN_NONE;
 #undef FUNCNAME
@@ -1103,12 +1082,12 @@ interp_call(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    PyObject *excinfo = NULL;
-    int res = _exec_in_interpreter(tstate, interp, &xidata, NULL, &excinfo);
+    _PyXI_session_result result = {0};
+    int res = _exec_in_interpreter(tstate, interp, &xidata, NULL, &result);
     _PyXIData_Release(&xidata);
     if (res < 0) {
-        assert((excinfo == NULL) != (PyErr_Occurred() == NULL));
-        return excinfo;
+        assert((result.excinfo == NULL) != (PyErr_Occurred() == NULL));
+        return result.excinfo;
     }
     Py_RETURN_NONE;
 #undef FUNCNAME