diff options
| author | Brandt Bucher <brandtbucher@microsoft.com> | 2022-03-04 18:51:27 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 18:51:27 (GMT) |
| commit | c4d2d57eefb1224a12e2e95e4508658dfbf6a7c9 (patch) | |
| tree | 360ccc920f2e6afe516d038338f53f1e75d2136d /Python | |
| parent | cedd2473a9bebe07f3ced4f341cf58a2fef07b03 (diff) | |
| download | cpython-c4d2d57eefb1224a12e2e95e4508658dfbf6a7c9.zip cpython-c4d2d57eefb1224a12e2e95e4508658dfbf6a7c9.tar.gz cpython-c4d2d57eefb1224a12e2e95e4508658dfbf6a7c9.tar.bz2 | |
bpo-46841: Fix BINARY_OP's handling of inline caches (GH-31671)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 5 | ||||
| -rw-r--r-- | Python/specialize.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 67c8b46..0743894 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2028,8 +2028,9 @@ handle_eval_breaker: DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP); DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP); DEOPT_IF(Py_REFCNT(left) != 2, BINARY_OP); - int next_oparg = _Py_OPARG(*next_instr); - assert(_Py_OPCODE(*next_instr) == STORE_FAST); + _Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP]; + int next_oparg = _Py_OPARG(true_next); + assert(_Py_OPCODE(true_next) == STORE_FAST); /* In the common case, there are 2 references to the value * stored in 'variable' when the v = v + ... is performed: one * on the value stack (in 'v') and one still stored in the diff --git a/Python/specialize.c b/Python/specialize.c index 912b9e2..6328f11 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -1951,7 +1951,8 @@ _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, break; } if (PyUnicode_CheckExact(lhs)) { - if (_Py_OPCODE(instr[1]) == STORE_FAST && Py_REFCNT(lhs) == 2) { + _Py_CODEUNIT next = instr[INLINE_CACHE_ENTRIES_BINARY_OP + 1]; + if (_Py_OPCODE(next) == STORE_FAST && Py_REFCNT(lhs) == 2) { *instr = _Py_MAKECODEUNIT(BINARY_OP_INPLACE_ADD_UNICODE, oparg); goto success; |