commit 76605557ea800ae72ec8296b80287ad5fae0e9e7
author Benjamin Peterson <benjamin@python.org> Wed Apr 18 11:14:31 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Wed Apr 18 11:14:31 2012 -0400
tree 33c60140603d58fc9db35b6053962c985ed6563f
parent 33c66301eed865632622fb157bbae4ee35340eb6

SETUP_WITH acts like SETUP_FINALLY for the purposes of setting f_lineno (closes #14612)

Objects/frameobject.c

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index a3476cf..f9e4a0e 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -214,6 +214,7 @@
         case SETUP_LOOP:
         case SETUP_EXCEPT:
         case SETUP_FINALLY:
+        case SETUP_WITH:
             blockstack[blockstack_top++] = addr;
             in_finally[blockstack_top-1] = 0;
             break;
@@ -221,7 +222,7 @@
         case POP_BLOCK:
             assert(blockstack_top > 0);
             setup_op = code[blockstack[blockstack_top-1]];
-            if (setup_op == SETUP_FINALLY) {
+            if (setup_op == SETUP_FINALLY || setup_op == SETUP_WITH) {
                 in_finally[blockstack_top-1] = 1;
             }
             else {
@@ -236,7 +237,7 @@
              * be seeing such an END_FINALLY.) */
             if (blockstack_top > 0) {
                 setup_op = code[blockstack[blockstack_top-1]];
-                if (setup_op == SETUP_FINALLY) {
+                if (setup_op == SETUP_FINALLY || setup_op == SETUP_WITH) {
                     blockstack_top--;
                 }
             }
@@ -298,6 +299,7 @@
         case SETUP_LOOP:
         case SETUP_EXCEPT:
         case SETUP_FINALLY:
+        case SETUP_WITH:
             delta_iblock++;
             break;