From b83d6c64edd7346df737a48f87ee41b02c31d2aa Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 29 Oct 2017 23:52:58 -0400
Subject: [PATCH] Python 3.6 control flow bug...

Much more is needed, but it's a start
---
 test/bytecode_3.6/10_extended_arg_loop.pyc    | Bin 0 -> 964 bytes
 .../bug36/10_extended_arg_loop.py             |  49 ++++++++++++++++++
 uncompyle6/parsers/parse36.py                 |   5 ++
 uncompyle6/scanners/scanner3.py               |  16 ++++--
 4 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 test/bytecode_3.6/10_extended_arg_loop.pyc
 create mode 100644 test/simple_source/bug36/10_extended_arg_loop.py

diff --git a/test/bytecode_3.6/10_extended_arg_loop.pyc b/test/bytecode_3.6/10_extended_arg_loop.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ac0dfa517a34e6a041ef6156bfa743374e38fbb0
GIT binary patch
literal 964
zcmYjQ&rcIU6n-;1U6!S-1qlWdlf7ut7zHFT#t>p+IG7kDKmzQ+&C;2+Te?4(nbnrG
zCnS3G-|%1BtEYN09z1Z-H(SKc<h_0Ky?NjJX0o$ctGS=AexJOz0lve`urPjwraW{U
zIO&6rUJwC2dP&-pQ*M1CzQxG_G}#1q!ETG14-RC51+>>_YJ~udh;%uOX;SB8jI|ni
zgj-uM_%%EpA)|aTG6p?sgzRH$WU04%kSueC7z--K_w3%>B@p1{s>B>#U4`B}pSvUk
zX7?Py`F#f3J#*z3f;9y8;ADy|Aog>Lap#tu${)IlE9|ZzsPXxdt!~t;z?gBjcgJM8
z&Ebl!0%|lW99}d1N0kw~hZuo`-u7vnxnGI2XS*Mxf+OGyWe31}tMB@BW8J6E)+JsN
zT)4Zbm&vpv!`OEZg^Z&l)PhgS<fFr`_?PwCQ4*=H;NBDOJdd=ON>2)<L#Zzo_oo2@
z=Q)OgUp%;hqNL+JRNlu(cfC+{@>nEVy}Tygq=M}ye{e_>H5Us@4OPLiP<Q>tjidmf
z0Lwo3uFR7_wPciOpS4mc{Dv5aR<5HIaUJSh`SV!S5=y1ABrsvnO5-?8xbj()=yqYn
zs#DCpdAB2FDvRoVp6DnR(-rGSN*BzuE1Y)J7fBe4g7wlUDcpl09xL7%M7n9?FL>JV
zo&Vb6FiNtaDe;$*RK{UH&^K3!^88AMm$Xqbt8X9|@wnHIRTO7^5vVkmEwOf*cQ&7|
zZL9}kphdz3H>VEzX_`IFh6OVXs#vDB(E(+|Msq18l(;w<FzS%1<&Xx>I<e6l^i|B)
w$ue2NxPb_xHj#Icp~<9qFw(pjX^2a-R5s(5Fi|*Lamw?)*fx8Wd2SB*3mZ-N4gdfE

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug36/10_extended_arg_loop.py b/test/simple_source/bug36/10_extended_arg_loop.py
new file mode 100644
index 00000000..56f873e1
--- /dev/null
+++ b/test/simple_source/bug36/10_extended_arg_loop.py
@@ -0,0 +1,49 @@
+# Bug in 3.6 has to do with parsing jumps where
+# the offset is more than 256 bytes so an EXTENDED_ARG
+# instruction is inserted. find_jump_targets() and
+# detect_control_flow need to be able to work in the presence
+# of EXTENDED_ARG.
+
+# This is a problem theoretically in Python before 3.6
+# but since offsets are very large it isn't noticed.
+
+# Code is simplified from trepan2/trepan/cli.py
+import sys
+def main(dbg=None, sys_argv=list(sys.argv)):
+
+    if sys_argv:
+        mainpyfile = None
+    else:
+        mainpyfile = "10"
+        sys.path[0] = "20"
+
+    while True:
+        try:
+            if dbg.program_sys_argv and mainpyfile:
+                normal_termination = dbg.run_script(mainpyfile)
+                if not normal_termination: break
+            else:
+                dbg.core.execution_status = 'No program'
+                dbg.core.processor.process_commands()
+                pass
+
+            dbg.core.execution_status = 'Terminated'
+            dbg.intf[-1].msg("The program finished - quit or restart")
+            dbg.core.processor.process_commands()
+        except IOError:
+            break
+        except RuntimeError:
+            dbg.core.execution_status = 'Restart requested'
+            if dbg.program_sys_argv:
+                sys.argv = list(dbg.program_sys_argv)
+                part1 = ('Restarting %s with arguments:' %
+                         dbg.core.filename(mainpyfile))
+                args  = ' '.join(dbg.program_sys_argv[1:])
+                dbg.intf[-1].msg(args + part1)
+            else: break
+        except SystemExit:
+            break
+        pass
+
+    sys.argv = 5
+    return
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index afff3fd2..6cb0e85f 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -32,6 +32,11 @@ class Python36Parser(Python35Parser):
 
         call_function ::= expr expr CALL_FUNCTION_EX
         call_function ::= expr expr expr CALL_FUNCTION_EX_KW_1
+
+        # This might be valid in < 3.6
+        and  ::= expr jmp_false expr
+
+        except_suite ::= c_stmts_opt COME_FROM POP_EXCEPT jump_except COME_FROM
         """
 
     def add_custom_rules(self, tokens, customize):
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
index d4c66118..fb531367 100644
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -213,7 +213,7 @@ class Scanner3(Scanner):
         # Get jump targets
         # Format: {target offset: [jump offsets]}
         jump_targets = self.find_jump_targets(show_asm)
-        ## print("XXX2", jump_targets)
+        # print("XXX2", jump_targets)
         last_op_was_break = False
 
         extended_arg = 0
@@ -797,7 +797,7 @@ class Scanner3(Scanner):
                                      'end': prev_op[target]})
                 return
 
-            # The op offset just before the target jump offset is important
+            # The opcode *two* instructions before the target jump offset is important
             # in making a determination of what we have. Save that.
             pre_rtarget = prev_op[rtarget]
 
@@ -966,8 +966,16 @@ class Scanner3(Scanner):
                     self.not_continue.add(pre_rtarget)
             else:
                 # For now, we'll only tag forward jump.
-                if rtarget > offset:
-                    self.fixed_jumps[offset] = rtarget
+                if self.version >= 3.6:
+                    if target > offset:
+                        self.fixed_jumps[offset] = target
+                        pass
+                else:
+                    # FIXME: This is probably a bug in < 3.6 and we should
+                    # instead use the above code. But until we smoke things
+                    # out we'll stick with it.
+                    if rtarget > offset:
+                        self.fixed_jumps[offset] = rtarget
 
         elif op == self.opc.SETUP_EXCEPT:
             target = self.get_target(offset, extended_arg)