8000 gh-132732: Clear errors in JIT optimizer on error by Fidget-Spinner · Pull Request #136048 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

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

New issue 8000

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
3 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
File filter

Filter by extension

Filter by extension
10000
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. */
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();
}
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
0