Cell/Free var fixes? ...

Also move some invariant code out of a loop.

Author: rocky

pytest/testdata/test_nested_scopes-extended-bytes-2.1.right

@@ -351,7 +351,7 @@
 #    0: blurb
 #    1: y3a
 #    2: flurb
-# Cell variables:
+# Free variables:
 #    0: blurb
 #    1: flurb
 
@@ -418,7 +418,7 @@
 # Local variables:
 #    0: y3
 #    1: blurb
-# Cell variables:
+# Free variables:
 #    0: blurb
 
  43:           0 |7f 00 2b| SET_LINENO           43
@@ -579,7 +579,7 @@
 # Local variables:
 #    0: blurb
 #    1: y
-# Cell variables:
+# Free variables:
 #    0: blurb
 
  76:           0 |7f 00 4c| SET_LINENO           76
@@ -634,7 +634,7 @@
 #    6: c
 #    7: d
 #    8: y
-# Cell variables:
+# Free variables:
 #    0: a
 
  83:           0 |7f 00 53| SET_LINENO           83
@@ -805,7 +805,7 @@
 #	x
 # Positional arguments:
 #	x
-# Free variables:
+# Cell variables:
 #    0: blurb
 #    1: flurb
 
@@ -815,10 +815,10 @@
 
  36:           6 |64 00 01| LOAD_CONST           ("y-blurb =") ; TOS = "y-blurb ="
                9 |47      | PRINT_ITEM           print "y-blurb =",
-              10 |88 00 00| LOAD_DEREF           (0) ; TOS = 0
-              13 |47      | PRINT_ITEM           print 0,
-              14 |88 00 01| LOAD_DEREF           (1) ; TOS = 1
-              17 |47      | PRINT_ITEM           print 1,
+              10 |88 00 00| LOAD_DEREF           (blurb) ; TOS = blurb
+              13 |47      | PRINT_ITEM           print blurb,
+              14 |88 00 01| LOAD_DEREF           (flurb) ; TOS = flurb
+              17 |47      | PRINT_ITEM           print flurb,
               18 |48      | PRINT_NEWLINE        print "\n"
               19 |64 00 00| LOAD_CONST           (None) ; TOS = None
               22 |53      | RETURN_VALUE         return None
@@ -844,7 +844,7 @@
 #	x
 # Local variables:
 #    1: z
-# Free variables:
+# Cell variables:
 #    0: blurb
 
  44:           0 |7f 00 2c| SET_LINENO           44
@@ -865,8 +865,8 @@
 
  49:          28 |64 00 02| LOAD_CONST           ("y-blurb =") ; TOS = "y-blurb ="
               31 |47      | PRINT_ITEM           print "y-blurb =",
-              32 |88 00 00| LOAD_DEREF           (0) ; TOS = 0
-              35 |47      | PRINT_ITEM           print 0,
+              32 |88 00 00| LOAD_DEREF           (blurb) ; TOS = blurb
+              35 |47      | PRINT_ITEM           print blurb,
               36 |64 00 00| LOAD_CONST           (None) ; TOS = None
               39 |53      | RETURN_VALUE         return None
 
@@ -893,7 +893,7 @@
 # Local variables:
 #    1: blurb
 #    2: z
-# Cell variables:
+# Free variables:
 #    0: blurb
 
  56:           0 |7f 00 38| SET_LINENO           56
@@ -978,7 +978,7 @@
 #	x
 # Positional arguments:
 #	x
-# Free variables:
+# Cell variables:
 #    0: blurb
 
  77:           0 |7f 00 4d| SET_LINENO           77
@@ -987,8 +987,8 @@
 
  78:           6 |64 00 01| LOAD_CONST           ("y-blurb =") ; TOS = "y-blurb ="
                9 |47      | PRINT_ITEM           print "y-blurb =",
-              10 |88 00 00| LOAD_DEREF           (0) ; TOS = 0
-              13 |47      | PRINT_ITEM           print 0,
+              10 |88 00 00| LOAD_DEREF           (blurb) ; TOS = blurb
+              13 |47      | PRINT_ITEM           print blurb,
               14 |48      | PRINT_NEWLINE        print "\n"
               15 |64 00 00| LOAD_CONST           (None) ; TOS = None
               18 |53      | RETURN_VALUE         return None
@@ -1010,7 +1010,7 @@
 #	x
 # Positional arguments:
 #	x
-# Free variables:
+# Cell variables:
 #    0: a
 
  84:           0 |7f 00 54| SET_LINENO           84
@@ -1019,8 +1019,8 @@
 
  85:           6 |64 00 01| LOAD_CONST           ("y-a =") ; TOS = "y-a ="
                9 |47      | PRINT_ITEM           print "y-a =",
-              10 |88 00 00| LOAD_DEREF           (0) ; TOS = 0
-              13 |47      | PRINT_ITEM           print 0,
+              10 |88 00 00| LOAD_DEREF           (a) ; TOS = a
+              13 |47      | PRINT_ITEM           print a,
               14 |48      | PRINT_NEWLINE        print "\n"
               15 |64 00 00| LOAD_CONST           (None) ; TOS = None
               18 |53      | RETURN_VALUE         return None
@@ -1098,7 +1098,7 @@
 #    1: 'z-blurb ='
 # Names:
 #    0: blurb
-# Free variables:
+# Cell variables:
 #    0: blurb
 
  57:           0 |7f 00 39| SET_LINENO           57
@@ -1107,8 +1107,8 @@
 
  58:           6 |64 00 01| LOAD_CONST           ("z-blurb =") ; TOS = "z-blurb ="
                9 |47      | PRINT_ITEM           print "z-blurb =",
-              10 |88 00 00| LOAD_DEREF           (0) ; TOS = 0
-              13 |47      | PRINT_ITEM           print 0,
+              10 |88 00 00| LOAD_DEREF           (blurb) ; TOS = blurb
+              13 |47      | PRINT_ITEM           print blurb,
               14 |64 00 00| LOAD_CONST           (None) ; TOS = None
               17 |53      | RETURN_VALUE         return None
 

xdis/bytecode.py

@@ -276,6 +276,11 @@ def get_logical_instruction_at_offset(
     last_op_was_extended_arg = True
     i = offset
 
+    # create a localsplusnames table that resolves duplicates.
+    localsplusnames = (varnames or tuple()) + tuple(
+        name for name in (cells or tuple()) if name not in varnames
+    )
+
     while i < n and last_op_was_extended_arg:
         op = code2num(bytecode, i)
         opname = opc.opname[op]
@@ -316,11 +321,6 @@ def get_logical_instruction_at_offset(
 
             argval = arg
 
-            # create a localsplusnames table that resolves duplicates.
-            localsplusnames = (varnames or tuple()) + tuple(
-                name for name in (cells or tuple()) if name not in varnames
-            )
-
             if op in opc.CONST_OPS:
                 argval, argrepr = _get_const_info(arg, constants)
             elif op in opc.NAME_OPS:
@@ -470,7 +470,7 @@ def get_instructions_bytes(
     constants: tuple = code_object.co_consts
     names: tuple = code_object.co_names
     varnames: tuple = code_object.co_varnames
-    cells: tuple = code_object.co_cells if hasattr(code_object, "co_cells") else tuple()
+    cells: tuple = code_object.co_cellvars if hasattr(code_object, "co_cellvars") else tuple()
     exception_entries = code_object.exception_entries if hasattr(code_object, "exception_entries") else tuple()
     # freevars: tuple = code_object.co_freevars
 

xdis/bytecode_graal.py

@@ -29,8 +29,8 @@ def get_instructions_bytes_graal(
     constants: tuple = code_object.co_consts
     names: tuple = code_object.co_names
     varnames: tuple = code_object.co_varnames
-    # cells: tuple = code_object.co_cells
-    # freevars: tuple = code_object.co_freevars
+    cells: tuple = code_object.co_cellvars
+    freevars: tuple = code_object.co_freevars
 
     i = 0
     n = len(bytecode)
@@ -114,11 +114,10 @@ def get_instructions_bytes_graal(
                 opc.opmap["STORE_DEREF"],
                 opc.opmap["DELETE_DEREF"],
             ):
-                # if arg >= len(cells):
-                #     import pdb; pdb.set_trace()
-                #     argrepr = freevars[arg - len(cells)]
-                # else:
-                #     argrepr = cells[arg]
+                if arg >= len(cells):
+                    argrepr = freevars[arg - len(cells)]
+                else:
+                    argrepr = cells[arg]
                 break
             elif opcode in (
                 opc.opmap["LOAD_FAST"],

xdis/lineoffsets_graal.py

@@ -62,7 +62,7 @@ def __init__(
         bytecode: bytes = code_object.co_code
         start_column: int  = code_object.startColumn
         start_line: int  = code_object.startLine
-        # cells: tuple = code_object.co_cells
+        # cells: tuple = code_object.co_cellvars
         # freevars: tuple = code_object.co_freevars
         arg_counts: Dict[int, int] = opc.arg_counts
 

xdis/unmarshal.py

@@ -771,8 +771,8 @@ def t_code(self, save_ref, bytes_for_s: bool = False):
                 co_varnames = tuple()
 
             if self.version_triple >= (2, 0):
-                co_freevars = self.r_object(bytes_for_s=bytes_for_s)
                 co_cellvars = self.r_object(bytes_for_s=bytes_for_s)
+                co_freevars = self.r_object(bytes_for_s=bytes_for_s)
 
             co_filename = self.r_object(bytes_for_s=bytes_for_s)
             co_name = self.r_object(bytes_for_s=bytes_for_s)