python · markshannon · Nov 21, 2019 · markshannon · Nov 21, 2019 · markshannon
diff --git a/Python/ceval.c b/Python/ceval.c
diff --git a/Python/ceval.c b/Python/ceval.c
diff --git a/Python/compile.c b/Python/compile.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst

+    Calls the function in position 7 on the stack with the top three
+    items on the stack as arguments.
+    Used to implement the call ``exit(*exc_info())`` when an exception
-    Used to implement the call ``exit(*exc_info())`` when an exception
+    Used to implement the call ``context_manager.__exit__(*exc_info())`` when an exception
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
+} codetracker;
+
+static void
+reset(codetracker *tracker)
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
+    }
+    while (tracker->offset < tracker->lnotab_len &&
+           tracker->addr >= tracker->line_addr + tracker->lnotab[tracker->offset]) {
+        tracker->line_addr = tracker->line_addr + tracker->lnotab[tracker->offset];
-        tracker->line_addr = tracker->line_addr + tracker->lnotab[tracker->offset];
+        tracker->line_addr += tracker->lnotab[tracker->offset];
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
+    return op == SETUP_FINALLY && !is_try_except(op, target_op) && !is_async_for(op, target_op);
+}
+
+#define TRY_EXCEPT 250
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
+            }
+            else if (is_try_finally(op, target_op)) {
+                int addr = tracker->addr;
+                // Skip over duplicate finally blocks if line is after body.
-                // Skip over duplicate finally blocks if line is after body.
+                // Skip over duplicate 'finally' blocks if line is after body.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
-                PyErr_SetString(PyExc_ValueError,
-                                "can't jump into the middle of a block");
-                return -1;
+    /* Validate change of block stack */
-    /* Validate change of block stack */
+    /* Validate change of block stack. */
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
-            }
-            break;
-        }
+    /* Check for illegal jumps out of finally or except blocks */
-    /* Check for illegal jumps out of finally or except blocks */
+    /* Check for illegal jumps out of finally or except blocks. */
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
-        {
-            /* Pop the exit function. */
-            delta++;
+    /* Unwind block stack */
-    /* Unwind block stack */
+    /* Unwind block stack. */
diff --git a/Python/compile.c b/Python/compile.c
@@ -2587,7 +2620,7 @@ compiler_for(struct compiler *c, stmt_ty s)
    if (start == NULL || end == NULL || cleanup == NULL)
        return 0;

-    if (!compiler_push_fblock(c, FOR_LOOP, start, end))
+    if (!compiler_push_fblock(c, FOR_LOOP, start, end, NULL))
diff --git a/Python/compile.c b/Python/compile.c
-    compiler_use_next_block(c, finally);
-    if (!compiler_push_fblock(c, FINALLY_END, finally, NULL))
+
+    /* End of body; start the cleanup */
-    /* End of body; start the cleanup */
+    /* End of body; start the cleanup. */
	Used to implement the call ``exit(*exc_info())`` when an exception
	Used to implement the call ``context_manager.__exit__(*exc_info())`` when an exception
	tracker->line_addr = tracker->line_addr + tracker->lnotab[tracker->offset];
	tracker->line_addr += tracker->lnotab[tracker->offset];
	// Skip over duplicate finally blocks if line is after body.
	// Skip over duplicate 'finally' blocks if line is after body.
	/* Validate change of block stack */
	/* Validate change of block stack. */
	/* Check for illegal jumps out of finally or except blocks */
	/* Check for illegal jumps out of finally or except blocks. */
	/* End of body; start the cleanup */
	/* End of body; start the cleanup. */