Add PyInterpreterState._whence.

ericsnowcurrently · ericsnowcurrently · commit 412c59c982d4 · 2024-04-10T17:36:34.000-06:00
diff --git a/Include/internal/pycore_crossinterp.h b/Include/internal/pycore_crossinterp.h
@@ -325,6 +325,7 @@ PyAPI_FUNC(int) _PyXI_HasCapturedException(_PyXI_session *session);
 // Export for _testinternalcapi shared extension
 PyAPI_FUNC(PyInterpreterState *) _PyXI_NewInterpreter(
     PyInterpreterConfig *config,
+    long *maybe_whence,
     PyThreadState **p_tstate,
     PyThreadState **p_save_tstate);
 PyAPI_FUNC(void) _PyXI_EndInterpreter(
diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
@@ -103,7 +103,8 @@ struct _is {
 #define _PyInterpreterState_WHENCE_LEGACY_CAPI 2
 #define _PyInterpreterState_WHENCE_CAPI 3
 #define _PyInterpreterState_WHENCE_XI 4
-#define _PyInterpreterState_WHENCE_MAX 4
+#define _PyInterpreterState_WHENCE_STDLIB 5
+#define _PyInterpreterState_WHENCE_MAX 5
     long _whence;
 
     /* Has been initialized to a safe state.
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -1382,7 +1382,7 @@ static PyInterpreterState *
 _new_interpreter(PyInterpreterConfig *config, long whence)
 {
     if (whence == _PyInterpreterState_WHENCE_XI) {
-        return _PyXI_NewInterpreter(config, NULL, NULL);
+        return _PyXI_NewInterpreter(config, &whence, NULL, NULL);
     }
     PyObject *exc = NULL;
     PyInterpreterState *interp = NULL;
@@ -1598,7 +1598,7 @@ run_in_subinterp_with_config(PyObject *self, PyObject *args, PyObject *kwargs)
 
         /* Create an interpreter, staying switched to it. */
         PyInterpreterState *interp = \
-                _PyXI_NewInterpreter(&config, &tstate, &save_tstate);
+                _PyXI_NewInterpreter(&config, NULL, &tstate, &save_tstate);
         if (interp == NULL) {
             return NULL;
         }
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
@@ -658,21 +658,10 @@ _globals_fini(void)
 
 /* module level code ********************************************************/
 
-#define _PyInterpreterState_WHENCE_STDLIB 5
-
 static long
 get_whence(PyInterpreterState *interp)
 {
-    long whence = _PyInterpreterState_GetWhence(interp);
-    if (whence == _PyInterpreterState_WHENCE_XI) {
-        if (is_owned(&_globals.owned, interp)) {
-            whence = _PyInterpreterState_WHENCE_STDLIB;
-        }
-    }
-    else {
-        assert(!is_owned(&_globals.owned, interp));
-    }
-    return whence;
+    return _PyInterpreterState_GetWhence(interp);
 }
 
 
@@ -786,7 +775,9 @@ interp_create(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    PyInterpreterState *interp = _PyXI_NewInterpreter(&config, NULL, NULL);
+    long whence = _PyInterpreterState_WHENCE_STDLIB;
+    PyInterpreterState *interp = \
+            _PyXI_NewInterpreter(&config, &whence, NULL, NULL);
     if (interp == NULL) {
         // XXX Move the chained exception to interpreters.create()?
         PyObject *exc = PyErr_GetRaisedException();
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
@@ -1822,7 +1822,7 @@ _PyXI_FiniTypes(PyInterpreterState *interp)
 /*************/
 
 PyInterpreterState *
-_PyXI_NewInterpreter(PyInterpreterConfig *config,
+_PyXI_NewInterpreter(PyInterpreterConfig *config, long *maybe_whence,
                      PyThreadState **p_tstate, PyThreadState **p_save_tstate)
 {
     PyThreadState *save_tstate = PyThreadState_Swap(NULL);
@@ -1845,7 +1845,11 @@ _PyXI_NewInterpreter(PyInterpreterConfig *config,
     assert(tstate != NULL);
     PyInterpreterState *interp = PyThreadState_GetInterpreter(tstate);
 
-    _PyInterpreterState_SetWhence(interp, _PyInterpreterState_WHENCE_XI);
+    long whence = _PyInterpreterState_WHENCE_XI;
+    if (maybe_whence != NULL) {
+        whence = *maybe_whence;
+    }
+    _PyInterpreterState_SetWhence(interp, whence);
 
     if (p_tstate != NULL) {
         // We leave the new thread state as the current one.

Original file line number	Diff line number	Diff line change
`@@ -1382,7 +1382,7 @@ static PyInterpreterState *`
`1382`	`1382`	`_new_interpreter(PyInterpreterConfig *config, long whence)`
`1383`	`1383`	`{`
`1384`	`1384`	`if (whence == _PyInterpreterState_WHENCE_XI) {`
`1385`		`- return _PyXI_NewInterpreter(config, NULL, NULL);`
	`1385`	`+ return _PyXI_NewInterpreter(config, &whence, NULL, NULL);`
`1386`	`1386`	`}`
`1387`	`1387`	`PyObject *exc = NULL;`
`1388`	`1388`	`PyInterpreterState *interp = NULL;`
`@@ -1598,7 +1598,7 @@ run_in_subinterp_with_config(PyObject self, PyObject args, PyObject *kwargs)`
`1598`	`1598`
`1599`	`1599`	`/* Create an interpreter, staying switched to it. */`
`1600`	`1600`	`PyInterpreterState *interp = \`
`1601`		`- _PyXI_NewInterpreter(&config, &tstate, &save_tstate);`
	`1601`	`+ _PyXI_NewInterpreter(&config, NULL, &tstate, &save_tstate);`
`1602`	`1602`	`if (interp == NULL) {`
`1603`	`1603`	`return NULL;`
`1604`	`1604`	`}`