non-null main on subinterp test

neonene · neonene · commit 836f5cf495a5 · 2024-04-01T21:57:58.000+09:00
diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c
@@ -959,15 +959,18 @@ PyInit__test_shared_gil_only(void)
 static int
 datetime_capi_exec(PyObject *m)
 {
-    _pydatetimeapi_main = NULL;
+    int ismain = PyInterpreterState_Get() == PyInterpreterState_Main();
+    if (ismain) {
+        _pydatetimeapi_main = NULL;
+    }
     PyDateTime_IMPORT;
     if (PyDateTimeAPI == NULL) {
         return -1;
     }
     if (PyDateTimeAPI != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) {
         return -1;
     }
-    if (PyInterpreterState_Get() == PyInterpreterState_Main()) {
+    if (ismain) {
         if (PyDateTimeAPI != _pydatetimeapi_main) {
             return -1;
         }

Original file line number	Diff line number	Diff line change
`@@ -959,15 +959,18 @@ PyInit__test_shared_gil_only(void)`
`959`	`959`	`static int`
`960`	`960`	`datetime_capi_exec(PyObject *m)`
`961`	`961`	`{`
`962`		`- _pydatetimeapi_main = NULL;`
	`962`	`+ int ismain = PyInterpreterState_Get() == PyInterpreterState_Main();`
	`963`	`+ if (ismain) {`
	`964`	`+ _pydatetimeapi_main = NULL;`
	`965`	`+ }`
`963`	`966`	`PyDateTime_IMPORT;`
`964`	`967`	`if (PyDateTimeAPI == NULL) {`
`965`	`968`	`return -1;`
`966`	`969`	`}`
`967`	`970`	`if (PyDateTimeAPI != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) {`
`968`	`971`	`return -1;`
`969`	`972`	`}`
`970`		`- if (PyInterpreterState_Get() == PyInterpreterState_Main()) {`
	`973`	`+ if (ismain) {`
`971`	`974`	`if (PyDateTimeAPI != _pydatetimeapi_main) {`
`972`	`975`	`return -1;`
`973`	`976`	`}`