summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-08-11 09:58:27 (GMT)
committerGitHub <noreply@github.com>2023-08-11 09:58:27 (GMT)
commitddca26188d7828ecb762213f4b9c15d44b6048cc (patch)
treef672d02823b3e9e0530cd2a201bcf44837aff7d5 /Python
parent7853c769067699c79c0d4fe4967e9d8f8b8b0a5e (diff)
downloadcpython-ddca26188d7828ecb762213f4b9c15d44b6048cc.zip
cpython-ddca26188d7828ecb762213f4b9c15d44b6048cc.tar.gz
cpython-ddca26188d7828ecb762213f4b9c15d44b6048cc.tar.bz2
[3.12] GH-107724: Fix the signature of `PY_THROW` callback functions. (GH-107725) (#107802)
GH-107724: Fix the signature of `PY_THROW` callback functions. (GH-107725) (cherry picked from commit 52fbcf61b5a70993c2d32332ff0ad9f369d968d3) Co-authored-by: Mark Shannon <mark@hotpy.org>
Diffstat (limited to 'Python')
-rw-r--r--Python/ceval.c2
-rw-r--r--Python/instrumentation.c10
-rw-r--r--Python/legacy_tracing.c6
3 files changed, 4 insertions, 14 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 88d6362..c6f54dd 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2099,7 +2099,7 @@ monitor_throw(PyThreadState *tstate,
if (no_tools_for_event(tstate, frame, PY_MONITORING_EVENT_PY_THROW)) {
return;
}
- _Py_call_instrumentation_exc0(tstate, PY_MONITORING_EVENT_PY_THROW, frame, instr);
+ do_monitor_exc(tstate, frame, instr, PY_MONITORING_EVENT_PY_THROW);
}
void
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index 05a53d0..8714324 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -1071,16 +1071,6 @@ call_instrumentation_vector_protected(
}
void
-_Py_call_instrumentation_exc0(
- PyThreadState *tstate, int event,
- _PyInterpreterFrame *frame, _Py_CODEUNIT *instr)
-{
- assert(_PyErr_Occurred(tstate));
- PyObject *args[3] = { NULL, NULL, NULL };
- call_instrumentation_vector_protected(tstate, event, frame, instr, 2, args);
-}
-
-void
_Py_call_instrumentation_exc2(
PyThreadState *tstate, int event,
_PyInterpreterFrame *frame, _Py_CODEUNIT *instr, PyObject *arg0, PyObject *arg1)
diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c
index c1c70f6..b0136d2 100644
--- a/Python/legacy_tracing.c
+++ b/Python/legacy_tracing.c
@@ -163,7 +163,7 @@ sys_trace_func2(
}
static PyObject *
-sys_trace_unwind(
+sys_trace_func3(
_PyLegacyEventHandler *self, PyObject *const *args,
size_t nargsf, PyObject *kwnames
) {
@@ -446,7 +446,7 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
return -1;
}
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
- (vectorcallfunc)sys_trace_func2, PyTrace_CALL,
+ (vectorcallfunc)sys_trace_func3, PyTrace_CALL,
PY_MONITORING_EVENT_PY_THROW, -1)) {
return -1;
}
@@ -471,7 +471,7 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
return -1;
}
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
- (vectorcallfunc)sys_trace_unwind, PyTrace_RETURN,
+ (vectorcallfunc)sys_trace_func3, PyTrace_RETURN,
PY_MONITORING_EVENT_PY_UNWIND, -1)) {
return -1;
}