fix typing and minor test issues

Author: MatthieuDartiailh

src/bytecode/concrete.py

@@ -1066,9 +1066,7 @@ def to_bytecode(
                     if opcode in BITFLAG_OPCODES:
                         arg = (
                             bool(c_arg & 1),
-                            FormatValue(c_arg >> 1)
-                            if opcode in FORMAT_VALUE_OPS
-                            else self.names[c_arg >> 1],
+                            self.names[c_arg >> 1],
                         )
                     elif opcode in BITFLAG2_OPCODES:
                         arg = (bool(c_arg & 1), bool(c_arg & 2), self.names[c_arg >> 2])
@@ -1101,6 +1099,14 @@ def to_bytecode(
                     arg = CommonConstants(c_arg)
                 elif opcode in SPECIAL_OPS:
                     arg = SpecialMethod(c_arg)
+                elif opcode in FORMAT_VALUE_OPS:
+                    if opcode in BITFLAG_OPCODES:
+                        arg = (
+                            bool(c_arg & 1),
+                            FormatValue(c_arg >> 1),
+                        )
+                    else:
+                        arg = FormatValue(c_arg)
                 else:
                     arg = c_arg
 

src/bytecode/instr.py

@@ -868,8 +868,15 @@ def _cmp_key(self) -> Tuple[Optional[InstrLocation], str, Any]:
     FreeVar,
     "_bytecode.BasicBlock",
     Compare,
+    FormatValue,
+    BinaryOp,
+    Intrinsic1Op,
+    Intrinsic2Op,
+    CommonConstants,
+    SpecialMethod,
     Tuple[bool, str],
     Tuple[bool, bool, str],
+    Tuple[bool, FormatValue],
     Tuple[Union[str, CellVar, FreeVar], Union[str, CellVar, FreeVar]],
 ]
 

tests/test_misc.py

@@ -388,7 +388,7 @@ def func(test):
         self.check_dump_bytecode(code, expected.lstrip())
 
         # with line numbers
-        if PY312:
+        if PY314:
             expected = textwrap.dedent(
                 f"""
             block1:
@@ -420,6 +420,35 @@ def func(test):
                 L.  6   0: LOAD_SMALL_INT 3
                         1: RETURN_VALUE
 
+            """
+            )
+        elif PY312:
+            expected = textwrap.dedent(
+                f"""
+            block1:
+                L.  1   0: RESUME 0
+                L.  2   1: LOAD_FAST 'test'
+                        2: LOAD_CONST 1
+                        3: COMPARE_OP {enum_repr}
+                        4: POP_JUMP_IF_FALSE <block3>
+                -> block2
+
+            block2:
+                L.  3   1: RETURN_CONST 1
+
+            block3:
+                L.  4   0: LOAD_FAST 'test'
+                        1: LOAD_CONST 2
+                        2: COMPARE_OP {enum_repr}
+                        3: POP_JUMP_IF_FALSE <block5>
+                -> block4
+
+            block4:
+                L.  5   1: RETURN_CONST 2
+
+            block5:
+                L.  6   0: RETURN_CONST 3
+
             """
             )
         elif PY311: