gh-132775: Clean Up Cross-Interpreter Error Handling #135369
Draft
+523
−311
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
neonene
reviewed
Jun 11, 2025
Python/crossinterp.c
Outdated
| }; | ||
| if (override != NULL) { | ||
| err = *override; | ||
| *override = (_PyXI_error_override){0}; |
There was a problem hiding this comment.
test_call passes without the line in my case.
Python/crossinterp.c
Outdated
| if (override == NULL) { | ||
| override = &_override; | ||
| } | ||
| _PyXI_errcode errcode = override->code; |
There was a problem hiding this comment.
For test_running, putting _override.code = errcode; in the _PyXI_ERR_ALREADY_RUNNING case (several lines below) works well for me.
| @@ -1485,6 +1491,10 @@ _PyXI_excinfo_Apply(_PyXI_excinfo *info, PyObject *exctype) | |||
| if (tbexc == NULL) { | |||
| PyErr_Clear(); | |||
| } | |||
| else { | |||
| PyErr_SetObject(exctype, tbexc); | |||
| return; | |||
There was a problem hiding this comment.
tbexc seems to be leaking.
There was a problem hiding this comment.
fixed
Thanks for tracking this down! I don't know how you find these things so quickly. 😄
There was a problem hiding this comment.
Bisection might be effective using Windows binaries? Not so quick, but even I could be a tester to share the burden.
| const char *msg = error->override != NULL | ||
| ? error->override->msg | ||
| : error->uncaught.msg; | ||
| _set_xid_lookup_failure(tstate, NULL, msg, cause); |
There was a problem hiding this comment.
cause seems to be leaking.
|
Hmm, I forgot to mark this as "draft". Sorry about that. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this refactor we:
This change helps simplify several upcoming changes.