diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-07-24-17-30-58.gh-issue-136870.ncx82J.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-07-24-17-30-58.gh-issue-136870.ncx82J.rst
new file mode 100644
index 00000000000000..7552dc69169b67
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-07-24-17-30-58.gh-issue-136870.ncx82J.rst
@@ -0,0 +1 @@
+Fix data races while de-instrumenting bytecode of code objects running concurrently in threads.
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index 5b26a078085806..0a816a9c3af154 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -1190,9 +1190,10 @@ call_instrumentation_vector(
break;
}
else {
- LOCK_CODE(code);
+ PyInterpreterState *interp = tstate->interp;
+ _PyEval_StopTheWorld(interp);
remove_tools(code, offset, event, 1 << tool);
- UNLOCK_CODE();
+ _PyEval_StartTheWorld(interp);
}
}
}
@@ -1381,9 +1382,10 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
}
else {
/* DISABLE */
- LOCK_CODE(code);
+ PyInterpreterState *interp = tstate->interp;
+ _PyEval_StopTheWorld(interp);
remove_line_tools(code, i, 1 << tool);
- UNLOCK_CODE();
+ _PyEval_StartTheWorld(interp);
}
} while (tools);
Py_DECREF(line_obj);
@@ -1438,9 +1440,10 @@ _Py_call_instrumentation_instruction(PyThreadState *tstate, _PyInterpreterFrame*
}
else {
/* DISABLE */
- LOCK_CODE(code);
+ PyInterpreterState *interp = tstate->interp;
+ _PyEval_StopTheWorld(interp);
remove_per_instruction_tools(code, offset, 1 << tool);
- UNLOCK_CODE();
+ _PyEval_StartTheWorld(interp);
}
}
Py_DECREF(offset_obj);
@@ -2995,9 +2998,10 @@ branch_handler_vectorcall(
// Orphaned NOT_TAKEN -- Jump removed by the compiler
return res;
}
- LOCK_CODE(code);
+ PyInterpreterState *interp = _PyInterpreterState_GET();
+ _PyEval_StopTheWorld(interp);
remove_tools(code, offset, other_event, 1 << self->tool_id);
- UNLOCK_CODE();
+ _PyEval_StartTheWorld(interp);
}
return res;
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy