Fix jumping out of with blocks in py26 (and added test)

Plus added extra test from master

Author: condut

goto.py

@@ -167,6 +167,7 @@ def _find_labels_and_gotos(code):
     for_exits = []
     excepts = []
     finallies = []
+    last_block = None
 
     opname0 = oparg0 = offset0 = None
     opname1 = oparg1 = offset1 = None # the main one we're looking at each loop iteration
@@ -187,7 +188,7 @@ def replace_block(old_block, new_block):
 
     def pop_block():
         if block_stack:
-            block_stack.pop()
+            return block_stack.pop()
         else:
             _warn_bug("can't pop block")
 
@@ -198,14 +199,14 @@ def pop_block_of_type(type):
                 replace_block(block_stack[-1], (type, block_stack[-1][1]))
             else:
                 _warn_bug("mismatched block type")
-        pop_block()
+        return pop_block()
 
     for opname4, oparg4, offset4 in _parse_instructions(code.co_code, 3):
         endoffset1 = offset2
 
         # check for special offsets
         if for_exits and offset1 == for_exits[-1]:
-            pop_block()
+            last_block = pop_block()
             for_exits.pop()
         if excepts and offset1 == excepts[-1]:
             block_counter += 1
@@ -243,14 +244,17 @@ def pop_block_of_type(type):
             block_stack.append((opname1, block_counter))
             for_exits.append(endoffset1 + oparg1)
         elif opname1 == 'POP_BLOCK':
-            pop_block()
+            last_block = pop_block()
         elif opname1 == 'POP_EXCEPT':
-            pop_block_of_type('<EXCEPT>')
+            last_block = pop_block_of_type('<EXCEPT>')
         elif opname1 == 'END_FINALLY':
             if opname0 != 'JUMP_FORWARD': # hack for dummy end-finally in except block (correct fix would be a jump-aware reading of instructions!)
-                pop_block_of_type('<FINALLY>')
-        elif opname1 in ('WITH_CLEANUP', 'WITH_CLEANUP_START') and _BYTECODE.has_setup_with:
-            block_stack.append(('<FINALLY>', -1)) # temporary block to match END_FINALLY
+                last_block = pop_block_of_type('<FINALLY>')
+        elif opname1 in ('WITH_CLEANUP', 'WITH_CLEANUP_START'):
+            if _BYTECODE.has_setup_with:
+                block_stack.append(('<FINALLY>', -1)) # temporary block to match END_FINALLY
+            else:
+                replace_block(last_block, ('SETUP_WITH',) + last_block[1:]) # python 2.6 - finally was actually with
 
         opname0, oparg0, offset0 = opname1, oparg1, offset1
         opname1, oparg1, offset1 = opname2, oparg2, offset2

test_goto.py

@@ -166,6 +166,39 @@ def func():
 
     assert func() == (1, 0, 0, 0, 0)
 
+def test_large_jumps_in_diff_orders():
+    @with_goto
+    def func():
+        goto .start
+        
+        if NonConstFalse:
+            label .finalle
+            return (i, j, k, m, n, i1, j1, k1, m1, n1, i2, j2, k2, m2, n2)
+        
+        label .start
+        for i in range(2):
+            for j in range(2):
+                for k in range(2):
+                    for m in range(2):
+                        for n in range(2):
+                            goto .end
+        label .end
+        for i1 in range(2):
+            for j1 in range(2):
+                for k1 in range(2):
+                    for m1 in range(2):
+                        for n1 in range(2):
+                            goto .end2
+        label .end2
+        for i2 in range(2):
+            for j2 in range(2):
+                for k2 in range(2):
+                    for m2 in range(2):
+                        for n2 in range(2):
+                            goto .finalle
+
+    assert func() == (0,) * 15
+    
 def test_jump_out_of_nested_11_loops():
     @with_goto
     def func():
@@ -225,6 +258,18 @@ def func():
 
     assert func()== (1, 0)
 
+def test_jump_out_of_with_block_and_survive():
+    @with_goto
+    def func():
+        c = Context()
+        for i in range(3):
+            with c:
+                goto .out
+            label .out
+        return (i, c.data())
+        
+    assert func() == (2, (3, 0))
+    
 def test_jump_out_of_with_block_and_live():
     @with_goto
     def func():