Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-40513: new_interpreter() init GIL earlier
Fix also code to handle init_interp_main() failure.
  • Loading branch information
vstinner committed May 5, 2020
commit edca27a6aa850c1da761a73499c0d6feece3376c
8 changes: 4 additions & 4 deletions Python/pylifecycle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down