From 5695c0e0a25da58dfc1d22fc1cd68c2fda0a320d Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Wed, 25 May 2022 11:45:33 +0200
Subject: [PATCH] gh-91924: Fix __lltrace__ for non-UTF-8 stdout encoding
(#93199)
Fix __lltrace__ debug feature if the stdout encoding is not UTF-8.
If the stdout encoding is not UTF-8, the first call to
lltrace_resume_frame() indirectly sets lltrace to 0 when calling
unicode_check_encoding_errors() which calls
encodings.search_function().
---
.../2022-05-25-04-07-22.gh-issue-91924.-UyO4q.rst | 2 ++
Python/ceval.c | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-05-25-04-07-22.gh-issue-91924.-UyO4q.rst
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-25-04-07-22.gh-issue-91924.-UyO4q.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-25-04-07-22.gh-issue-91924.-UyO4q.rst
new file mode 100644
index 00000000000..44866a03cf4
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-05-25-04-07-22.gh-issue-91924.-UyO4q.rst
@@ -0,0 +1,2 @@
+Fix ``__lltrace__`` debug feature if the stdout encoding is not UTF-8. Patch
+by Victor Stinner.
diff --git a/Python/ceval.c b/Python/ceval.c
index 230198b41f6..e82f7343022 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -107,7 +107,6 @@ static PyObject * do_call_core(
PyObject *callargs, PyObject *kwdict, int use_tracing);
#ifdef LLTRACE
-static int lltrace;
static void
dump_stack(_PyInterpreterFrame *frame, PyObject **stack_pointer)
{
@@ -1715,6 +1714,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
uint8_t opcode; /* Current opcode */
int oparg; /* Current opcode argument, if any */
_Py_atomic_int * const eval_breaker = &tstate->interp->ceval.eval_breaker;
+#ifdef LLTRACE
+ int lltrace = 0;
+#endif
_PyCFrame cframe;
CallShape call_shape;
--
GitLab