bpo-40513: new_interpreter() init GIL earlier (GH-19942)

vstinner · web-flow · commit 0dd5e7a71899 · 2020-05-05T20:16:37.000+02:00
Fix also code to handle init_interp_main() failure.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1575,19 +1575,19 @@ new_interpreter(PyThreadState **tstate_p, int isolated_subinterpreter)
     }
     interp->config._isolated_interpreter = isolated_subinterpreter;
 
-    status = pycore_interp_init(tstate);
+    status = init_interp_create_gil(tstate);
     if (_PyStatus_EXCEPTION(status)) {
         goto error;
     }
 
-    status = init_interp_main(tstate);
+    status = pycore_interp_init(tstate);
     if (_PyStatus_EXCEPTION(status)) {
         goto error;
     }
 
-    status = init_interp_create_gil(tstate);
+    status = init_interp_main(tstate);
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto error;
     }
 
     *tstate_p = tstate;

Original file line number	Diff line number	Diff line change
`@@ -1575,19 +1575,19 @@ new_interpreter(PyThreadState **tstate_p, int isolated_subinterpreter)`
`1575`	`1575`	`}`
`1576`	`1576`	`interp->config._isolated_interpreter = isolated_subinterpreter;`
`1577`	`1577`
`1578`		`- status = pycore_interp_init(tstate);`
	`1578`	`+ status = init_interp_create_gil(tstate);`
`1579`	`1579`	`if (_PyStatus_EXCEPTION(status)) {`
`1580`	`1580`	`goto error;`
`1581`	`1581`	`}`
`1582`	`1582`
`1583`		`- status = init_interp_main(tstate);`
	`1583`	`+ status = pycore_interp_init(tstate);`
`1584`	`1584`	`if (_PyStatus_EXCEPTION(status)) {`
`1585`	`1585`	`goto error;`
`1586`	`1586`	`}`
`1587`	`1587`
`1588`		`- status = init_interp_create_gil(tstate);`
	`1588`	`+ status = init_interp_main(tstate);`
`1589`	`1589`	`if (_PyStatus_EXCEPTION(status)) {`
`1590`		`- return status;`
	`1590`	`+ goto error;`
`1591`	`1591`	`}`
`1592`	`1592`
`1593`	`1593`	`*tstate_p = tstate;`