https://github.com/python/cpython/commit/56a3c5f7674d65023bf84759b797e603f09a93e3
commit: 56a3c5f7674d65023bf84759b797e603f09a93e3
branch: 3.12
author: Tian Gao <[email protected]>
committer: markshannon <[email protected]>
date: 2024-03-14T16:23:15Z
summary:
[3.12] gh-116626: Emit `CALL` events for all `INSTRUMENTED_CALL_FUNCTION_EX
(GH-116732)
Backport of GH-116627
files:
A Misc/NEWS.d/next/Core and
Builtins/2024-03-11-22-05-56.gh-issue-116626.GsyczB.rst
M Lib/test/test_monitoring.py
M Python/bytecodes.c
M Python/generated_cases.c.h
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
index 8eaf581b8dbd7f..383bb65a4cec08 100644
--- a/Lib/test/test_monitoring.py
+++ b/Lib/test/test_monitoring.py
@@ -1743,3 +1743,18 @@ def test_gh108976(self):
sys.monitoring.register_callback(0, E.INSTRUCTION, lambda *args: 0)
sys.monitoring.set_events(0, E.LINE | E.INSTRUCTION)
sys.monitoring.set_events(0, 0)
+
+ def test_call_function_ex(self):
+ def f(a, b):
+ return a + b
+ args = (1, 2)
+
+ call_data = []
+ sys.monitoring.use_tool_id(0, "test")
+ self.addCleanup(sys.monitoring.free_tool_id, 0)
+ sys.monitoring.set_events(0, 0)
+ sys.monitoring.register_callback(0, E.CALL, lambda code, offset,
callable, arg0: call_data.append((callable, arg0)))
+ sys.monitoring.set_events(0, E.CALL)
+ f(*args)
+ sys.monitoring.set_events(0, 0)
+ self.assertEqual(call_data[0], (f, 1))
diff --git a/Misc/NEWS.d/next/Core and
Builtins/2024-03-11-22-05-56.gh-issue-116626.GsyczB.rst b/Misc/NEWS.d/next/Core
and Builtins/2024-03-11-22-05-56.gh-issue-116626.GsyczB.rst
new file mode 100644
index 00000000000000..5b18d04cca64b5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and
Builtins/2024-03-11-22-05-56.gh-issue-116626.GsyczB.rst
@@ -0,0 +1 @@
+Ensure ``INSTRUMENTED_CALL_FUNCTION_EX`` always emits :monitoring-event:`CALL`
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index b957d8895ba9b4..ed8f671f63af1b 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -3207,9 +3207,7 @@ dummy_func(
}
assert(PyTuple_CheckExact(callargs));
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_FUNCTION_EX, func);
- if (opcode == INSTRUMENTED_CALL_FUNCTION_EX &&
- !PyFunction_Check(func) && !PyMethod_Check(func)
- ) {
+ if (opcode == INSTRUMENTED_CALL_FUNCTION_EX) {
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
PyTuple_GET_ITEM(callargs, 0) : Py_None;
int err = _Py_call_instrumentation_2args(
@@ -3217,17 +3215,19 @@ dummy_func(
frame, next_instr-1, func, arg);
if (err) goto error;
result = PyObject_Call(func, callargs, kwargs);
- if (result == NULL) {
- _Py_call_instrumentation_exc2(
- tstate, PY_MONITORING_EVENT_C_RAISE,
- frame, next_instr-1, func, arg);
- }
- else {
- int err = _Py_call_instrumentation_2args(
- tstate, PY_MONITORING_EVENT_C_RETURN,
- frame, next_instr-1, func, arg);
- if (err < 0) {
- Py_CLEAR(result);
+ if (!PyFunction_Check(func) && !PyMethod_Check(func)) {
+ if (result == NULL) {
+ _Py_call_instrumentation_exc2(
+ tstate, PY_MONITORING_EVENT_C_RAISE,
+ frame, next_instr-1, func, arg);
+ }
+ else {
+ int err = _Py_call_instrumentation_2args(
+ tstate, PY_MONITORING_EVENT_C_RETURN,
+ frame, next_instr-1, func, arg);
+ if (err < 0) {
+ Py_CLEAR(result);
+ }
}
}
}
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index ea17c0410bc588..bb75e9a5ba7ba1 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -4433,9 +4433,7 @@
}
assert(PyTuple_CheckExact(callargs));
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_FUNCTION_EX, func);
- if (opcode == INSTRUMENTED_CALL_FUNCTION_EX &&
- !PyFunction_Check(func) && !PyMethod_Check(func)
- ) {
+ if (opcode == INSTRUMENTED_CALL_FUNCTION_EX) {
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
PyTuple_GET_ITEM(callargs, 0) : Py_None;
int err = _Py_call_instrumentation_2args(
@@ -4443,17 +4441,19 @@
frame, next_instr-1, func, arg);
if (err) goto error;
result = PyObject_Call(func, callargs, kwargs);
- if (result == NULL) {
- _Py_call_instrumentation_exc2(
- tstate, PY_MONITORING_EVENT_C_RAISE,
- frame, next_instr-1, func, arg);
- }
- else {
- int err = _Py_call_instrumentation_2args(
- tstate, PY_MONITORING_EVENT_C_RETURN,
- frame, next_instr-1, func, arg);
- if (err < 0) {
- Py_CLEAR(result);
+ if (!PyFunction_Check(func) && !PyMethod_Check(func)) {
+ if (result == NULL) {
+ _Py_call_instrumentation_exc2(
+ tstate, PY_MONITORING_EVENT_C_RAISE,
+ frame, next_instr-1, func, arg);
+ }
+ else {
+ int err = _Py_call_instrumentation_2args(
+ tstate, PY_MONITORING_EVENT_C_RETURN,
+ frame, next_instr-1, func, arg);
+ if (err < 0) {
+ Py_CLEAR(result);
+ }
}
}
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
