From 9491c67779f2c5295a3b7351657f3a75f75768a7 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 20 Feb 2017 04:08:51 -0500
Subject: [PATCH] More COME_FROM's in Python 3...

Need this to find boundaries of simple if better
---
 test/bytecode_3.5/02_try_finally.pyc          | Bin 0 -> 224 bytes
 .../simple_source/exception/02_try_finally.py |  11 +++++++++++
 uncompyle6/parsers/parse3.py                  |  18 +++++++++++++++---
 uncompyle6/scanners/scanner3.py               |   5 +++++
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 test/bytecode_3.5/02_try_finally.pyc
 create mode 100644 test/simple_source/exception/02_try_finally.py

diff --git a/test/bytecode_3.5/02_try_finally.pyc b/test/bytecode_3.5/02_try_finally.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..83d48bcc556e3b749bfe4be0936a9db274ea1d10
GIT binary patch
literal 224
zcmX|(F$%&!5JmrFMM6*%3-6G|1j``m32ZEkHj89e2qc@ZQ7|6IPFru2)+$%9a!lb2
z|1r#;`P1Rh3t!Lp4&crD*Mz4vt6DK`Q)s}BpnwBG(T_XjKoe}#c@b(4N_2*CK}35)
zh+{t5`n}fSlvXe{Eirwkaiu(^nU=Dl>jSpW+YTSUO7oJ9s<_xh2l|@m@|+eX2<P%_
hYyL9FEURZ_-MEXqP?t<EfAQ6rA*j#oIRg^pvA%WFF9`qu

literal 0
HcmV?d00001

diff --git a/test/simple_source/exception/02_try_finally.py b/test/simple_source/exception/02_try_finally.py
new file mode 100644
index 00000000..cb0adb6a
--- /dev/null
+++ b/test/simple_source/exception/02_try_finally.py
@@ -0,0 +1,11 @@
+# From 2.6.9 cmd.py
+try:
+    if __file__:
+        x = 2
+    x = 3
+finally:
+    if x and __file__:
+        try:
+            x = 1
+        except:
+            pass
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index 37c6bef0..19ac91c7 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -44,6 +44,10 @@ class Python3Parser(PythonParser):
 
         list_for ::= expr FOR_ITER designator list_iter jb_or_c
 
+        # This is seen in PyPy, but possibly it appears on other Python 3?
+        list_if     ::= expr jmp_false list_iter COME_FROM
+        list_if_not ::= expr jmp_true list_iter COME_FROM
+
         jb_or_c ::= JUMP_BACK
         jb_or_c ::= CONTINUE
 
@@ -52,6 +56,9 @@ class Python3Parser(PythonParser):
         setcomp_func ::= BUILD_SET_0 LOAD_FAST FOR_ITER designator comp_iter
                 JUMP_BACK RETURN_VALUE RETURN_LAST
 
+        setcomp_func ::= BUILD_SET_0 LOAD_FAST FOR_ITER designator comp_iter
+                COME_FROM JUMP_BACK RETURN_VALUE RETURN_LAST
+
         comp_body ::= dict_comp_body
         comp_body ::= set_comp_body
         dict_comp_body ::= expr expr MAP_ADD
@@ -113,9 +120,11 @@ class Python3Parser(PythonParser):
         classdefdeco1 ::= expr classdefdeco1 CALL_FUNCTION_1
         classdefdeco1 ::= expr classdefdeco2 CALL_FUNCTION_1
 
-        assert ::= assert_expr jmp_true LOAD_ASSERT RAISE_VARARGS_1
-        assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1
-        assert2 ::= assert_expr jmp_true LOAD_ASSERT expr RAISE_VARARGS_2
+        assert ::= assert_expr jmp_true LOAD_ASSERT RAISE_VARARGS_1 COME_FROM
+        assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1
+                    RAISE_VARARGS_1 COME_FROM
+        assert2 ::= assert_expr jmp_true LOAD_ASSERT expr
+                    RAISE_VARARGS_2 COME_FROM
 
         assert_expr ::= expr
         assert_expr ::= assert_expr_or
@@ -329,6 +338,9 @@ class Python3Parser(PythonParser):
         forelselaststmtl  ::= SETUP_LOOP expr _for designator for_block POP_BLOCK else_suitel
                               COME_FROM_LOOP
 
+        whilestmt         ::= SETUP_LOOP testexpr l_stmts_opt COME_FROM JUMP_BACK POP_BLOCK
+                              COME_FROM_LOOP
+
         whilestmt         ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK
                               COME_FROM_LOOP
 
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
index 2c3af3f5..998f24b4 100644
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -893,6 +893,11 @@ class Scanner3(Scanner):
                 else:
                     self.fixed_jumps[offset] = rtarget
                     self.not_continue.add(pre_rtarget)
+            else:
+                # For now, we'll only tag forward jump.
+                if rtarget > offset:
+                    self.fixed_jumps[offset] = rtarget
+                    self.not_continue.add(pre_rtarget)
 
 
         elif op == self.opc.SETUP_EXCEPT: