mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-45885: Don't un-adapt COMPARE_OP when collecting stats (GH-31516)

Browse source
This commit is contained in:
Brandt Bucher 2022-02-23 03:06:25 -08:00 • committed by GitHub
parent 424023efee
commit 375a56bd40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2022-02-22-15-48-32.bpo-45885.W2vkaI.rst Normal file
View file

@ -0,0 +1 @@
Don't un-adapt :opcode:`COMPARE_OP` when collecting specialization stats.

10
Python/specialize.c
View file

@ -2013,9 +2013,15 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs,
int op = adaptive->original_oparg; int op = adaptive->original_oparg;
int next_opcode = _Py_OPCODE(instr[1]); int next_opcode = _Py_OPCODE(instr[1]);
if (next_opcode != POP_JUMP_IF_FALSE && next_opcode != POP_JUMP_IF_TRUE) { if (next_opcode != POP_JUMP_IF_FALSE && next_opcode != POP_JUMP_IF_TRUE) {
// Can't ever combine, so don't don't bother being adaptive. // Can't ever combine, so don't don't bother being adaptive (unless
SPECIALIZATION_FAIL(COMPARE_OP, SPEC_FAIL_COMPARE_OP_NOT_FOLLOWED_BY_COND_JUMP); // we're collecting stats, where it's more important to get accurate hit
// counts for the unadaptive version and each of the different failure
// types):
#ifndef Py_STATS
*instr = _Py_MAKECODEUNIT(COMPARE_OP, adaptive->original_oparg); *instr = _Py_MAKECODEUNIT(COMPARE_OP, adaptive->original_oparg);
return;
#endif
SPECIALIZATION_FAIL(COMPARE_OP, SPEC_FAIL_COMPARE_OP_NOT_FOLLOWED_BY_COND_JUMP);
goto failure; goto failure;
} }
assert(op <= Py_GE); assert(op <= Py_GE);