py/vm: Fix popping of exception block in UNWIND_JUMP opcode.

dpgeorge · dpgeorge · commit 93bb7dffd2a6 · 2016-02-01T16:07:21.000Z
Fixes issue adafruit#1812.
diff --git a/py/vm.c b/py/vm.c
@@ -674,7 +674,7 @@ unwind_jump:;
                             exc_sp--; // pop exception handler
                             goto dispatch_loop; // run the exception handler
                         }
-                        exc_sp--;
+                        POP_EXC_BLOCK();
                     }
                     ip = (const byte*)MP_OBJ_TO_PTR(POP()); // pop destination ip for jump
                     if (unum != 0) {
diff --git a/tests/basics/try_continue.py b/tests/basics/try_continue.py
@@ -0,0 +1,13 @@
+# test continue within exception handler
+
+def f():
+    lst = [1, 2, 3]
+    for x in lst:
+        print('a', x)
+        try:
+            if x == 2:
+                raise Exception
+        except Exception:
+            continue
+        print('b', x)
+f()

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ unwind_jump:;`
`674`	`674`	`exc_sp--; // pop exception handler`
`675`	`675`	`goto dispatch_loop; // run the exception handler`
`676`	`676`	`}`
`677`		`- exc_sp--;`
	`677`	`+ POP_EXC_BLOCK();`
`678`	`678`	`}`
`679`	`679`	`ip = (const byte*)MP_OBJ_TO_PTR(POP()); // pop destination ip for jump`
`680`	`680`	`if (unum != 0) {`