mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

GH-129715: Don't project traces that return to an unknown caller (GH-130024)

Browse source
This commit is contained in:
Brandt Bucher 2025-02-12 10:16:43 -08:00 • committed by GitHub
parent 72f56654d0
commit 11bb08e4ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core_and_Builtins/2025-02-11-22-20-21.gh-issue-129715.mopO8n.rst Normal file
View file

@ -0,0 +1 @@
Improve the experimental JIT's handling of returns to unknown callers.

3
Python/instrumentation.c
View file

@ -185,8 +185,7 @@ is_instrumented(int opcode)
{ {
assert(opcode != 0); assert(opcode != 0);
assert(opcode != RESERVED); assert(opcode != RESERVED);
assert(opcode != ENTER_EXECUTOR); return opcode != ENTER_EXECUTOR && opcode >= MIN_INSTRUMENTED_OPCODE;
return opcode >= MIN_INSTRUMENTED_OPCODE;
} }
#ifndef NDEBUG #ifndef NDEBUG

2
Python/optimizer.c
View file

@ -671,7 +671,7 @@ translate_bytecode_to_trace(
if (trace_stack_depth == 0) { if (trace_stack_depth == 0) {
DPRINTF(2, "Trace stack underflow\n"); DPRINTF(2, "Trace stack underflow\n");
OPT_STAT_INC(trace_stack_underflow); OPT_STAT_INC(trace_stack_underflow);
goto done; return 0;
} }
} }
uint32_t orig_oparg = oparg; // For OPARG_TOP/BOTTOM uint32_t orig_oparg = oparg; // For OPARG_TOP/BOTTOM