fix dis

python · markshannon · Jun 21, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 18, 2022
commit bf583581777dc4de630cde5543f287e48379ae76
diff --git a/Lib/dis.py b/Lib/dis.py
@@ -31,6 +31,7 @@
 LOAD_GLOBAL = opmap['LOAD_GLOBAL']
 BINARY_OP = opmap['BINARY_OP']
 JUMP_BACKWARD = opmap['JUMP_BACKWARD']
+FOR_ITER = opmap['FOR_ITER']
 
 CACHE = opmap["CACHE"]
 
@@ -473,6 +474,8 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
             elif deop in hasjrel:
                 signed_arg = -arg if _is_backward_jump(deop) else arg
                 argval = offset + 2 + signed_arg*2
+                if deop == FOR_ITER:
+                    argval += 2
                 argrepr = "to " + repr(argval)
             elif deop in haslocal or deop in hasfree:
                 argval, argrepr = _get_name_info(arg, varname_from_oparg)
@@ -596,11 +599,14 @@ def findlabels(code):
     labels = []
     for offset, op, arg in _unpack_opargs(code):
         if arg is not None:
-            if op in hasjrel:
-                if _is_backward_jump(op):
+            deop = _deoptop(op)
+            if deop in hasjrel:
+                if _is_backward_jump(deop):
                     arg = -arg
                 label = offset + 2 + arg*2
-            elif op in hasjabs:
+                if deop == FOR_ITER:
+                    label += 2
+            elif deop in hasjabs:
                 label = arg*2
             else:
                 continue