Merge remote-tracking branch 'upstream/main' into fix/ubsan/iterobject-111178

picnixz · picnixz · commit e5ab45a12eef · 2025-03-23T11:04:30.000+01:00
# Conflicts:
#	Objects/iterobject.c
diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c
@@ -447,7 +447,8 @@ setup_profile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg, PyObject
         tstate->interp->sys_profile_initialized = true;
         if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,
                           sys_profile_start, PyTrace_CALL,
-                          PY_MONITORING_EVENT_PY_START, PY_MONITORING_EVENT_PY_RESUME)) {
+                          PY_MONITORING_EVENT_PY_START,
+                          PY_MONITORING_EVENT_PY_RESUME)) {
             return -1;
         }
         if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,
@@ -457,7 +458,8 @@ setup_profile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg, PyObject
         }
         if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,
                           sys_profile_return, PyTrace_RETURN,
-                          PY_MONITORING_EVENT_PY_RETURN, PY_MONITORING_EVENT_PY_YIELD)) {
+                          PY_MONITORING_EVENT_PY_RETURN,
+                          PY_MONITORING_EVENT_PY_YIELD)) {
             return -1;
         }
         if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,8 @@ setup_profile(PyThreadState tstate, Py_tracefunc func, PyObject arg, PyObject`
`447`	`447`	`tstate->interp->sys_profile_initialized = true;`
`448`	`448`	`if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,`
`449`	`449`	`sys_profile_start, PyTrace_CALL,`
`450`		`- PY_MONITORING_EVENT_PY_START, PY_MONITORING_EVENT_PY_RESUME)) {`
	`450`	`+ PY_MONITORING_EVENT_PY_START,`
	`451`	`+ PY_MONITORING_EVENT_PY_RESUME)) {`
`451`	`452`	`return -1;`
`452`	`453`	`}`
`453`	`454`	`if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,`
`@@ -457,7 +458,8 @@ setup_profile(PyThreadState tstate, Py_tracefunc func, PyObject arg, PyObject`
`457`	`458`	`}`
`458`	`459`	`if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,`
`459`	`460`	`sys_profile_return, PyTrace_RETURN,`
`460`		`- PY_MONITORING_EVENT_PY_RETURN, PY_MONITORING_EVENT_PY_YIELD)) {`
	`461`	`+ PY_MONITORING_EVENT_PY_RETURN,`
	`462`	`+ PY_MONITORING_EVENT_PY_YIELD)) {`
`461`	`463`	`return -1;`
`462`	`464`	`}`
`463`	`465`	`if (set_callbacks(PY_MONITORING_SYS_PROFILE_ID,`