Skip to content

gh-132732: Clear errors in JIT optimizer on error #136048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fidget-Spinner merged 7 commits into from
Sep 15, 2025
Merged

gh-132732: Clear errors in JIT optimizer on error #136048

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
267ecf7
Clear errors in JIT optimizer
Fidget-Spinner Jun 27, 2025
34c3f2b
remove ability to return error
Fidget-Spinner Jun 27, 2025
4eb9781
add assert
Fidget-Spinner Jun 27, 2025
412ec63
Update optimizer_analysis.c
Fidget-Spinner Jul 3, 2025
26e2978
Update optimizer_analysis.c
Fidget-Spinner Jul 3, 2025
87505e1
Update comment
Fidget-Spinner Sep 2, 2025
2f256d4
Merge remote-tracking branch 'upstream/main' into clear-error-on-opti…
Fidget-Spinner Sep 2, 2025
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
15 changes: 11 additions & 4 deletions Python/optimizer_analysis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ const uint16_t op_without_decref_inputs[MAX_UOP_ID + 1] = {
[_BINARY_OP_SUBTRACT_FLOAT] = _BINARY_OP_SUBTRACT_FLOAT__NO_DECREF_INPUTS,
};

/* 1 for success, 0 for not ready, cannot error at the moment. */
/* 1 for success, 0 for not ready, clears all possible errors. */
Comment thread
Fidget-Spinner marked this conversation as resolved.
Outdated
static int
optimize_uops(
PyCodeObject *co,
Expand All @@ -471,6 +471,7 @@ optimize_uops(
_PyBloomFilter *dependencies
)
{
assert(!PyErr_Occurred());

JitOptContext context;
JitOptContext *ctx = &context;
Expand All @@ -483,7 +484,7 @@ optimize_uops(
_Py_uop_abstractcontext_init(ctx);
_Py_UOpsAbstractFrame *frame = _Py_uop_frame_new(ctx, co, curr_stacklen, NULL, 0);
if (frame == NULL) {
return -1;
return 0;
}
ctx->curr_frame_depth++;
ctx->frame = frame;
Expand Down Expand Up @@ -557,7 +558,11 @@ optimize_uops(
OPT_ERROR_IN_OPCODE(opcode);
}
_Py_uop_abstractcontext_fini(ctx);
return -1;

if (PyErr_Occurred()) {
PyErr_Clear();
}
Copy link
Copy Markdown
Member

@brandtbucher brandtbucher Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be:

Suggested change
if (PyErr_Occurred()) {
PyErr_Clear();
}
assert(PyErr_Occurred());
PyErr_Clear();

...or are there cases where an error hasn't occurred, but we end up here?

Copy link
Copy Markdown
Member Author

@Fidget-Spinner Fidget-Spinner Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the current code goes to error on some cases where we run out of memory too, but no memoryerror is set.

Copy link
Copy Markdown
Member

@brandtbucher brandtbucher Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, all uses of goto error in these files seem like they have an error set.

return 0;

}

Expand Down Expand Up @@ -704,10 +709,12 @@ _Py_uop_analyze_and_optimize(
_PyFrame_GetCode(frame), buffer,
length, curr_stacklen, dependencies);

if (length <= 0) {
if (length == 0) {
return length;
}

assert(length > 0);

length = remove_unneeded_uops(buffer, length);
assert(length > 0);

Expand Down
Loading