bpo-44570: Fix line tracing for forwards jumps to duplicated tails (GH-27068)

markshannon · web-flow · commit da6414f0acf5 · 2021-07-08T19:21:09.000+01:00
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
@@ -1041,6 +1041,41 @@ def func_return():
              (-8, 'return'),
              (1, 'return')])
 
+    def test_flow_converges_on_same_line(self):
+
+        def foo(x):
+            if x:
+                try:
+                    1/(x - 1)
+                except ZeroDivisionError:
+                    pass
+            return x
+
+        def func():
+            for i in range(2):
+                foo(i)
+
+        self.run_and_compare(func,
+            [(0, 'call'),
+             (1, 'line'),
+             (2, 'line'),
+             (-8, 'call'),
+             (-7, 'line'),
+             (-2, 'line'),
+             (-2, 'return'),
+             (1, 'line'),
+             (2, 'line'),
+             (-8, 'call'),
+             (-7, 'line'),
+             (-6, 'line'),
+             (-5, 'line'),
+             (-5, 'exception'),
+             (-4, 'line'),
+             (-3, 'line'),
+             (-2, 'line'),
+             (-2, 'return'),
+             (1, 'line'),
+             (1, 'return')])
 
 class SkipLineEventsTraceTestCase(TraceTestCase):
     """Repeat the trace tests, but with per-line events skipped"""
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -5476,10 +5476,8 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
     int lastline = _PyCode_CheckLineNumber(instr_prev*2, &tstate->trace_info.bounds);
     int line = _PyCode_CheckLineNumber(frame->f_lasti*2, &tstate->trace_info.bounds);
     if (line != -1 && frame->f_trace_lines) {
-        /* Trace backward edges or first instruction of a new line */
-        if (frame->f_lasti < instr_prev ||
-            (line != lastline && frame->f_lasti*2 == tstate->trace_info.bounds.ar_start))
-        {
+        /* Trace backward edges or if line number has changed */
+        if (frame->f_lasti < instr_prev || line != lastline) {
             result = call_trace(func, obj, tstate, frame, PyTrace_LINE, Py_None);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -5476,10 +5476,8 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,`
`5476`	`5476`	`int lastline = _PyCode_CheckLineNumber(instr_prev*2, &tstate->trace_info.bounds);`
`5477`	`5477`	`int line = _PyCode_CheckLineNumber(frame->f_lasti*2, &tstate->trace_info.bounds);`
`5478`	`5478`	`if (line != -1 && frame->f_trace_lines) {`
`5479`		`- /* Trace backward edges or first instruction of a new line */`
`5480`		`- if (frame->f_lasti < instr_prev \|\|`
`5481`		`- (line != lastline && frame->f_lasti*2 == tstate->trace_info.bounds.ar_start))`
`5482`		`- {`
	`5479`	`+ /* Trace backward edges or if line number has changed */`
	`5480`	`+ if (frame->f_lasti < instr_prev \|\| line != lastline) {`
`5483`	`5481`	`result = call_trace(func, obj, tstate, frame, PyTrace_LINE, Py_None);`
`5484`	`5482`	`}`
`5485`	`5483`	`}`