Skip to content

Commit 79cb0d9

Browse files
CPython Upgrade Botmeta-codesync[bot]
authored andcommitted
Sync pre-release CPython main branch from GitHub (2026-04-23)
Summary: Imported python/cpython `3.15.0a8+` from upstream rev [`3b93979`](https://www.github.com/python/cpython/commit/3b9397988d1f83740e7d73d17d56767976a583b4) (committed 2026-04-23 04:00:35+00:00). # Commit Info Base: (`3.15.0a8+`) - [`d206d42`](https://www.github.com/python/cpython/commit/d206d42834b2a34aee11b048357131371cf6947d) (commit date: 2026-04-20 23:04:50+00:00) Imported: (`3.15.0a8+`) - [`3b93979`](https://www.github.com/python/cpython/commit/3b9397988d1f83740e7d73d17d56767976a583b4) (commit date: 2026-04-23 04:00:35+00:00) # Noteworthy file changes - Low-signal files (8 added) (NEWS.d, docs, .github) - Other files (1 added, 3 removed) Complete list of added/removed files: https://www.internalfb.com/intern/everpaste/?color=0&handle=GBCzqxbGTuwColcDAOjPp8Jz69Yobr0LAAAz Differential Revision: D102108051 fbshipit-source-id: 56bc870b39bb3707f3d860ae1e20bd5636e4002b
1 parent 26f3095 commit 79cb0d9

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • cinderx/Interpreter/3.15/Includes/Python

cinderx/Interpreter/3.15/Includes/Python/ceval.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ no_tools_for_global_event(PyThreadState *tstate, int event)
367367
static inline bool
368368
no_tools_for_local_event(PyThreadState *tstate, _PyInterpreterFrame *frame, int event)
369369
{
370-
assert(event < _PY_MONITORING_LOCAL_EVENTS);
370+
assert(event < _PY_MONITORING_UNGROUPED_EVENTS);
371371
_PyCoMonitoringData *data = _PyFrame_GetCode(frame)->_co_monitoring;
372372
if (data) {
373373
return data->active_monitors.tools[event] == 0;
@@ -382,7 +382,7 @@ monitor_handled(PyThreadState *tstate,
382382
_PyInterpreterFrame *frame,
383383
_Py_CODEUNIT *instr, PyObject *exc)
384384
{
385-
if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_EXCEPTION_HANDLED)) {
385+
if (no_tools_for_local_event(tstate, frame, PY_MONITORING_EVENT_EXCEPTION_HANDLED)) {
386386
return 0;
387387
}
388388
return _Py_call_instrumentation_arg(tstate, PY_MONITORING_EVENT_EXCEPTION_HANDLED, frame, instr, exc);
@@ -393,7 +393,7 @@ monitor_throw(PyThreadState *tstate,
393393
_PyInterpreterFrame *frame,
394394
_Py_CODEUNIT *instr)
395395
{
396-
if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_PY_THROW)) {
396+
if (no_tools_for_local_event(tstate, frame, PY_MONITORING_EVENT_PY_THROW)) {
397397
return;
398398
}
399399
do_monitor_exc(tstate, frame, instr, PY_MONITORING_EVENT_PY_THROW);
@@ -403,7 +403,7 @@ static void
403403
monitor_reraise(PyThreadState *tstate, _PyInterpreterFrame *frame,
404404
_Py_CODEUNIT *instr)
405405
{
406-
if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_RERAISE)) {
406+
if (no_tools_for_local_event(tstate, frame, PY_MONITORING_EVENT_RERAISE)) {
407407
return;
408408
}
409409
do_monitor_exc(tstate, frame, instr, PY_MONITORING_EVENT_RERAISE);
@@ -431,7 +431,7 @@ monitor_unwind(PyThreadState *tstate,
431431
_PyInterpreterFrame *frame,
432432
_Py_CODEUNIT *instr)
433433
{
434-
if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_PY_UNWIND)) {
434+
if (no_tools_for_local_event(tstate, frame, PY_MONITORING_EVENT_PY_UNWIND)) {
435435
return;
436436
}
437437
do_monitor_exc(tstate, frame, instr, PY_MONITORING_EVENT_PY_UNWIND);

0 commit comments

Comments
 (0)