Simplify code

f9358bf0cd82063ce5a7c0ff160d01450fe94dfe
commit f9358bf0cd82063ce5a7c0ff160d01450fe94dfe
diff --git a/crates/compiler-core/generate.py b/crates/compiler-core/generate.py
@@ -158,33 +158,35 @@ def build_has_attr_fn(self, fn_attr: str, prop_attr: str, doc_flag: str) -> str:
         lambda self: self.build_has_attr_fn("local", "uses_locals", "HAS_LOCAL_FLAG")
     )
 
-    fn_has_exc = property(
-        lambda self: self.build_has_attr_fn("exc", "pure", "HAS_PURE_FLAG")
-    )
-
-    @property
-    def instrumented(self) -> list:
-        return [instr for instr in self if instr.name.startswith("Instrumented")]
-
     @property
-    def fn_to_base(self) -> str:
-        inames = {instr.name for instr in self.instrumented}
+    def instrumented_mapping(self) -> dict[str, str]:
+        inames = {instr.name for instr in self if instr.name.startswith("Instrumented")}
         names = {instr.name for instr in self} - inames
 
-        arms = ""
+        res = {}
         for iname in sorted(inames):
             name = iname.removeprefix("Instrumented")
             if name not in names:
                 continue
-            arms += f"Self::{iname} => Self::{name},\n"
+
+            res[name] = iname
+
+        return res
+
+    @property
+    def fn_to_base(self) -> str:
+        arms = ",\n".join(
+            f"Self::{iname} => Self::{name}"
+            for name, iname in self.instrumented_mapping.items()
+        )
 
         arms = arms.strip()
         if not arms:
             inner = "None"
         else:
             inner = f"""
             Some(match self {{
-                {arms}
+                {arms},
                 _ => return None,
 
             }})
@@ -199,23 +201,18 @@ def fn_to_base(self) -> str:
 
     @property
     def fn_to_instrumented(self) -> str:
-        inames = {instr.name for instr in self.instrumented}
-        names = {instr.name for instr in self} - inames
-
-        arms = ""
-        for iname in sorted(inames):
-            name = iname.removeprefix("Instrumented")
-            if name not in names:
-                continue
-            arms += f"Self::{name} => Self::{iname},\n"
+        arms = ",\n".join(
+            f"Self::{name} => Self::{iname}"
+            for name, iname in self.instrumented_mapping.items()
+        )
 
         arms = arms.strip()
         if not arms:
             inner = "None"
         else:
             inner = f"""
             Some(match self {{
-                {arms}
+                {arms},
                 _ => return None,
 
             }})
@@ -334,7 +331,7 @@ def fn_stack_effect_info(self) -> str:
             arms += f"""
                 Self::{name} => (
                     {pushed}, {pushed_comment}
-                    {popped} {popped_comment}
+                    {popped}, {popped_comment}
                 ),
             """.strip()
 
@@ -413,7 +410,7 @@ def __iter__(self):
 
 
 @dataclasses.dataclass(frozen=True, kw_only=True, slots=True)
-class InstructioneGen:
+class InstructionGen:
     name: str
     opcode_enum: str
     instructions: list
@@ -686,7 +683,7 @@ def main():
 
         outfile.write(opcode_code)
 
-        instruction_code = InstructioneGen(
+        instruction_code = InstructionGen(
             name=instruction_enum,
             opcode_enum=opcode_enum,
             instructions=instructions,

diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs
@@ -447,11 +447,6 @@ impl AnyOpcode {
     pub const fn has_const(&self) -> bool
     );
 
-    either_real_pseudo!(
-    #[must_use]
-    pub const fn has_exc(&self) -> bool
-    );
-
     either_real_pseudo!(
     #[must_use]
     pub const fn is_instrumented(&self) -> bool

diff --git a/crates/compiler-core/src/bytecode/instructions.rs b/crates/compiler-core/src/bytecode/instructions.rs
@@ -1094,25 +1094,6 @@ impl Opcode {
         )
     }
 
-    /// Does this opcode have 'HAS_PURE_FLAG' set.
-    #[must_use]
-    pub const fn has_exc(self) -> bool {
-        matches!(
-            self,
-            Self::EndSend
-                | Self::Nop
-                | Self::NotTaken
-                | Self::PopIter
-                | Self::PopTop
-                | Self::PushNull
-                | Self::UnaryNot
-                | Self::Copy
-                | Self::LoadFast
-                | Self::LoadFastBorrow
-                | Self::Swap
-        )
-    }
-
     /// Does this opcode have 'HAS_FREE_FLAG' set.
     #[must_use]
     pub const fn has_free(self) -> bool {
@@ -2561,20 +2542,6 @@ impl PseudoOpcode {
         false
     }
 
-    /// Does this opcode have 'HAS_PURE_FLAG' set.
-    #[must_use]
-    pub const fn has_exc(self) -> bool {
-        matches!(
-            self,
-            Self::AnnotationsPlaceholder
-                | Self::LoadClosure
-                | Self::PopBlock
-                | Self::SetupCleanup
-                | Self::SetupFinally
-                | Self::SetupWith
-        )
-    }
-
     /// Does this opcode have 'HAS_FREE_FLAG' set.
     #[must_use]
     pub const fn has_free(self) -> bool {

diff --git a/crates/stdlib/src/_opcode.rs b/crates/stdlib/src/_opcode.rs
@@ -5,7 +5,7 @@ mod _opcode {
     use crate::vm::{
         AsObject, PyObjectRef, PyResult, VirtualMachine,
         builtins::{PyInt, PyIntRef},
-        bytecode::{AnyInstruction, AnyOpcode, oparg},
+        bytecode::{AnyOpcode, oparg},
     };
 
     fn try_from_i32(raw: i32) -> Result<AnyOpcode, ()> {
@@ -71,7 +71,7 @@ mod _opcode {
             .opcode
             .try_to_primitive::<u16>(vm)
             .and_then(|v| {
-                AnyInstruction::try_from(v)
+                AnyOpcode::try_from(v)
                     .map_err(|_| vm.new_exception_empty(vm.ctx.exceptions.value_error.to_owned()))
             })
             .map_err(|_| vm.new_value_error("invalid opcode or oparg"))?;
@@ -105,35 +105,35 @@ mod _opcode {
     #[pyfunction]
     fn has_const(opcode: i32) -> bool {
         try_from_i32(opcode)
-            .map(|op| op.deopt().is_none() && op.has_const())
+            .map(|op| op.has_const())
             .unwrap_or(false)
     }
 
     #[pyfunction]
     fn has_name(opcode: i32) -> bool {
         try_from_i32(opcode)
-            .map(|op| op.deopt().is_none() && op.has_name())
+            .map(|op| &&op.has_name())
             .unwrap_or(false)
     }
 
     #[pyfunction]
     fn has_jump(opcode: i32) -> bool {
         try_from_i32(opcode)
-            .map(|op| op.deopt().is_none() && op.has_jump())
+            .map(|op| op.has_jump())
             .unwrap_or(false)
     }
 
     #[pyfunction]
     fn has_free(opcode: i32) -> bool {
         try_from_i32(opcode)
-            .map(|op| op.deopt().is_none() && op.has_free())
+            .map(|op| op.has_free())
             .unwrap_or(false)
     }
 
     #[pyfunction]
     fn has_local(opcode: i32) -> bool {
         try_from_i32(opcode)
-            .map(|op| op.deopt().is_none() && op.has_local())
+            .map(|op| op.has_local())
             .unwrap_or(false)
     }