From 21b5af9072a43275d52737a68d5cda2fab47f730 Mon Sep 17 00:00:00 2001
From: Brandt Bucher <brandtbucher@microsoft.com>
Date: Tue, 20 Sep 2022 11:42:06 -0700
Subject: [3.10] GH-96864: Check for error between line and opcode events
 (GH-96969)

(cherry picked from commit c10e33ac119d96c4d88d5ae8b59e65a76ae0ad3c)
---
 Python/ceval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Python/ceval.c')

diff --git a/Python/ceval.c b/Python/ceval.c
index df4b9a84a2..9719177e19 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5512,7 +5512,7 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
         }
     }
     /* Always emit an opcode event if we're tracing all opcodes. */
-    if (frame->f_trace_opcodes) {
+    if (frame->f_trace_opcodes && result == 0) {
         result = call_trace(func, obj, tstate, frame, trace_info, PyTrace_OPCODE, Py_None);
     }
     return result;
-- 
cgit v1.2.1