From 7d110f17bc307593db0ca202ca2ce87ed6cf3c20 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 29 Mar 2018 17:21:22 -0400
Subject: [PATCH] 3.6 decompilation problems

---
 test/bytecode_3.5_run/04_call_function.pyc   | Bin 1247 -> 1588 bytes
 test/bytecode_3.6_run/04_call_function.pyc   | Bin 1375 -> 1514 bytes
 test/simple_source/bug35/04_call_function.py |   4 ++++
 uncompyle6/parsers/parse35.py                |   2 +-
 uncompyle6/parsers/parse36.py                |   3 ++-
 uncompyle6/semantics/make_function.py        |   5 ++++-
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/bytecode_3.5_run/04_call_function.pyc b/test/bytecode_3.5_run/04_call_function.pyc
index 21f59e97b8e5fd33e8731467d20e32855d426c61..99d98c11cb9f4bdaecd02e447aa17f407fba122c 100644
GIT binary patch
delta 425
zcmYjMyGjF55S_bsABpao7^6mv1PKURrSSu-6fDw2Ew)+W-Z5xmR%SPnKp=&dT1dV@
zuoV<5e`FgAf5f>P1uvZ8+<BZc^HqFvo131ugr}cD(*pR0f6r!qz(_uxnvX3H)C#B)
zs50Dx2$n&uf&x$#P-~#7pw>BW1g=hY{EgT57dgw!K^*l@BFQR(!4BXsju=UU!&Jc3
zfT;<Ji3G(Q;0oXl;6WH2U$$wB+X5M-W1mfXn1)e2OmUq07HQecxEKcIbaI1HtT2oz
z)I6V}naK^L4Hu!H`>nI?V1zBEi7tbv2-?;K*~dxd5Z)psco^xL!T8%f-&s%O_lb5c
z=}W3}igq|;#mf|_dp^MA*K=2w7N*xoJ>2JiqBTK~zTWrdp?Pd;cWTU^&AnQcX~}Wz
Rx^RVS)}(7YR;f_2egOCYOcnqD

delta 85
zcmdnObDvXLoR^m?{rZk50Tu>^#|%h-8OU}3;^N+k%Dt=%48fYb8}F}RX42%Iyo}Xr
c@-J2;5dokyKRXYb3?mOC4~qmd4;wox0MK;~%m4rY

diff --git a/test/bytecode_3.6_run/04_call_function.pyc b/test/bytecode_3.6_run/04_call_function.pyc
index da2cb65f38c91b1fa02274a7946626acfaa75c7c..d3d7fb9f130c27192b209d530e3ffa8a915a1b25 100644
GIT binary patch
delta 236
zcmcc5^@>}=n3tC;HFR&3GAjeaV+JI^3}ib1ad8unND-Z=ktdQOm?AWXDMdI%q=hMp
zCxs!HK~rqwEK8PpH%+En%-N}xx7dqP%TkMqQ<H&u7?^+<WC|k?y904C3y=WoV)QFw
z2eLJpi)4UQkt~q7#hF=>T9lZSlUfXxgAg1b8P?p?qV!Y~AhQ@`Bm-lSJdo66^wZ=m
r;smmaCf{T6WR#z*%&I0K0_1bCbFhgpaxikR2rzT7v9a=S@Ua2_t$iqI

delta 94
zcmaFGeV<Fin3tDJ=;O|)i!2Nbj~S2vGmz~7#KlEGB1LebMjlHrgQn2NRhBHQnv8y$
kJd<Ns{U>i=RT2{dD&S)0U=v~FVB}yCVCG<BW98uh0AzX(DgXcg

diff --git a/test/simple_source/bug35/04_call_function.py b/test/simple_source/bug35/04_call_function.py
index 9242022e..b3a7adca 100644
--- a/test/simple_source/bug35/04_call_function.py
+++ b/test/simple_source/bug35/04_call_function.py
@@ -47,3 +47,7 @@ def __init__(self, cnf={}):
 def Value(self, fn, typecode_or_type, *args, lock=True):
     return fn(typecode_or_type, *args, lock=lock,
               ctx=self.get_context())
+
+# From 3.6.4 heapq.py
+def merge(*iterables, key=None, reverse=False):
+    return
diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
index 5358d464..382fb489 100644
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -33,7 +33,7 @@ class Python35Parser(Python34Parser):
         #     ...
         # the end of the if will jump back to the loop and there will be a COME_FROM
         # after the jump
-        l_stmts ::= lastl_stmt COME_FROM l_stmts
+        l_stmts ::= lastl_stmt come_froms l_stmts
 
         # Python 3.5+ Await statement
         expr       ::= await_expr
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index 17d0ef56..dde2b0aa 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -49,8 +49,9 @@ class Python36Parser(Python35Parser):
         whilestmt       ::= SETUP_LOOP testexpr l_stmts_opt
                             JUMP_BACK come_froms POP_BLOCK COME_FROM_LOOP
 
-        # This might be valid in < 3.6
+        # A COME_FROM is dropped off because of JUMP-to-JUMP optimization
         and  ::= expr jmp_false expr
+        and  ::= expr jmp_false expr jmp_false
 
         jf_cf       ::= JUMP_FORWARD COME_FROM
         conditional ::= expr jmp_false expr jf_cf expr COME_FROM
diff --git a/uncompyle6/semantics/make_function.py b/uncompyle6/semantics/make_function.py
index 88502706..6b744c99 100644
--- a/uncompyle6/semantics/make_function.py
+++ b/uncompyle6/semantics/make_function.py
@@ -592,7 +592,10 @@ def make_function3(self, node, is_lambda, nested=1, codeNode=None):
         params.reverse() # back to correct order
 
     if code_has_star_arg(code):
-        if self.version > 3.0:
+        if self.version >= 3.6:
+            j = -2 if code_has_star_star_arg(code) else -1
+            params.append('*%s' % code.co_varnames[j])
+        elif self.version > 3.0:
             params.append('*%s' % code.co_varnames[argc + kw_pairs])
         else:
             params.append('*%s' % code.co_varnames[argc])