diff options
| author | Mark Shannon <mark@hotpy.org> | 2024-01-11 18:20:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-11 18:20:42 +0000 |
| commit | 55824d01f866d1fa0f21996d897fba0e07d09ac8 (patch) | |
| tree | aeaec720d5d2df05fdad8389a542debfdb4b5032 /Python/generated_cases.c.h | |
| parent | 0d8fec79ca30e67870752c6ad4e299f591271e69 (diff) | |
| download | cpython-55824d01f866d1fa0f21996d897fba0e07d09ac8.tar.gz cpython-55824d01f866d1fa0f21996d897fba0e07d09ac8.zip | |
GH-113853: Guarantee forward progress in executors (GH-113854)
Diffstat (limited to 'Python/generated_cases.c.h')
| -rw-r--r-- | Python/generated_cases.c.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index e693e3e2560..1e995b62a72 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -2384,10 +2384,12 @@ GOTO_TIER_TWO(); } else { - code->co_executors->executors[oparg & 255] = NULL; + /* ENTER_EXECUTOR will be the first code unit of the instruction */ + assert(oparg < 256); + code->co_executors->executors[oparg] = NULL; opcode = this_instr->op.code = executor->vm_data.opcode; this_instr->op.arg = executor->vm_data.oparg; - oparg = (oparg & (~255)) | executor->vm_data.oparg; + oparg = executor->vm_data.oparg; Py_DECREF(executor); next_instr = this_instr; DISPATCH_GOTO(); @@ -3289,12 +3291,18 @@ // Double-check that the opcode isn't instrumented or something: if (ucounter > threshold && this_instr->op.code == JUMP_BACKWARD) { OPT_STAT_INC(attempts); - int optimized = _PyOptimizer_BackEdge(frame, this_instr, next_instr, stack_pointer); + _Py_CODEUNIT *start = this_instr; + /* Back up over EXTENDED_ARGs so optimizer sees the whole instruction */ + while (oparg > 255) { + oparg >>= 8; + start--; + } + int optimized = _PyOptimizer_Optimize(frame, start, stack_pointer); if (optimized < 0) goto error; if (optimized) { // Rewind and enter the executor: - assert(this_instr->op.code == ENTER_EXECUTOR); - next_instr = this_instr; + assert(start->op.code == ENTER_EXECUTOR); + next_instr = start; this_instr[1].cache &= ((1 << OPTIMIZER_BITS_IN_COUNTER) - 1); } else { |