mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-107265: Fix initialize/remove_tools for ENTER_EXECUTOR case (gh-108482)

Browse source
This commit is contained in:
Dong-hee Na 2023-08-27 12:31:29 +09:00 • committed by GitHub
parent 482fad7f01
commit 6cb48f0495
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Python/instrumentation.c
View file

@ -566,7 +566,13 @@ de_instrument(PyCodeObject *code, int i, int event)
_Py_CODEUNIT *instr = &_PyCode_CODE(code)[i]; _Py_CODEUNIT *instr = &_PyCode_CODE(code)[i];
uint8_t *opcode_ptr = &instr->op.code; uint8_t *opcode_ptr = &instr->op.code;
int opcode = *opcode_ptr; int opcode = *opcode_ptr;
assert(opcode != ENTER_EXECUTOR); if (opcode == ENTER_EXECUTOR) {
int oparg = instr->op.arg;
_PyExecutorObject *exec = code->co_executors->executors[oparg];
opcode_ptr = &exec->vm_data.opcode;
opcode = *opcode_ptr;
assert(opcode != ENTER_EXECUTOR);
}
if (opcode == INSTRUMENTED_LINE) { if (opcode == INSTRUMENTED_LINE) {
opcode_ptr = &code->_co_monitoring->lines[i].original_opcode; opcode_ptr = &code->_co_monitoring->lines[i].original_opcode;
opcode = *opcode_ptr; opcode = *opcode_ptr;
@ -711,7 +717,22 @@ remove_tools(PyCodeObject * code, int offset, int event, int tools)
assert(event != PY_MONITORING_EVENT_LINE); assert(event != PY_MONITORING_EVENT_LINE);
assert(event != PY_MONITORING_EVENT_INSTRUCTION); assert(event != PY_MONITORING_EVENT_INSTRUCTION);
assert(PY_MONITORING_IS_INSTRUMENTED_EVENT(event)); assert(PY_MONITORING_IS_INSTRUMENTED_EVENT(event));
assert(opcode_has_event(_Py_GetBaseOpcode(code, offset))); #ifndef NDEBUG
_Py_CODEUNIT co_instr = _PyCode_CODE(code)[offset];
uint8_t opcode = co_instr.op.code;
uint8_t oparg = co_instr.op.arg;
if (opcode == ENTER_EXECUTOR) {
_PyExecutorObject *exec = code->co_executors->executors[oparg];
assert(exec->vm_data.opcode != ENTER_EXECUTOR);
opcode = _PyOpcode_Deopt[exec->vm_data.opcode];
opcode = exec->vm_data.oparg;
}
else {
opcode = _Py_GetBaseOpcode(code, offset);
}
assert(opcode != ENTER_EXECUTOR);
assert(opcode_has_event(opcode));
#endif
_PyCoMonitoringData *monitoring = code->_co_monitoring; _PyCoMonitoringData *monitoring = code->_co_monitoring;
if (monitoring && monitoring->tools) { if (monitoring && monitoring->tools) {
monitoring->tools[offset] &= ~tools; monitoring->tools[offset] &= ~tools;
@ -1282,9 +1303,16 @@ initialize_tools(PyCodeObject *code)
for (int i = 0; i < code_len; i++) { for (int i = 0; i < code_len; i++) {
_Py_CODEUNIT *instr = &_PyCode_CODE(code)[i]; _Py_CODEUNIT *instr = &_PyCode_CODE(code)[i];
int opcode = instr->op.code; int opcode = instr->op.code;
if (opcode == INSTRUMENTED_LINE) { int oparg = instr->op.arg;
if (opcode == ENTER_EXECUTOR) {
_PyExecutorObject *exec = code->co_executors->executors[oparg];
opcode = exec->vm_data.opcode;
oparg = exec->vm_data.oparg;
}
else if (opcode == INSTRUMENTED_LINE) {
opcode = code->_co_monitoring->lines[i].original_opcode; opcode = code->_co_monitoring->lines[i].original_opcode;
} }
assert(opcode != ENTER_EXECUTOR);
bool instrumented = is_instrumented(opcode); bool instrumented = is_instrumented(opcode);
if (instrumented) { if (instrumented) {
opcode = DE_INSTRUMENT[opcode]; opcode = DE_INSTRUMENT[opcode];
@ -1295,7 +1323,7 @@ initialize_tools(PyCodeObject *code)
if (instrumented) { if (instrumented) {
int8_t event; int8_t event;
if (opcode == RESUME) { if (opcode == RESUME) {
event = instr->op.arg != 0; event = oparg != 0;
} }
else { else {
event = EVENT_FOR_OPCODE[opcode]; event = EVENT_FOR_OPCODE[opcode];