fix binary op arg coercion

Author: MatthieuDartiailh

src/bytecode/instr.py

@@ -890,7 +890,7 @@ def _cmp_key(self) -> Tuple[Optional[InstrLocation], str, Any]:
             arg = const_key(arg)
         return (self._location, self._name, arg)
 
-    def _check_arg(self, name: str, opcode: int, arg: InstrArg) -> None:
+    def _check_arg(self, name: str, opcode: int, arg: InstrArg) -> None:  # noqa: C901
         if name == "EXTENDED_ARG":
             raise ValueError(
                 "only concrete instruction can contain EXTENDED_ARG, "
@@ -993,10 +993,11 @@ def _check_arg(self, name: str, opcode: int, arg: InstrArg) -> None:
                             "operation %s argument type must be "
                             "coercible to BinaryOp, got %s" % (name, type(arg).__name__)
                         ) from e
-                raise TypeError(
-                    "operation %s argument type must be "
-                    "BinaryOp, got %s" % (name, type(arg).__name__)
-                )
+                else:
+                    raise TypeError(
+                        "operation %s argument type must be "
+                        "BinaryOp, got %s" % (name, type(arg).__name__)
+                    )
 
         # We do not enforce constant immortality since which constants are
         # immortal may differ between recompilation and execution.

tests/test_instr.py

@@ -165,10 +165,9 @@ def test_invalid_arg(self):
 
         for name in (opcode.opname[op] for op in BINARY_OPS):
             assert name == "BINARY_OP", f"expected BINARY_OP but got {name=}"
-            if PY314:
-                Instr(name, BinaryOp.SUBSCR)
-                Instr(name, BinaryOp.SUBSCR.value)
-                self.assertRaises(TypeError, Instr, name, "")
+            Instr(name, BinaryOp.ADD)
+            Instr(name, BinaryOp.ADD.value)
+            self.assertRaises(TypeError, Instr, name, "")
 
         for name in (opcode.opname[op] for op in SPECIAL_OPS):
             assert name == "LOAD_SPECIAL", f"expected LOAD_SPECIAL but got {name=}"
@@ -186,7 +185,7 @@ def test_invalid_arg(self):
                 TypeError,
                 Instr,
                 "LOAD_COMMON_CONSTANT",
-                CommonConstants.BUILTIN_ALL.value,
+                CommonConstant.BUILTIN_ALL.value,
             )
 
         for name in (opcode.opname[op] for op in SMALL_INT_OPS):