Use OpcodeId in _opcode

RustPython · ShaharNaveh · Sep 23, 2025 · Sep 23, 2025 · Sep 23, 2025 · Sep 23, 2025
commit 493da321d204495143ab0b42260c08928d9738e2
diff --git a/compiler/core/src/lib.rs b/compiler/core/src/lib.rs
@@ -3,9 +3,9 @@
 
 pub mod bytecode;
 pub mod frozen;
-pub mod instruction;
 pub mod marshal;
 mod mode;
+pub mod opcode;
 
 pub use mode::Mode;
 

diff --git a/compiler/core/src/instruction.rs → compiler/core/src/opcode.rs b/compiler/core/src/instruction.rs → compiler/core/src/opcode.rs
@@ -1,6 +1,6 @@
 ///! Python opcode implementation. Currently aligned with cpython 3.13.7
 
-// This file is generated by scripts/gen_instructions.py
+// This file is generated by scripts/gen_opcodes.py
 // Do not edit!
 
 /// Represents a valid opcode ID.
@@ -248,7 +248,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn is_pseudo(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::JUMP
                 | Self::JUMP_NO_INTERRUPT
                 | Self::LOAD_CLOSURE
@@ -268,7 +268,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn has_arg(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::BINARY_OP
                 | Self::BUILD_CONST_KEY_MAP
                 | Self::BUILD_LIST
@@ -425,7 +425,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn has_const(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::INSTRUMENTED_RETURN_CONST | Self::LOAD_CONST | Self::RETURN_CONST
         )
     }
@@ -434,7 +434,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn has_name(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::DELETE_ATTR
                 | Self::DELETE_GLOBAL
                 | Self::DELETE_NAME
@@ -464,7 +464,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn has_jump(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::FOR_ITER
                 | Self::FOR_ITER_LIST
                 | Self::FOR_ITER_RANGE
@@ -486,7 +486,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn has_free(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::DELETE_DEREF
                 | Self::LOAD_DEREF
                 | Self::LOAD_FROM_DICT_OR_DEREF
@@ -499,7 +499,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn has_local(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::BINARY_OP_INPLACE_ADD_UNICODE
                 | Self::DELETE_FAST
                 | Self::LOAD_FAST
@@ -518,7 +518,7 @@ impl OpcodeId {
     #[must_use]
     pub const fn has_exc(&self) -> bool {
         matches!(
-            self,
+            *self,
             Self::COPY
                 | Self::END_FOR
                 | Self::END_SEND

diff --git a/scripts/gen_instructions.py → scripts/gen_opcodes.py b/scripts/gen_instructions.py → scripts/gen_opcodes.py
@@ -20,7 +20,7 @@
 from opcode_metadata_generator import cflags
 
 ROOT = pathlib.Path(__file__).parents[1]
-OUT_PATH = ROOT / "compiler" / "core" / "src" / "instruction.rs"
+OUT_PATH = ROOT / "compiler" / "core" / "src" / "opcode.rs"
 
 
 def group_ranges(it: "Iterable[int]") -> "Iterator[range]":
@@ -153,7 +153,7 @@ def generate_is_pseudo(self) -> str:
 /// Whether opcode ID is pseudo.
 #[must_use]
 pub const fn is_pseudo(&self) -> bool {{
-    matches!(self, {matches})
+    matches!(*self, {matches})
 }}
 """.strip()
 
@@ -166,7 +166,7 @@ def _generate_has_attr(self, attr: str, *, flag_override: str | None = None) ->
 /// Whether opcode ID have '{flag}' set.
 #[must_use]
 pub const fn has_{attr}(&self) -> bool {{
-    matches!(self, {matches})
+    matches!(*self, {matches})
 }}
 """.strip()
 

diff --git a/stdlib/src/opcode.rs b/stdlib/src/opcode.rs
@@ -5,36 +5,10 @@ mod opcode {
     use crate::vm::{
         AsObject, PyObjectRef, PyResult, VirtualMachine,
         builtins::{PyBool, PyInt, PyIntRef, PyNone},
-        instruction::Instruction,
+        bytecode::Instruction,
         match_class,
+        opcode::OpcodeId,
     };
-    use std::ops::Deref;
-
-    struct Opcode(Instruction);
-
-    impl Deref for Opcode {
-        type Target = Instruction;
-
-        fn deref(&self) -> &Self::Target {
-            &self.0
-        }
-    }
-
-    impl Opcode {
-        #[must_use]
-        fn try_from_pyint(raw: PyIntRef, vm: &VirtualMachine) -> PyResult<Self> {
-            let instruction = raw
-                .try_to_primitive::<u16>(vm)
-                .and_then(|v| {
-                    Instruction::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"))?;
-
-            Ok(Self(instruction))
-        }
-    }
 
     #[pyattr]
     const ENABLE_SPECIALIZATION: u8 = 1;
@@ -49,82 +23,87 @@ mod opcode {
         jump: Option<PyObjectRef>,
     }
 
-    /*
-        #[pyfunction]
-        fn stack_effect(args: StackEffectArgs, vm: &VirtualMachine) -> PyResult<i32> {
-            let oparg = args
-                .oparg
-                .map(|v| {
-                    if !v.fast_isinstance(vm.ctx.types.int_type) {
-                        return Err(vm.new_type_error(format!(
-                            "'{}' object cannot be interpreted as an integer",
-                            v.class().name()
-                        )));
+    // TODO: Make use of the auto generated `Instruction` enum (when we will have it)
+    #[pyfunction]
+    fn stack_effect(args: StackEffectArgs, vm: &VirtualMachine) -> PyResult<i32> {
+        let oparg = args
+            .oparg
+            .map(|v| {
+                if !v.fast_isinstance(vm.ctx.types.int_type) {
+                    return Err(vm.new_type_error(format!(
+                        "'{}' object cannot be interpreted as an integer",
+                        v.class().name()
+                    )));
+                }
+                v.downcast_ref::<PyInt>()
+                    .ok_or_else(|| vm.new_type_error(""))?
+                    .try_to_primitive::<u32>(vm)
+            })
+            .unwrap_or(Ok(0))?;
+
+        let jump = args
+            .jump
+            .map(|v| {
+                match_class!(match v {
+                    b @ PyBool => Ok(b.is(&vm.ctx.true_value)),
+                    _n @ PyNone => Ok(false),
+                    _ => {
+                        Err(vm.new_value_error("stack_effect: jump must be False, True or None"))
                     }
-                    v.downcast_ref::<PyInt>()
-                        .ok_or_else(|| vm.new_type_error(""))?
-                        .try_to_primitive::<u32>(vm)
                 })
-                .unwrap_or(Ok(0))?;
-
-            let jump = args
-                .jump
-                .map(|v| {
-                    match_class!(match v {
-                        b @ PyBool => Ok(b.is(&vm.ctx.true_value)),
-                        _n @ PyNone => Ok(false),
-                        _ => {
-                            Err(vm.new_value_error("stack_effect: jump must be False, True or None"))
-                        }
-                    })
-                })
-                .unwrap_or(Ok(false))?;
+            })
+            .unwrap_or(Ok(false))?;
 
-            let opcode = Opcode::try_from_pyint(args.opcode, vm)?;
+        let instruction = args
+            .opcode
+            .try_to_primitive::<u8>(vm)
+            .and_then(|v| {
+                Instruction::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"))?;
 
-            Ok(opcode.stack_effect(oparg.into(), jump))
-        }
-    */
+        Ok(instruction.stack_effect(oparg.into(), jump))
+    }
 
-    /*
     #[pyfunction]
     fn is_valid(opcode: i32) -> bool {
-        Opcode::is_valid(opcode)
+        OpcodeId::try_from(opcode).is_ok()
-        OpcodeId::try_from(opcode).is_ok()
+fn is_valid(opcode: i32) -> bool {
+    OpcodeId::try_from(opcode).is_ok_and(|oid| !oid.is_pseudo())
+}
-        OpcodeId::try_from(opcode).is_ok()
+fn is_valid(opcode: i32) -> bool {
+    OpcodeId::try_from(opcode).is_ok_and(|oid| !oid.is_pseudo())
+}
     }
 
     #[pyfunction]
     fn has_arg(opcode: i32) -> bool {
-        Opcode::has_arg(opcode)
+        OpcodeId::try_from(opcode).map_or(false, |oid| !oid.is_pseudo() && oid.has_arg())
     }
 
     #[pyfunction]
     fn has_const(opcode: i32) -> bool {
-        Opcode::has_const(opcode)
+        OpcodeId::try_from(opcode).map_or(false, |oid| !oid.is_pseudo() && oid.has_const())
     }
 
     #[pyfunction]
     fn has_name(opcode: i32) -> bool {
-        Opcode::has_name(opcode)
+        OpcodeId::try_from(opcode).map_or(false, |oid| !oid.is_pseudo() && oid.has_name())
     }
 
     #[pyfunction]
     fn has_jump(opcode: i32) -> bool {
-        Opcode::has_jump(opcode)
+        OpcodeId::try_from(opcode).map_or(false, |oid| !oid.is_pseudo() && oid.has_jump())
     }
 
     #[pyfunction]
     fn has_free(opcode: i32) -> bool {
-        Opcode::has_free(opcode)
+        OpcodeId::try_from(opcode).map_or(false, |oid| !oid.is_pseudo() && oid.has_free())
     }
 
     #[pyfunction]
     fn has_local(opcode: i32) -> bool {
-        Opcode::has_local(opcode)
+        OpcodeId::try_from(opcode).map_or(false, |oid| !oid.is_pseudo() && oid.has_local())
     }
 
     #[pyfunction]
     fn has_exc(opcode: i32) -> bool {
-        Opcode::has_exc(opcode)
+        OpcodeId::try_from(opcode).map_or(false, |oid| !oid.is_pseudo() && oid.has_exc())
     }
 
     #[pyfunction]
@@ -212,5 +191,4 @@ mod opcode {
     fn get_specialization_stats(vm: &VirtualMachine) -> PyObjectRef {
         vm.ctx.none()
     }
-    */
 }
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -99,7 +99,7 @@ pub use self::object::{
 pub use self::vm::{Context, Interpreter, Settings, VirtualMachine};
 
 pub use rustpython_common as common;
-pub use rustpython_compiler_core::{bytecode, frozen, instruction};
+pub use rustpython_compiler_core::{bytecode, frozen, opcode};
 pub use rustpython_literal as literal;
 
 #[doc(hidden)]