mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

GH-113657: Add back missing _SET_IP uops in tier two (GH-113662)

Browse source
This commit is contained in:
Brandt Bucher 2024-01-02 14:09:57 -08:00 • committed by GitHub
parent bab0758ea4
commit b0fb074d59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2024-01-02-11-14-29.gh-issue-113657.CQo9vF.rst Normal file
View file

@ -0,0 +1,2 @@
Fix an issue that caused important instruction pointer updates to be
optimized out of tier two traces.

5
Python/optimizer_analysis.c
View file

@ -4,6 +4,7 @@
#include "pycore_opcode_metadata.h" #include "pycore_opcode_metadata.h"
#include "pycore_opcode_utils.h" #include "pycore_opcode_utils.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_uop_metadata.h"
#include "pycore_uops.h" #include "pycore_uops.h"
#include "pycore_long.h" #include "pycore_long.h"
#include "cpython/optimizer.h" #include "cpython/optimizer.h"
@ -35,13 +36,13 @@ remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size)
break; break;
} }
else { else {
if (OPCODE_HAS_ESCAPES(opcode)) { if (_PyUop_Flags[opcode] & HAS_ESCAPES_FLAG) {
maybe_invalid = true; maybe_invalid = true;
if (last_set_ip >= 0) { if (last_set_ip >= 0) {
buffer[last_set_ip].opcode = _SET_IP; buffer[last_set_ip].opcode = _SET_IP;
} }
} }
if (OPCODE_HAS_ERROR(opcode) || opcode == _PUSH_FRAME) { if ((_PyUop_Flags[opcode] & HAS_ERROR_FLAG) || opcode == _PUSH_FRAME) {
if (last_set_ip >= 0) { if (last_set_ip >= 0) {
buffer[last_set_ip].opcode = _SET_IP; buffer[last_set_ip].opcode = _SET_IP;
} }