py/vm: Fix handling of finally-return with complex nested finallys.

Back in 8047340d7532ec32bc9f2d603bffc0bc9544297f basic support was added in
the VM to handle return statements within a finally block.  But it didn't
cover all cases, in particular when some finally's were active and others
inactive when the "return" was executed.

This patch adds further support for return-within-finally by correctly
managing the currently_in_except_block flag, and should fix all cases.  The
main point is that finally handlers remain on the exception stack even if
they are active (currently being executed), and the unwind return code
should only execute those finally's which are inactive.

New tests are added for the cases which now pass.

1 files changed, 103 insertions, 0 deletions

diff --git a/tests/basics/try_finally_return3.py b/tests/basics/try_finally_return3.py
new file mode 100644
index 000000000..a2a06ee97
--- /dev/null
+++ b/tests/basics/try_finally_return3.py
@@ -0,0 +1,103 @@
+# test 'return' within the finally block, with nested finally's
+# only inactive finally's should be executed, and only once
+
+# basic nested finally's, the print should only be executed once
+def f():
+    try:
+        raise TypeError
+    finally:
+        print(1)
+        try:
+            raise ValueError
+        finally:
+            return 42
+print(f())
+
+# similar to above but more nesting
+def f():
+    try:
+        raise ValueError
+    finally:
+        print(1)
+        try:
+            raise TypeError
+        finally:
+            print(2)
+            try:
+                pass
+            finally:
+                return 42
+print(f())
+
+# similar to above but even more nesting
+def f():
+    try:
+        raise ValueError
+    finally:
+        print(1)
+        try:
+            raise TypeError
+        finally:
+            print(2)
+            try:
+                raise Exception
+            finally:
+                print(3)
+                return 42
+print(f())
+
+# upon return some try's are active, some finally's are active, some inactive
+def f():
+    try:
+        try:
+            pass
+        finally:
+            print(2)
+            return 42
+    finally:
+        print(1)
+print(f())
+
+# same as above but raise instead of pass
+def f():
+    try:
+        try:
+            raise ValueError
+        finally:
+            print(2)
+            return 42
+    finally:
+        print(1)
+print(f())
+
+# upon return exception stack holds: active finally, inactive finally, active finally
+def f():
+    try:
+        raise Exception
+    finally:
+        print(1)
+        try:
+            try:
+                pass
+            finally:
+                print(3)
+                return 42
+        finally:
+            print(2)
+print(f())
+
+# same as above but raise instead of pass in innermost try block
+def f():
+    try:
+        raise Exception
+    finally:
+        print(1)
+        try:
+            try:
+                raise Exception
+            finally:
+                print(3)
+                return 42
+        finally:
+            print(2)
+print(f())