Fix case with simple finally

Author: pablogsal

Lib/test/test_sys_settrace.py

@@ -505,6 +505,27 @@ def func():
              (9, 'line'),
              (9, 'return')])
 
+    def test_19_except_with_finally(self):
+        def func():
+            try:
+                try:
+                    raise Exception
+                finally:
+                    y = "Something"
+            except Exception:
+                b = 23
+
+        self.run_and_compare(func,
+            [(0, 'call'),
+             (1, 'line'),
+             (2, 'line'),
+             (3, 'line'),
+             (3, 'exception'),
+             (5, 'line'),
+             (6, 'line'),
+             (7, 'line'),
+             (7, 'return')])
+
 
 class SkipLineEventsTraceTestCase(TraceTestCase):
     """Repeat the trace tests, but with per-line events skipped"""

Python/ceval.c

@@ -3611,7 +3611,8 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 PUSH(exc);
                 JUMPTO(handler);
                 if (_Py_TracingPossible(ceval) &&
-                    (f->f_lasti < instr_lb || f->f_lasti >= instr_ub)) {
+                    ((f->f_lasti < instr_lb || f->f_lasti >= instr_ub) ||
+                    !(f->f_lasti == instr_lb || f->f_lasti < instr_prev))) {
                     /* Make sure that we trace line after exception */
                     instr_prev = INT_MAX;
                 }